diff options
Diffstat (limited to 'nixpkgs/pkgs/tools')
1836 files changed, 4644 insertions, 4594 deletions
diff --git a/nixpkgs/pkgs/tools/X11/alttab/default.nix b/nixpkgs/pkgs/tools/X11/alttab/default.nix index 4efd86ca63fa..28c8efffa2a5 100644 --- a/nixpkgs/pkgs/tools/X11/alttab/default.nix +++ b/nixpkgs/pkgs/tools/X11/alttab/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuild = true; meta = with stdenv.lib; { - homepage = https://github.com/sagb/alttab; + homepage = "https://github.com/sagb/alttab"; description = "X11 window switcher designed for minimalistic window managers or standalone X11 session"; license = licenses.gpl3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/X11/arandr/default.nix b/nixpkgs/pkgs/tools/X11/arandr/default.nix index 51f2f5ec2494..94e3ac36d078 100644 --- a/nixpkgs/pkgs/tools/X11/arandr/default.nix +++ b/nixpkgs/pkgs/tools/X11/arandr/default.nix @@ -5,8 +5,11 @@ let inherit (python3Packages) buildPythonApplication docutils pygobject3; + pname = "arandr"; + version = "0.1.10"; + name = "${pname}-${version}"; in buildPythonApplication rec { - name = "arandr-0.1.10"; + inherit pname version; src = fetchurl { url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; @@ -29,7 +32,7 @@ in buildPythonApplication rec { propagatedBuildInputs = [ xrandr pygobject3 ]; meta = { - homepage = http://christian.amsuess.com/tools/arandr/; + homepage = "http://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.domenkozar ]; diff --git a/nixpkgs/pkgs/tools/X11/autocutsel/default.nix b/nixpkgs/pkgs/tools/X11/autocutsel/default.nix index db17788cea00..ece42502d81c 100644 --- a/nixpkgs/pkgs/tools/X11/autocutsel/default.nix +++ b/nixpkgs/pkgs/tools/X11/autocutsel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - homepage = https://www.nongnu.org/autocutsel/; + homepage = "https://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; diff --git a/nixpkgs/pkgs/tools/X11/bumblebee/default.nix b/nixpkgs/pkgs/tools/X11/bumblebee/default.nix index f5a8fd24f5e6..8540cf6975dc 100644 --- a/nixpkgs/pkgs/tools/X11/bumblebee/default.nix +++ b/nixpkgs/pkgs/tools/X11/bumblebee/default.nix @@ -134,7 +134,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Bumblebee-Project/Bumblebee; + homepage = "https://github.com/Bumblebee-Project/Bumblebee"; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix index 1948dd2b9c5d..dc665bf9c41b 100644 --- a/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix +++ b/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys"; - homepage = https://salsa.debian.org/installer-team/console-setup; + homepage = "https://salsa.debian.org/installer-team/console-setup"; license = licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ dezgeg ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/X11/dex/default.nix b/nixpkgs/pkgs/tools/X11/dex/default.nix index 9387c62c2a51..af8188883d9b 100644 --- a/nixpkgs/pkgs/tools/X11/dex/default.nix +++ b/nixpkgs/pkgs/tools/X11/dex/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch; + url = "https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch"; sha256 = "06dfkfzxp8199by0jc5wim8g8qw38j09dq9p6n9w4zaasla60pjq"; }) ]; meta = with stdenv.lib; { description = "A program to generate and execute DesktopEntry files of the Application type"; - homepage = https://github.com/jceb/dex; + homepage = "https://github.com/jceb/dex"; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/nixpkgs/pkgs/tools/X11/dispad/default.nix b/nixpkgs/pkgs/tools/X11/dispad/default.nix index 7c1457d3e2ae..fccb28489efd 100644 --- a/nixpkgs/pkgs/tools/X11/dispad/default.nix +++ b/nixpkgs/pkgs/tools/X11/dispad/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small daemon for disabling trackpads while typing"; - homepage = https://github.com/BlueDragonX/dispad; + homepage = "https://github.com/BlueDragonX/dispad"; license = licenses.gpl2; maintainers = with maintainers; [ zimbatm ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix b/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix index 54ece6a9a163..86c867b16ba8 100644 --- a/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix +++ b/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple drag-and-drop source/sink for X"; - homepage = https://github.com/mwh/dragon; + homepage = "https://github.com/mwh/dragon"; maintainers = with maintainers; [ jb55 markus1189 ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/X11/ffcast/default.nix b/nixpkgs/pkgs/tools/X11/ffcast/default.nix index ff84dde6f99b..1378d5e6b982 100644 --- a/nixpkgs/pkgs/tools/X11/ffcast/default.nix +++ b/nixpkgs/pkgs/tools/X11/ffcast/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Run commands on rectangular screen regions"; - homepage = https://github.com/lolilolicon/FFcast; + homepage = "https://github.com/lolilolicon/FFcast"; license = licenses.gpl3; maintainers = [ maintainers.guyonvarch ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/grobi/default.nix b/nixpkgs/pkgs/tools/X11/grobi/default.nix index 976cabc33f8b..a2cca87edc08 100644 --- a/nixpkgs/pkgs/tools/X11/grobi/default.nix +++ b/nixpkgs/pkgs/tools/X11/grobi/default.nix @@ -14,7 +14,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/fd0/grobi; + homepage = "https://github.com/fd0/grobi"; description = "Automatically configure monitors/outputs for Xorg via RANDR"; license = with licenses; [ bsd2 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/hsetroot/default.nix b/nixpkgs/pkgs/tools/X11/hsetroot/default.nix index 6bae355812c2..3bfe98a7a211 100644 --- a/nixpkgs/pkgs/tools/X11/hsetroot/default.nix +++ b/nixpkgs/pkgs/tools/X11/hsetroot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # See https://bugs.gentoo.org/show_bug.cgi?id=504056 underlinkingPatch = fetchurl { - url = http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch; + url = "http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch"; name = "hsetroot-1.0.2-underlinking.patch"; sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows you to compose wallpapers ('root pixmaps') for X"; - homepage = https://thegraveyard.org/hsetroot.html; + homepage = "https://thegraveyard.org/hsetroot.html"; license = licenses.gpl2Plus; maintainers = [ maintainers.henrytill ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/X11/jumpapp/default.nix b/nixpkgs/pkgs/tools/X11/jumpapp/default.nix index 23ba445b6748..c152a72a23d8 100644 --- a/nixpkgs/pkgs/tools/X11/jumpapp/default.nix +++ b/nixpkgs/pkgs/tools/X11/jumpapp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/mkropat/jumpapp; + homepage = "https://github.com/mkropat/jumpapp"; description = "A run-or-raise application switcher for any X11 desktop"; license = lib.licenses.mit; maintainers = [ lib.maintainers.matklad ]; diff --git a/nixpkgs/pkgs/tools/X11/keynav/default.nix b/nixpkgs/pkgs/tools/X11/keynav/default.nix index 5eb74a267983..64684cf73df2 100644 --- a/nixpkgs/pkgs/tools/X11/keynav/default.nix +++ b/nixpkgs/pkgs/tools/X11/keynav/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Generate X11 mouse clicks from keyboard"; - homepage = https://www.semicomplete.com/projects/keynav/; + homepage = "https://www.semicomplete.com/projects/keynav/"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/nitrogen/default.nix b/nixpkgs/pkgs/tools/X11/nitrogen/default.nix index 95aa15840da6..057288fbaa37 100644 --- a/nixpkgs/pkgs/tools/X11/nitrogen/default.nix +++ b/nixpkgs/pkgs/tools/X11/nitrogen/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { multi-head with Xinerama. Wallpapers are browsable with a convenient GUI, and settings are stored in a human-readable config file. ''; - homepage = https://github.com/l3ib/nitrogen; + homepage = "https://github.com/l3ib/nitrogen"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.auntie ]; diff --git a/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/nixpkgs/pkgs/tools/X11/nx-libs/default.nix index 07b58bcfad60..42444e5fca1b 100644 --- a/nixpkgs/pkgs/tools/X11/nx-libs/default.nix +++ b/nixpkgs/pkgs/tools/X11/nx-libs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "NX X server based on Xnest"; - homepage = https://github.com/ArcticaProject/nx-libs; + homepage = "https://github.com/ArcticaProject/nx-libs"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/obconf/default.nix b/nixpkgs/pkgs/tools/X11/obconf/default.nix index 6b1b353b09be..809e3614f0b1 100644 --- a/nixpkgs/pkgs/tools/X11/obconf/default.nix +++ b/nixpkgs/pkgs/tools/X11/obconf/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "GUI configuration tool for openbox"; - homepage = http://openbox.org/wiki/ObConf; + homepage = "http://openbox.org/wiki/ObConf"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lhvwb ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/primus/lib.nix b/nixpkgs/pkgs/tools/X11/primus/lib.nix index 13d7e06c7304..f4c2c9efc49e 100644 --- a/nixpkgs/pkgs/tools/X11/primus/lib.nix +++ b/nixpkgs/pkgs/tools/X11/primus/lib.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Low-overhead client-side GPU offloading"; - homepage = https://github.com/amonakov/primus; + homepage = "https://github.com/amonakov/primus"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/X11/ratmen/default.nix b/nixpkgs/pkgs/tools/X11/ratmen/default.nix index aa5e346334a3..f60426226747 100644 --- a/nixpkgs/pkgs/tools/X11/ratmen/default.nix +++ b/nixpkgs/pkgs/tools/X11/ratmen/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://www.update.uu.se/~zrajm/programs/; + homepage = "http://www.update.uu.se/~zrajm/programs/"; downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/"; updateWalker = true; }; diff --git a/nixpkgs/pkgs/tools/X11/run-scaled/default.nix b/nixpkgs/pkgs/tools/X11/run-scaled/default.nix index fc0068e6e278..aae09d49b3d4 100644 --- a/nixpkgs/pkgs/tools/X11/run-scaled/default.nix +++ b/nixpkgs/pkgs/tools/X11/run-scaled/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Run an X application scaled via xpra"; - homepage = https://github.com/kaueraal/run_scaled; + homepage = "https://github.com/kaueraal/run_scaled"; maintainers = [ maintainers.snaar ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/X11/runningx/default.nix b/nixpkgs/pkgs/tools/X11/runningx/default.nix index 31e2320e1b9f..55f99c63365d 100644 --- a/nixpkgs/pkgs/tools/X11/runningx/default.nix +++ b/nixpkgs/pkgs/tools/X11/runningx/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.fiction.net/blong/programs/mutt/; + homepage = "http://www.fiction.net/blong/programs/mutt/"; description = "A program for testing if X is running"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/X11/sct/default.nix b/nixpkgs/pkgs/tools/X11/sct/default.nix index 9f45bbe30871..3f6291417e59 100644 --- a/nixpkgs/pkgs/tools/X11/sct/default.nix +++ b/nixpkgs/pkgs/tools/X11/sct/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sct"; src = fetchurl { - url = http://www.tedunangst.com/flak/files/sct.c; + url = "http://www.tedunangst.com/flak/files/sct.c"; sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin sct"; meta = with stdenv.lib; { - homepage = https://www.tedunangst.com/flak/post/sct-set-color-temperature; + homepage = "https://www.tedunangst.com/flak/post/sct-set-color-temperature"; description = "A minimal utility to set display colour temperature"; maintainers = [ maintainers.raskin ]; license = licenses.publicDomain; diff --git a/nixpkgs/pkgs/tools/X11/setroot/default.nix b/nixpkgs/pkgs/tools/X11/setroot/default.nix index a9b5f17af832..56c356b20d5b 100644 --- a/nixpkgs/pkgs/tools/X11/setroot/default.nix +++ b/nixpkgs/pkgs/tools/X11/setroot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple X background setter inspired by imlibsetroot and feh"; - homepage = https://github.com/ttzhou/setroot; + homepage = "https://github.com/ttzhou/setroot"; license = licenses.gpl3Plus; maintainers = [ maintainers.vyp ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/X11/sselp/default.nix b/nixpkgs/pkgs/tools/X11/sselp/default.nix index 30f99cd40f29..81893fd2be83 100644 --- a/nixpkgs/pkgs/tools/X11/sselp/default.nix +++ b/nixpkgs/pkgs/tools/X11/sselp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://tools.suckless.org/sselp; + homepage = "https://tools.suckless.org/sselp"; description = "Prints the X selection to stdout, useful in scripts"; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.magnetophon ]; diff --git a/nixpkgs/pkgs/tools/X11/vdpauinfo/default.nix b/nixpkgs/pkgs/tools/X11/vdpauinfo/default.nix index c0956fb1dec4..741043a9e538 100644 --- a/nixpkgs/pkgs/tools/X11/vdpauinfo/default.nix +++ b/nixpkgs/pkgs/tools/X11/vdpauinfo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvdpau ]; meta = with stdenv.lib; { - homepage = https://people.freedesktop.org/~aplattner/vdpau/; + homepage = "https://people.freedesktop.org/~aplattner/vdpau/"; description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix b/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix index 92afa30e6168..a2a7e5e6922b 100644 --- a/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix +++ b/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.virtualgl.org/; + homepage = "http://www.virtualgl.org/"; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; license = licenses.wxWindows; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/wayv/default.nix b/nixpkgs/pkgs/tools/X11/wayv/default.nix index f906a6d403e6..55f6eede0fa3 100644 --- a/nixpkgs/pkgs/tools/X11/wayv/default.nix +++ b/nixpkgs/pkgs/tools/X11/wayv/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://github.com/mikemb/wayV; + homepage = "https://github.com/mikemb/wayV"; }; } diff --git a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix index e4cb70c8f24d..64f8627a2eff 100644 --- a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix +++ b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./64-bit-data.patch ]; meta = { - homepage = https://sites.google.com/site/tstyblo/wmctrl; + homepage = "https://sites.google.com/site/tstyblo/wmctrl"; description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; diff --git a/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix b/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix index fe5c70f6ce23..fdf805f80992 100644 --- a/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix +++ b/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of window manipulation tools"; - homepage = https://github.com/wmutils/core; + homepage = "https://github.com/wmutils/core"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix b/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix index c12303038623..39f26b95cdbc 100644 --- a/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix +++ b/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optional addons to wmutils"; - homepage = https://github.com/wmutils/opt; + homepage = "https://github.com/wmutils/opt"; license = licenses.isc; maintainers = with maintainers; [ vifino ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/X11/x11spice/default.nix b/nixpkgs/pkgs/tools/X11/x11spice/default.nix index 513149049faf..23af2ac44ca6 100644 --- a/nixpkgs/pkgs/tools/X11/x11spice/default.nix +++ b/nixpkgs/pkgs/tools/X11/x11spice/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { x11spice will enable a running X11 desktop to be available via a Spice server ''; - homepage = https://gitlab.freedesktop.org/spice/x11spice; + homepage = "https://gitlab.freedesktop.org/spice/x11spice"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/nixpkgs/pkgs/tools/X11/x11vnc/default.nix b/nixpkgs/pkgs/tools/X11/x11vnc/default.nix index acf0fc9aabfd..2f7b0d7697e5 100644 --- a/nixpkgs/pkgs/tools/X11/x11vnc/default.nix +++ b/nixpkgs/pkgs/tools/X11/x11vnc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A VNC server connected to a real X11 screen"; - homepage = https://github.com/LibVNC/x11vnc/; + homepage = "https://github.com/LibVNC/x11vnc/"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/nixpkgs/pkgs/tools/X11/x2vnc/default.nix b/nixpkgs/pkgs/tools/X11/x2vnc/default.nix index 6075f0070f90..65d45e23396e 100644 --- a/nixpkgs/pkgs/tools/X11/x2vnc/default.nix +++ b/nixpkgs/pkgs/tools/X11/x2vnc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "x2vnc-1.7.2"; src = fetchurl { - url = https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; + url = "https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz"; sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://fredrik.hubbe.net/x2vnc.html; + homepage = "http://fredrik.hubbe.net/x2vnc.html"; description = "A program to control a remote VNC server"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/X11/x2x/default.nix b/nixpkgs/pkgs/tools/X11/x2x/default.nix index 5c8e3d4f8fb6..deada6ae2d1c 100644 --- a/nixpkgs/pkgs/tools/X11/x2x/default.nix +++ b/nixpkgs/pkgs/tools/X11/x2x/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Allows the keyboard, mouse on one X display to be used to control another X display"; - homepage = https://github.com/dottedmag/x2x; + homepage = "https://github.com/dottedmag/x2x"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/X11/xannotate/default.nix b/nixpkgs/pkgs/tools/X11/xannotate/default.nix index d52698b0ed7e..b1e070673c6d 100644 --- a/nixpkgs/pkgs/tools/X11/xannotate/default.nix +++ b/nixpkgs/pkgs/tools/X11/xannotate/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://bitbucket.org/blais/xannotate; + homepage = "https://bitbucket.org/blais/xannotate"; }; } diff --git a/nixpkgs/pkgs/tools/X11/xautomation/default.nix b/nixpkgs/pkgs/tools/X11/xautomation/default.nix index a648eefcdde1..0a31d5fb8653 100644 --- a/nixpkgs/pkgs/tools/X11/xautomation/default.nix +++ b/nixpkgs/pkgs/tools/X11/xautomation/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libpng libX11 libXext libXi libXtst ]; meta = { - homepage = https://www.hoopajoo.net/projects/xautomation.html; + homepage = "https://www.hoopajoo.net/projects/xautomation.html"; description = "Control X from the command line for scripts, and do \"visual scraping\" to find things on the screen"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ vaibhavsagar ]; diff --git a/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix b/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix index bb83effe6011..35961aff178d 100644 --- a/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = https://packages.debian.org/source/xbindkeys-config; + homepage = "https://packages.debian.org/source/xbindkeys-config"; description = "Graphical interface for configuring xbindkeys"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [benley]; diff --git a/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix b/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix index 23e0ce63e5b4..e844f4443093 100644 --- a/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix +++ b/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 guile ]; meta = { - homepage = https://www.nongnu.org/xbindkeys/xbindkeys.html; + homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html"; description = "Launch shell commands with your keyboard or your mouse under X Window"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/X11/xbrightness/default.nix b/nixpkgs/pkgs/tools/X11/xbrightness/default.nix index e196411ce412..cbf4d2c94003 100644 --- a/nixpkgs/pkgs/tools/X11/xbrightness/default.nix +++ b/nixpkgs/pkgs/tools/X11/xbrightness/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "xbrightness-0.3-mika-akk"; src = fetchurl { - url = https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz; + url = "https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz"; sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "X11 brigthness and gamma software control"; - homepage = http://shallowsky.com/software; + homepage = "http://shallowsky.com/software"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/X11/xcape/default.nix b/nixpkgs/pkgs/tools/X11/xcape/default.nix index d1b6f9b23b6d..eefaad82b1a7 100644 --- a/nixpkgs/pkgs/tools/X11/xcape/default.nix +++ b/nixpkgs/pkgs/tools/X11/xcape/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { is to generate the Escape key when Left Control is pressed and released on its own. ''; - homepage = https://github.com/alols/xcape; + homepage = "https://github.com/alols/xcape"; license = licenses.gpl3 ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/xchainkeys/default.nix b/nixpkgs/pkgs/tools/X11/xchainkeys/default.nix index f06b4cc6b378..238b8c7b2b2d 100644 --- a/nixpkgs/pkgs/tools/X11/xchainkeys/default.nix +++ b/nixpkgs/pkgs/tools/X11/xchainkeys/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; meta = { - homepage = http://henning-bekel.de/xchainkeys/; + homepage = "http://henning-bekel.de/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/X11/xcwd/default.nix b/nixpkgs/pkgs/tools/X11/xcwd/default.nix index f2fadd71427c..c0e8cf5d35b3 100644 --- a/nixpkgs/pkgs/tools/X11/xcwd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xcwd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = '' A simple tool which print the current working directory of the currently focused window ''; - homepage = https://github.com/schischi/xcwd; + homepage = "https://github.com/schischi/xcwd"; maintainers = [ maintainers.grburst ]; license = licenses.bsd3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix b/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix index 066b566be1fe..9ad3db80805f 100644 --- a/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://freedesktop.org/wiki/Software/xdg-user-dirs; + homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs"; description = "A tool to help manage well known user directories like the desktop folder and the music folder"; license = licenses.gpl2; maintainers = with maintainers; [ lethalman ]; diff --git a/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix b/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix index 99d5df2591ac..64b205bada58 100644 --- a/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix +++ b/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/wiki/Software/xdg-utils/; + homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; license = if mimiSupport then licenses.gpl2 else licenses.free; maintainers = [ maintainers.eelco ]; diff --git a/nixpkgs/pkgs/tools/X11/xdotool/default.nix b/nixpkgs/pkgs/tools/X11/xdotool/default.nix index 6fa185dfeab4..6785d10258f3 100644 --- a/nixpkgs/pkgs/tools/X11/xdotool/default.nix +++ b/nixpkgs/pkgs/tools/X11/xdotool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = https://www.semicomplete.com/projects/xdotool/; + homepage = "https://www.semicomplete.com/projects/xdotool/"; description = "Fake keyboard/mouse input, window management, and more"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix b/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix index 76493dfb73ea..ed3b460dcb61 100644 --- a/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix +++ b/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Select a region with mouse and prints geometry information (x/y/w/h)"; - homepage = https://bbs.archlinux.org/viewtopic.php?pid=660837; + homepage = "https://bbs.archlinux.org/viewtopic.php?pid=660837"; maintainers = with maintainers; [ obadz ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix index a4bc2295f1b9..e15bee331a8b 100644 --- a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix +++ b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "xidlehook"; - version = "0.8.0"; + version = "0.8.2"; doCheck = false; @@ -12,11 +12,11 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "127b20y86xs2wq5ka236057nyrh87fgzhjqbl6azf002afnbsn5m"; + sha256 = "1zvr3vk76x0gsq6z5rrnliv2bvshsm8bhkspc41bbj4kniz4h5bw"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "0wakw3pqgwfwarjfb3h0a2javrhnf509v3j547a7p9k5kbjb5np0"; + cargoSha256 = "0dxz5mbdc93xb02vnmd29i2kdh05c7vx9h28x5qgs3jvddyb3xmn"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf python3 ]; @@ -28,9 +28,10 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "xautolock rewrite in Rust, with a few extra features"; - homepage = https://github.com/jD91mZM2/xidlehook; + homepage = "https://github.com/jD91mZM2/xidlehook"; license = licenses.mit; maintainers = with maintainers; [ jD91mZM2 ]; platforms = platforms.unix; + badPlatforms = platforms.darwin; }; } diff --git a/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix b/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix index 9aee0d778c46..9e11c948f40b 100644 --- a/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ]; meta = { - homepage = https://github.com/tias/xinput_calibrator; + homepage = "https://github.com/tias/xinput_calibrator"; description = "A generic touchscreen calibration program for X.Org"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.flosse ]; diff --git a/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix b/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix index a837e73983f9..3b69ec880549 100644 --- a/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix +++ b/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switch your X keyboard layouts from the command line"; - homepage = https://github.com/ierton/xkb-switch; + homepage = "https://github.com/ierton/xkb-switch"; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix b/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix index 7f3d9cfda569..47a2c8f3f3ec 100644 --- a/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement"; - homepage = https://github.com/alex-courtis/xlayoutdisplay; + homepage = "https://github.com/alex-courtis/xlayoutdisplay"; maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/xmagnify/default.nix b/nixpkgs/pkgs/tools/X11/xmagnify/default.nix index dfd28e317718..710c9b83dbd0 100644 --- a/nixpkgs/pkgs/tools/X11/xmagnify/default.nix +++ b/nixpkgs/pkgs/tools/X11/xmagnify/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tiny screen magnifier for X11"; - homepage = https://gitlab.com/amiloradovsky/magnify; + homepage = "https://gitlab.com/amiloradovsky/magnify"; license = licenses.mit; # or GPL2+, optionally maintainers = with maintainers; [ amiloradovsky ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/X11/xmousepasteblock/default.nix b/nixpkgs/pkgs/tools/X11/xmousepasteblock/default.nix index 0cace7f452bb..094b26d1f55c 100644 --- a/nixpkgs/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/nixpkgs/pkgs/tools/X11/xmousepasteblock/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { description = "Middle mouse button primary X selection/clipboard paste disabler"; - homepage = https://github.com/milaq/XMousePasteBlock; + homepage = "https://github.com/milaq/XMousePasteBlock"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.petercommand ]; }; diff --git a/nixpkgs/pkgs/tools/X11/xnee/default.nix b/nixpkgs/pkgs/tools/X11/xnee/default.nix index f8f48ea4cdb6..ae057c769845 100644 --- a/nixpkgs/pkgs/tools/X11/xnee/default.nix +++ b/nixpkgs/pkgs/tools/X11/xnee/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/xnee/; + homepage = "https://www.gnu.org/software/xnee/"; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice diff --git a/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix b/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix index 4dbe31df03ca..6f6d38932df3 100644 --- a/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = { - homepage = https://uninformativ.de/git/xpointerbarrier; + homepage = "https://uninformativ.de/git/xpointerbarrier"; description = "Create X11 pointer barriers around your working area"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.xzfc ]; diff --git a/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch b/nixpkgs/pkgs/tools/X11/xpra/0002-Constant-DPI.patch index f91e53d1e493..f91e53d1e493 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch +++ b/nixpkgs/pkgs/tools/X11/xpra/0002-Constant-DPI.patch diff --git a/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch b/nixpkgs/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch index 3dbb6fd179ff..3dbb6fd179ff 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch +++ b/nixpkgs/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch diff --git a/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch b/nixpkgs/pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch index 567db3fc3865..567db3fc3865 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch +++ b/nixpkgs/pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch diff --git a/nixpkgs/pkgs/tools/X11/xpra/default.nix b/nixpkgs/pkgs/tools/X11/xpra/default.nix index cef8bd491637..1f9efc31061a 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig +{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which , ffmpeg_4, x264, libvpx, libwebp, x265 @@ -11,14 +11,30 @@ with lib; let inherit (python3.pkgs) cython buildPythonApplication; - xf86videodummy = callPackage ./xf86videodummy { }; + xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: { + patches = [ + ./0002-Constant-DPI.patch + ./0003-fix-pointer-limits.patch + ./0005-support-for-30-bit-depth-in-dummy-driver.patch + ]; + }); + + xorgModulePaths = writeText "module-paths" '' + Section "Files" + ModulePath "${xorgserver}/lib/xorg/modules" + ModulePath "${xorgserver}/lib/xorg/modules/extensions" + ModulePath "${xorgserver}/lib/xorg/modules/drivers" + ModulePath "${xf86videodummy}/lib/xorg/modules/drivers" + EndSection + ''; + in buildPythonApplication rec { pname = "xpra"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "0i4c5cdr5prbz54jinsinhvb60s5s5yskjzjg47zbw0if17sp26w"; + sha256 = "0d78bn7s03nwnyc4ryznxaivbg55kvsb26q75p8747j3562s9p2b"; }; patches = [ @@ -81,6 +97,11 @@ in buildPythonApplication rec { ) ''; + # append module paths to xorg.conf + postInstall = '' + cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf + ''; + doCheck = false; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix b/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix index 770024aa4ba5..712f47fb2c81 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://xpra.org/; + homepage = "http://xpra.org/"; description = "fakeXinerama for Xpra"; platforms = platforms.linux; maintainers = [ maintainers.tstrobel ]; diff --git a/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/default.nix b/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/default.nix deleted file mode 100644 index 4e9f88608927..000000000000 --- a/nixpkgs/pkgs/tools/X11/xpra/xf86videodummy/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchurl -, xorgproto, xorgserver -, pkgconfig }: - -with lib; - -stdenv.mkDerivation rec { - version = "0.3.8"; - suffix = "1"; - name = "xpra-xf86videodummy-${version}-${suffix}"; - builder = ../../../../servers/x11/xorg/builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-dummy-${version}.tar.bz2"; - sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; - }; - patches = [ - ./0002-Constant-DPI.patch - ./0003-fix-pointer-limits.patch - ./0005-support-for-30-bit-depth-in-dummy-driver.patch - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto xorgserver ]; - - meta = { - description = "Dummy driver for Xorg with xpra patches"; - homepage = https://xpra.org/trac/wiki/Xdummy; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ numinit ]; - }; -} diff --git a/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix b/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix index 4ae457dab4a8..c7bb2bc348b1 100644 --- a/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A command-line tool to print idle time from libXss''; - homepage = http://taktoa.me/xprintidle-ng/; + homepage = "http://taktoa.me/xprintidle-ng/"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/xrectsel/default.nix b/nixpkgs/pkgs/tools/X11/xrectsel/default.nix index 4712192eacff..e2f9fdf4a435 100644 --- a/nixpkgs/pkgs/tools/X11/xrectsel/default.nix +++ b/nixpkgs/pkgs/tools/X11/xrectsel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print the geometry of a rectangular screen region"; - homepage = https://github.com/lolilolicon/xrectsel; + homepage = "https://github.com/lolilolicon/xrectsel"; license = licenses.gpl3; maintainers = [ maintainers.guyonvarch ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/xrestop/default.nix b/nixpkgs/pkgs/tools/X11/xrestop/default.nix index 6f75d2360cf4..a28fc50c1e74 100644 --- a/nixpkgs/pkgs/tools/X11/xrestop/default.nix +++ b/nixpkgs/pkgs/tools/X11/xrestop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "0.4"; src = fetchurl { - url = mirror://gentoo/distfiles/xrestop-0.4.tar.gz; + url = "mirror://gentoo/distfiles/xrestop-0.4.tar.gz"; sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; diff --git a/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix b/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix index 548101c34c3c..effdd76ce9db 100644 --- a/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix +++ b/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "X11 screen lock utility with security in mind"; - homepage = https://github.com/google/xsecurelock; + homepage = "https://github.com/google/xsecurelock"; license = licenses.asl20; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix b/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix index bee6cdb748f1..10abd957e397 100644 --- a/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides settings to X11 applications via the XSETTINGS specification"; - homepage = https://github.com/derat/xsettingsd; + homepage = "https://github.com/derat/xsettingsd"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/tools/X11/xtruss/default.nix b/nixpkgs/pkgs/tools/X11/xtruss/default.nix index 043514ebb436..7d490571f482 100644 --- a/nixpkgs/pkgs/tools/X11/xtruss/default.nix +++ b/nixpkgs/pkgs/tools/X11/xtruss/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "easy-to-use X protocol tracing program"; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/xtruss; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix index 3c1dc3de2b42..6c61133077e4 100644 --- a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { facility to enter characters onto other clients (softwares) by clicking on a keyboard displayed on the screen. ''; - homepage = http://t-sato.in.coocan.jp/xvkbd; + homepage = "http://t-sato.in.coocan.jp/xvkbd"; license = licenses.gpl2Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix b/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix index b9d48f545749..89b2fdd3dcf1 100644 --- a/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix +++ b/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit version; src = fetchbzr { - url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel; + url = "https://code.launchpad.net/~shantanu-goel/xwinwrap/devel"; rev = version; sha256 = "1annhqc71jcgx5zvcy31c1c488ygx4q1ygrwyy2y0ww743smbchw"; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation { it is, in its new avatar “Shantz XWinWrap”. ''; license = licenses.hpnd; - homepage = https://shantanugoel.com/2008/09/03/shantz-xwinwrap/; + homepage = "https://shantanugoel.com/2008/09/03/shantz-xwinwrap/"; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/admin/acme.sh/default.nix b/nixpkgs/pkgs/tools/admin/acme.sh/default.nix index 25a92f1117bb..8d4863757ade 100644 --- a/nixpkgs/pkgs/tools/admin/acme.sh/default.nix +++ b/nixpkgs/pkgs/tools/admin/acme.sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; version = "2.8.5"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { socat openssl curl + dnsutils (if stdenv.isLinux then iproute else unixtools.netstat) ] }" @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pure Unix shell script implementing ACME client protocol"; - homepage = https://acme.sh/; + homepage = "https://acme.sh/"; license = licenses.gpl3; maintainers = [ maintainers.yorickvp ]; }; diff --git a/nixpkgs/pkgs/tools/admin/adtool/default.nix b/nixpkgs/pkgs/tools/admin/adtool/default.nix index 5522fd7a68be..f239b18aec9f 100644 --- a/nixpkgs/pkgs/tools/admin/adtool/default.nix +++ b/nixpkgs/pkgs/tools/admin/adtool/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Active Directory administration utility for Unix"; - homepage = https://gp2x.org/adtool; + homepage = "https://gp2x.org/adtool"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index b3e688c681d9..b36daefa16b6 100644 --- a/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with lib; { description = "The Amazon ECR Docker Credential Helper is a credential helper for the Docker daemon that makes it easier to use Amazon Elastic Container Registry"; - homepage = https://github.com/awslabs/amazon-ecr-credential-helper; + homepage = "https://github.com/awslabs/amazon-ecr-credential-helper"; license = licenses.asl20 ; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix index 830dcee26e43..228aa5a26a25 100644 --- a/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Easily rotate your AWS key"; - homepage = https://github.com/Fullscreen/aws-rotate-key; + homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; maintainers = [maintainers.mbode]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 3e145f732362..48a1de61cd80 100644 --- a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, fetchFromGitHub, Security }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "aws-vault"; version = "5.3.2"; @@ -13,15 +13,13 @@ buildGoModule rec { modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9"; subPackages = [ "." ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # set the version. see: aws-vault's Makefile buildFlagsArray = '' -ldflags= -X main.Version=v${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A vault for securely storing and accessing AWS credentials in development environments"; homepage = "https://github.com/99designs/aws-vault"; diff --git a/nixpkgs/pkgs/tools/admin/aws_shell/default.nix b/nixpkgs/pkgs/tools/admin/aws_shell/default.nix index b9169691808f..104c2f1e44a9 100644 --- a/nixpkgs/pkgs/tools/admin/aws_shell/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws_shell/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/awslabs/aws-shell; + homepage = "https://github.com/awslabs/aws-shell"; description = "An integrated shell for working with the AWS CLI"; license = licenses.asl20; maintainers = [ ]; diff --git a/nixpkgs/pkgs/tools/admin/awscli/default.nix b/nixpkgs/pkgs/tools/admin/awscli/default.nix index 08843d5bca97..d64736bc2c52 100644 --- a/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -57,7 +57,7 @@ in with py.pkgs; buildPythonApplication rec { passthru.python = py; # for aws_shell meta = with lib; { - homepage = https://aws.amazon.com/cli/; + homepage = "https://aws.amazon.com/cli/"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; maintainers = with maintainers; [ muflax ]; diff --git a/nixpkgs/pkgs/tools/admin/awslogs/default.nix b/nixpkgs/pkgs/tools/admin/awslogs/default.nix index 92b6d62a8a2d..4a33d7420765 100644 --- a/nixpkgs/pkgs/tools/admin/awslogs/default.nix +++ b/nixpkgs/pkgs/tools/admin/awslogs/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/jorgebastida/awslogs; + homepage = "https://github.com/jorgebastida/awslogs"; description = "AWS CloudWatch logs for Humans"; maintainers = with maintainers; [ dbrock ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/admin/awsweeper/default.nix b/nixpkgs/pkgs/tools/admin/awsweeper/default.nix index 1ea54953701d..661747c2fd0d 100644 --- a/nixpkgs/pkgs/tools/admin/awsweeper/default.nix +++ b/nixpkgs/pkgs/tools/admin/awsweeper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "awsweeper"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to clean out your AWS account"; homepage = "https://github.com/cloudetc/awsweeper/"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index cbec7e86a63f..3c598e67a711 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -11,10 +11,7 @@ let ''; # Prevent these __init__'s from violating PEP420, only needed for python2 - postInstall = (attrs.postInstall or "") + '' - rm $out/${python.sitePackages}/azure/{,__pycache__/}__init__.* \ - $out/${python.sitePackages}/azure/cli/{,__pycache__/}__init__.* - ''; + pythonNamespaces = [ "azure.cli" ]; checkInputs = [ mock pytest ] ++ (attrs.checkInputs or []); checkPhase = attrs.checkPhase or '' @@ -39,9 +36,7 @@ let ''; # force PEP420 - postInstall = '' - rm -f $out/${py.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; }); py = python.override { @@ -116,6 +111,9 @@ let ''; }; + azure-batch = overrideAzureMgmtPackage super.azure-batch "8.0.0" "zip" + "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi"; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; @@ -277,9 +275,7 @@ let propagatedBuildInputs = with self; [ azure-common azure-nspkg msrest msrestazure cryptography ]; - postInstall = '' - rm -f $out/${self.python.sitePackages}/azure/__init__.py - ''; + pythonNamespaces = [ "azure" ]; pythonImportsCheck = [ ]; }); diff --git a/nixpkgs/pkgs/tools/admin/bash-my-aws/default.nix b/nixpkgs/pkgs/tools/admin/bash-my-aws/default.nix index 8c0dd3067439..b99f031f4165 100644 --- a/nixpkgs/pkgs/tools/admin/bash-my-aws/default.nix +++ b/nixpkgs/pkgs/tools/admin/bash-my-aws/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://bash-my-aws.org; + homepage = "https://bash-my-aws.org"; description = "CLI commands for AWS"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; diff --git a/nixpkgs/pkgs/tools/admin/berglas/default.nix b/nixpkgs/pkgs/tools/admin/berglas/default.nix index d088184f7a17..c1c46da41b75 100644 --- a/nixpkgs/pkgs/tools/admin/berglas/default.nix +++ b/nixpkgs/pkgs/tools/admin/berglas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "berglas"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "A tool for managing secrets on Google Cloud"; homepage = "https://github.com/GoogleCloudPlatform/berglas"; diff --git a/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix b/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix index 8e2ef7c87e1d..b98cadd57d11 100644 --- a/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix +++ b/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5"; + url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr"; }; - nativeBuildInputs = [ libcap libxslt docbook_xsl ]; + nativeBuildInputs = [ libxslt docbook_xsl ]; + buildInputs = [ libcap ]; meta = with stdenv.lib; { description = "Unprivileged sandboxing tool"; - homepage = https://github.com/projectatomic/bubblewrap; + homepage = "https://github.com/containers/bubblewrap"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch b/nixpkgs/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch index 62351a70160a..789efd185cae 100644 --- a/nixpkgs/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch +++ b/nixpkgs/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch @@ -22,18 +22,16 @@ ValueError: invalid version number '41.4.0.post20191022' 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/certbot/setup.py b/certbot/setup.py -index c1bf914..7456bf2 100644 +index d19327e5e..ac1524793 100644 --- a/certbot/setup.py +++ b/certbot/setup.py -@@ -3,7 +3,6 @@ import os +@@ -1,5 +1,4 @@ + import codecs +-from distutils.version import StrictVersion + import os import re import sys - --from distutils.version import StrictVersion - from setuptools import find_packages, setup, __version__ as setuptools_version - from setuptools.command.test import test as TestCommand - -@@ -56,20 +55,8 @@ install_requires = [ +@@ -58,20 +57,8 @@ install_requires = [ # Add pywin32 on Windows platforms to handle low-level system calls. # This dependency needs to be added using environment markers to avoid its installation on Linux. @@ -54,7 +52,7 @@ index c1bf914..7456bf2 100644 +install_requires.append(pywin32_req + " ; sys_platform == 'win32'") dev_extras = [ - 'astroid==1.6.5', + 'coverage', -- 2.24.1 diff --git a/nixpkgs/pkgs/tools/admin/certbot/default.nix b/nixpkgs/pkgs/tools/admin/certbot/default.nix index 8fdbfd127783..cabf335fb697 100644 --- a/nixpkgs/pkgs/tools/admin/certbot/default.nix +++ b/nixpkgs/pkgs/tools/admin/certbot/default.nix @@ -1,22 +1,27 @@ -{ stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface +, dialog, mock, gnureadline +, pytest_xdist, pytest, dateutil +}: - -python37Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "certbot"; - version = "1.0.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "180x7gcpfbrzw8k654s7b5nxdy2yg61lq513dykyn3wz4gssw465"; + sha256 = "1nzp1l63f64qqp89y1vyd4lgfhykfp5dkr6iwfiyf273y7sjwpsa"; }; patches = [ ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch ]; - propagatedBuildInputs = with python37Packages; [ + propagatedBuildInputs = [ ConfigArgParse acme configobj @@ -24,26 +29,21 @@ python37Packages.buildPythonApplication rec { distro josepy parsedatetime - psutil pyRFC3339 pyopenssl pytz + requests six zope_component zope_interface ]; - buildInputs = [ dialog ] ++ (with python37Packages; [ mock gnureadline ]); + buildInputs = [ dialog mock gnureadline ]; - checkInputs = with python37Packages; [ - pytest_xdist - pytest - dateutil - ]; + checkInputs = [ pytest_xdist pytest dateutil ]; - postPatch = '' + preBuild = '' cd certbot - substituteInPlace certbot/_internal/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" ''; postInstall = '' @@ -55,11 +55,11 @@ python37Packages.buildPythonApplication rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = src.meta.homepage; description = "ACME client that can obtain certs and extensibly update server configurations"; platforms = platforms.unix; - maintainers = [ maintainers.domenkozar ]; - license = licenses.asl20; + maintainers = with maintainers; [ domenkozar ]; + license = with licenses; [ asl20 ]; }; } diff --git a/nixpkgs/pkgs/tools/admin/certigo/default.nix b/nixpkgs/pkgs/tools/admin/certigo/default.nix index 89c6b8996fa3..5474cb254298 100644 --- a/nixpkgs/pkgs/tools/admin/certigo/default.nix +++ b/nixpkgs/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "A utility to examine and validate certificates in a variety of formats"; homepage = "https://github.com/square/certigo"; diff --git a/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix b/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix index a4b119f126a4..0740b0c1be60 100644 --- a/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix +++ b/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix @@ -15,6 +15,6 @@ buildPythonApplication rec { description = "A tool to detect crontab errors"; license = licenses.asl20; maintainers = with maintainers; [ ma27 ]; - homepage = https://github.com/lyda/chkcrontab; + homepage = "https://github.com/lyda/chkcrontab"; }; } diff --git a/nixpkgs/pkgs/tools/admin/clair/default.nix b/nixpkgs/pkgs/tools/admin/clair/default.nix index a12b8abe1206..3f4d00736ad9 100644 --- a/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/nixpkgs/pkgs/tools/admin/clair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz, Security }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz }: buildGoModule rec { pname = "clair"; @@ -13,16 +13,14 @@ buildGoModule rec { modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/clair \ - --prefix PATH : "${stdenv.lib.makeBinPath [ rpm xz ]}" + --prefix PATH : "${lib.makeBinPath [ rpm xz ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Vulnerability Static Analysis for Containers"; homepage = "https://github.com/quay/clair"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/admin/cli53/default.nix b/nixpkgs/pkgs/tools/admin/cli53/default.nix index 8195207ef60a..0ba4593f6a56 100644 --- a/nixpkgs/pkgs/tools/admin/cli53/default.nix +++ b/nixpkgs/pkgs/tools/admin/cli53/default.nix @@ -18,7 +18,7 @@ buildGoPackage { meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; - homepage = https://github.com/barnybug/cli53; + homepage = "https://github.com/barnybug/cli53"; license = licenses.mit; maintainers = with maintainers; [ benley ]; }; diff --git a/nixpkgs/pkgs/tools/admin/daemontools/default.nix b/nixpkgs/pkgs/tools/admin/daemontools/default.nix index 7e8c1bccc3e8..660563d9757c 100644 --- a/nixpkgs/pkgs/tools/admin/daemontools/default.nix +++ b/nixpkgs/pkgs/tools/admin/daemontools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.publicDomain; - homepage = https://cr.yp.to/daemontools.html; + homepage = "https://cr.yp.to/daemontools.html"; description = "A collection of tools for managing UNIX services."; maintainers = with stdenv.lib.maintainers; [ kevincox ]; diff --git a/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix b/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix index a71958f8a099..741d65259694 100644 --- a/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "docker-credential-gcr"; - version = "1.4.3"; + version = "2.0.1"; goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "1xb88xjyyrdmjcgfv7fqdkv1ip3dpzsdif5vm7vkqvn83s5wj5df"; + sha256 = "0zazbfjbwclkz848vsyb6zhn95gngwrdhivaiw0m9f8a9xm4bp9r"; }; meta = with stdenv.lib; { @@ -20,7 +20,7 @@ buildGoPackage rec { helper. It allows for Docker clients v1.11+ to easily make authenticated requests to GCR's repositories (gcr.io, eu.gcr.io, etc.). ''; - homepage = https://github.com/GoogleCloudPlatform/docker-credential-gcr; + homepage = "https://github.com/GoogleCloudPlatform/docker-credential-gcr"; license = licenses.asl20; maintainers = with maintainers; [ suvash ]; }; diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index c700e4f397c7..6bdcedd97aed 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "eksctl"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1193i30k2m7cibn79xw51i2lxg90f5i97h8sbjiv0hr9g502r2qf"; + sha256 = "0ck096qfj4wp166bymvync8qyb0q2az86hckjk3hrzqdj8vwhrza"; }; - modSha256 = "0f8dlcp3q84fa5dnnzx4347ngb1raw1mxkcqpz2s3zq6d1kv0nvf"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "024fqknv6f1zzcpxfl3c12d7ya7ynsyy7hf7zsnmpsnrksvbkfvc"; subPackages = [ "cmd/eksctl" ]; @@ -27,7 +25,7 @@ buildGoModule rec { $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix b/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix index 8d8f90704999..88ae57251b7f 100644 --- a/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -58,7 +58,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/elastic/curator; + homepage = "https://github.com/elastic/curator"; description = "Curate, or manage, your Elasticsearch indices and snapshots"; license = licenses.asl20; longDescription = '' diff --git a/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock b/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock index e3cfc580fab9..c8c7a0117e57 100644 --- a/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock @@ -156,4 +156,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/admin/fastlane/default.nix b/nixpkgs/pkgs/tools/admin/fastlane/default.nix index 1cdc969ea2e6..01f2d2374072 100644 --- a/nixpkgs/pkgs/tools/admin/fastlane/default.nix +++ b/nixpkgs/pkgs/tools/admin/fastlane/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to automate building and releasing iOS and Android apps"; longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; - homepage = https://github.com/fastlane/fastlane; + homepage = "https://github.com/fastlane/fastlane"; license = licenses.mit; maintainers = with maintainers; [ peterromfeldhk diff --git a/nixpkgs/pkgs/tools/admin/gixy/default.nix b/nixpkgs/pkgs/tools/admin/gixy/default.nix index bbec64c0aee9..118457d40802 100644 --- a/nixpkgs/pkgs/tools/admin/gixy/default.nix +++ b/nixpkgs/pkgs/tools/admin/gixy/default.nix @@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec { Gixy is a tool to analyze Nginx configuration. The main goal of Gixy is to prevent security misconfiguration and automate flaw detection. ''; - homepage = https://github.com/yandex/gixy; + homepage = "https://github.com/yandex/gixy"; license = licenses.mpl20; maintainers = [ maintainers.willibutz ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix b/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix index 37a27127bab0..afaa237d342c 100644 --- a/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix +++ b/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK VNC widget"; - homepage = https://wiki.gnome.org/Projects/gtk-vnc; + homepage = "https://wiki.gnome.org/Projects/gtk-vnc"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin offline ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/admin/iamy/default.nix b/nixpkgs/pkgs/tools/admin/iamy/default.nix index 6a1ec948d907..96c49b58d0b0 100644 --- a/nixpkgs/pkgs/tools/admin/iamy/default.nix +++ b/nixpkgs/pkgs/tools/admin/iamy/default.nix @@ -1,9 +1,11 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "iamy"; version = "2.3.2"; + goPackagePath = "github.com/99designs/iamy"; + src = fetchFromGitHub { owner = "99designs"; repo = "iamy"; @@ -13,15 +15,13 @@ buildGoModule rec { modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [''-ldflags= -X main.Version=v${version} -s -w '']; meta = with stdenv.lib; { description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; - homepage = https://github.com/99designs/iamy; + homepage = "https://github.com/99designs/iamy"; license = licenses.mit; maintainers = with maintainers; [ suvash ]; }; diff --git a/nixpkgs/pkgs/tools/admin/intecture/agent.nix b/nixpkgs/pkgs/tools/admin/intecture/agent.nix index 7fc3da2f19c5..1c2d84836ebb 100644 --- a/nixpkgs/pkgs/tools/admin/intecture/agent.nix +++ b/nixpkgs/pkgs/tools/admin/intecture/agent.nix @@ -22,7 +22,7 @@ buildRustPackage rec { meta = with lib; { description = "Authentication client/server for Intecture components"; - homepage = https://intecture.io; + homepage = "https://intecture.io"; license = licenses.mpl20; maintainers = [ maintainers.rushmorem ]; }; diff --git a/nixpkgs/pkgs/tools/admin/intecture/auth.nix b/nixpkgs/pkgs/tools/admin/intecture/auth.nix index f60cbaf7b6e7..0d7443d3225e 100644 --- a/nixpkgs/pkgs/tools/admin/intecture/auth.nix +++ b/nixpkgs/pkgs/tools/admin/intecture/auth.nix @@ -22,7 +22,7 @@ buildRustPackage rec { meta = with lib; { description = "Authentication client/server for Intecture components"; - homepage = https://intecture.io; + homepage = "https://intecture.io"; license = licenses.mpl20; maintainers = [ maintainers.rushmorem ]; }; diff --git a/nixpkgs/pkgs/tools/admin/intecture/cli.nix b/nixpkgs/pkgs/tools/admin/intecture/cli.nix index 73865bdea787..5a841b920402 100644 --- a/nixpkgs/pkgs/tools/admin/intecture/cli.nix +++ b/nixpkgs/pkgs/tools/admin/intecture/cli.nix @@ -25,7 +25,7 @@ buildRustPackage rec { meta = with lib; { description = "A developer friendly, language agnostic configuration management tool for server systems"; - homepage = https://intecture.io; + homepage = "https://intecture.io"; license = licenses.mpl20; maintainers = [ maintainers.rushmorem ]; }; diff --git a/nixpkgs/pkgs/tools/admin/lego/default.nix b/nixpkgs/pkgs/tools/admin/lego/default.nix index 0cb614c12d1f..72c61ceecaf2 100644 --- a/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "lego"; @@ -14,13 +14,11 @@ buildGoModule rec { modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii"; subPackages = [ "cmd/lego" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; diff --git a/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/nixpkgs/pkgs/tools/admin/lexicon/default.nix index 4f6db4169a15..31705d1e79c2 100644 --- a/nixpkgs/pkgs/tools/admin/lexicon/default.nix +++ b/nixpkgs/pkgs/tools/admin/lexicon/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Manipulate DNS records on various DNS providers in a standardized way."; - homepage = https://github.com/AnalogJ/lexicon; + homepage = "https://github.com/AnalogJ/lexicon"; maintainers = with maintainers; [ flyfloh ]; license = licenses.mit; }; diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index efd6db395f20..f85a61be4a8d 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -9,13 +9,13 @@ buildGoPackage rec { pname = "lxd"; - version = "3.23"; + version = "4.0.0"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1zbm736m9g4c40r55s6rg3xrgw9bysslr992sa80vlrxfmwfiqg4"; + sha256 = "00kydp6aysggng9a7m0q3zj3591yk6jgcibbqxx4ki20pd4vmqnb"; }; preBuild = '' @@ -49,7 +49,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; - homepage = https://linuxcontainers.org/lxd/; + homepage = "https://linuxcontainers.org/lxd/"; license = licenses.asl20; maintainers = with maintainers; [ fpletz wucke13 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/admin/mycli/default.nix b/nixpkgs/pkgs/tools/admin/mycli/default.nix index 7414b83b16e7..42c790d1adaa 100644 --- a/nixpkgs/pkgs/tools/admin/mycli/default.nix +++ b/nixpkgs/pkgs/tools/admin/mycli/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { Rich command-line interface for MySQL with auto-completion and syntax highlighting. ''; - homepage = http://mycli.net; + homepage = "http://mycli.net"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.jojosch ]; }; diff --git a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix index 9e93b5f2f75e..b999c65f6f66 100644 --- a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix +++ b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix @@ -77,10 +77,10 @@ in meta = with stdenv.lib; { description = "NoMachine remote desktop client (nxplayer)"; - homepage = https://www.nomachine.com/; + homepage = "https://www.nomachine.com/"; license = { fullName = "NoMachine 6 End-User License Agreement"; - url = https://www.nomachine.com/licensing-6; + url = "https://www.nomachine.com/licensing-6"; free = false; }; maintainers = with maintainers; [ talyz ]; diff --git a/nixpkgs/pkgs/tools/admin/oxidized/Gemfile.lock b/nixpkgs/pkgs/tools/admin/oxidized/Gemfile.lock index 0832bce6d2ee..64bc02cafc3c 100644 --- a/nixpkgs/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/nixpkgs/pkgs/tools/admin/oxidized/Gemfile.lock @@ -77,4 +77,4 @@ DEPENDENCIES oxidized-web (= 0.13.1) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/admin/oxidized/default.nix b/nixpkgs/pkgs/tools/admin/oxidized/default.nix index a11906e80f04..01129c5afb10 100644 --- a/nixpkgs/pkgs/tools/admin/oxidized/default.nix +++ b/nixpkgs/pkgs/tools/admin/oxidized/default.nix @@ -12,7 +12,7 @@ bundlerApp { meta = with lib; { description = "Oxidized is a network device configuration backup tool. It's a RANCID replacement!"; - homepage = https://github.com/ytti/oxidized; + homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; maintainers = with maintainers; [ willibutz nicknovitski ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/admin/pebble/default.nix b/nixpkgs/pkgs/tools/admin/pebble/default.nix index 5aa220fd89e6..efd9bfe05964 100644 --- a/nixpkgs/pkgs/tools/admin/pebble/default.nix +++ b/nixpkgs/pkgs/tools/admin/pebble/default.nix @@ -4,7 +4,7 @@ }: let - version = "v2.2.2"; + version = "v2.3.0"; pname = "pebble"; in buildGoPackage { inherit pname version; @@ -14,13 +14,13 @@ in buildGoPackage { owner = "letsencrypt"; repo = pname; rev = version; - sha256 = "10g6ivdxxp3632wk0gvmp75v9x668kchhmlczbsq8qnsc8sb8pwf"; + sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2"; }; meta = { - homepage = "https://github.com/letsencrypt/boulder"; + homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; license = [ lib.licenses.mpl20 ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ emily ]; }; } diff --git a/nixpkgs/pkgs/tools/admin/procs/default.nix b/nixpkgs/pkgs/tools/admin/procs/default.nix index db6f27a3010f..180764bd8c9b 100644 --- a/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.9.20"; + version = "0.10.0"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "00qqn8nwv791bs88n302hy67dpas5hcacnkakn7law567klnzxfz"; + sha256 = "1bgsxvb9wxi4sz8jfamhdwaq9f2q2k7c3cdkk60k86mkmas8ibxz"; }; - cargoSha256 = "09ib1nlqhzq3mc5wc16mgqbyr652asrwdpbwaax54fm1gd334prl"; + cargoSha256 = "0zf41clf3rqxmal894gqp9fn9bnas99wna13fc43fxdlvh92v4yh"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { description = "A modern replacement for ps written in Rust"; homepage = "https://github.com/dalance/procs"; license = licenses.mit; - maintainers = with maintainers; [ dalance filalex77 ]; + maintainers = with maintainers; [ dalance filalex77 ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix index d6fc6e8a837a..07ad2d95f14a 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { buildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; meta = { - homepage = https://pulumi.io/; + homepage = "https://pulumi.io/"; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; license = with licenses; [ asl20 ]; platforms = builtins.attrNames data.pulumiPkgs; diff --git a/nixpkgs/pkgs/tools/admin/s3bro/default.nix b/nixpkgs/pkgs/tools/admin/s3bro/default.nix index 9f383a8638d3..154b4aae9665 100644 --- a/nixpkgs/pkgs/tools/admin/s3bro/default.nix +++ b/nixpkgs/pkgs/tools/admin/s3bro/default.nix @@ -16,8 +16,8 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "A handy s3 cli tool"; - homepage = https://github.com/rsavordelli/s3bro; + homepage = "https://github.com/rsavordelli/s3bro"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/tools/admin/salt/default.nix b/nixpkgs/pkgs/tools/admin/salt/default.nix index c94686c93c16..b648cdb25124 100644 --- a/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -41,7 +41,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://saltstack.com/; + homepage = "https://saltstack.com/"; description = "Portable, distributed, remote execution and configuration management system"; maintainers = with maintainers; [ aneeshusa ]; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix b/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix index 4bf24e3092d7..e2cfa806f95b 100644 --- a/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix +++ b/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "A CLI front-end to a running salt-api system"; - homepage = https://github.com/saltstack/pepper; + homepage = "https://github.com/saltstack/pepper"; maintainers = [ maintainers.pierrer ]; license = licenses.asl20; }; diff --git a/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index 3365d87bba4a..68c20493d195 100644 --- a/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec{ meta = with stdenv.lib; { description = "Interact with Scaleway API from the command line"; - homepage = https://github.com/scaleway/scaleway-cli; + homepage = "https://github.com/scaleway/scaleway-cli"; license = licenses.mit; maintainers = with maintainers; [ nickhu ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/admin/sec/default.nix b/nixpkgs/pkgs/tools/admin/sec/default.nix index f6f5923eb4ab..c1ae07c0fdad 100644 --- a/nixpkgs/pkgs/tools/admin/sec/default.nix +++ b/nixpkgs/pkgs/tools/admin/sec/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://simple-evcorr.github.io; + homepage = "https://simple-evcorr.github.io"; license = stdenv.lib.licenses.gpl2; description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; diff --git a/nixpkgs/pkgs/tools/admin/sewer/default.nix b/nixpkgs/pkgs/tools/admin/sewer/default.nix index 776ba89e48ce..471a8788a95e 100644 --- a/nixpkgs/pkgs/tools/admin/sewer/default.nix +++ b/nixpkgs/pkgs/tools/admin/sewer/default.nix @@ -2,17 +2,17 @@ python3Packages.buildPythonApplication rec { pname = "sewer"; - version = "0.7.9"; + version = "0.8.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "c083223d8aa66d4fc6801452d291a98540d1ee41557ce3e1754c62e73f7c9738"; + sha256 = "0s8f0w6nv8dcs5yw7rn49981b3c9mnnx4f6wzqw4zha0rpp60z22"; }; propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ]; meta = with stdenv.lib; { - homepage = https://github.com/komuw/sewer; + homepage = "https://github.com/komuw/sewer"; description = "ACME client"; license = licenses.mit; maintainers = with maintainers; [ kevincox ]; diff --git a/nixpkgs/pkgs/tools/admin/simp_le/default.nix b/nixpkgs/pkgs/tools/admin/simp_le/default.nix index eaefba365450..6ff547ab5322 100644 --- a/nixpkgs/pkgs/tools/admin/simp_le/default.nix +++ b/nixpkgs/pkgs/tools/admin/simp_le/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; meta = with stdenv.lib; { - homepage = https://github.com/zenhack/simp_le; + homepage = "https://github.com/zenhack/simp_le"; description = "Simple Let's Encrypt client"; license = licenses.gpl3; maintainers = with maintainers; [ gebner makefu ]; diff --git a/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix b/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix index e6a83c397c57..b94d77bdf706 100644 --- a/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a Bourne shell script that can be used to report on expiring SSL certificates"; - homepage = https://github.com/Matty9191/ssl-cert-check; + homepage = "https://github.com/Matty9191/ssl-cert-check"; license = licenses.gpl2; maintainers = [ maintainers.ryantm ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/admin/swiftclient/default.nix b/nixpkgs/pkgs/tools/admin/swiftclient/default.nix index 788a64f928a4..91860d2df08e 100644 --- a/nixpkgs/pkgs/tools/admin/swiftclient/default.nix +++ b/nixpkgs/pkgs/tools/admin/swiftclient/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "3.6.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0sv6z72zdwzwdjng0djk3l2maryn9pz3khf69yq5ig2ycz8hh0qv"; + sha256 = "0xx3v5kk8jp352rydy3jxndy1b9kl2zmkj1gi14fjxjc5r4rf82g"; }; propagatedBuildInputs = [ requests six pbr setuptools ]; @@ -24,7 +24,7 @@ buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = https://github.com/openstack/python-swiftclient; + homepage = "https://github.com/openstack/python-swiftclient"; description = "Python bindings to the OpenStack Object Storage API"; license = licenses.asl20; maintainers = with maintainers; [ c0deaddict ]; diff --git a/nixpkgs/pkgs/tools/admin/tightvnc/default.nix b/nixpkgs/pkgs/tools/admin/tightvnc/default.nix index 1a65c31102e9..7dc416c8efda 100644 --- a/nixpkgs/pkgs/tools/admin/tightvnc/default.nix +++ b/nixpkgs/pkgs/tools/admin/tightvnc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "tightvnc-1.3.10"; src = fetchurl { - url = mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2; + url = "mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2"; sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d"; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://vnc-tight.sourceforge.net/; + homepage = "http://vnc-tight.sourceforge.net/"; description = "Improved version of VNC"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/admin/virtscreen/default.nix b/nixpkgs/pkgs/tools/admin/virtscreen/default.nix index 73a81fcff875..3c5fb64f7224 100644 --- a/nixpkgs/pkgs/tools/admin/virtscreen/default.nix +++ b/nixpkgs/pkgs/tools/admin/virtscreen/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Make your iPad/tablet/computer as a secondary monitor on Linux"; - homepage = https://github.com/kbumsik/VirtScreen; + homepage = "https://github.com/kbumsik/VirtScreen"; license = licenses.gpl3; maintainers = with maintainers; [ borisbabic ]; }; diff --git a/nixpkgs/pkgs/tools/admin/vncdo/default.nix b/nixpkgs/pkgs/tools/admin/vncdo/default.nix index 3dd7a45aa2b7..5ca633a944b2 100644 --- a/nixpkgs/pkgs/tools/admin/vncdo/default.nix +++ b/nixpkgs/pkgs/tools/admin/vncdo/default.nix @@ -23,7 +23,7 @@ python2Packages.buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/sibson/vncdotool; + homepage = "https://github.com/sibson/vncdotool"; description = "A command line VNC client and python library"; license = licenses.mit; maintainers = with maintainers; [ elitak ]; diff --git a/nixpkgs/pkgs/tools/archivers/afio/default.nix b/nixpkgs/pkgs/tools/archivers/afio/default.nix index 8d1e28fed296..e2fe3d90ee6c 100644 --- a/nixpkgs/pkgs/tools/archivers/afio/default.nix +++ b/nixpkgs/pkgs/tools/archivers/afio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = { - homepage = http://members.chello.nl/~k.holtman/afio.html; + homepage = "http://members.chello.nl/~k.holtman/afio.html"; description = "Fault tolerant cpio archiver targeting backups"; platforms = stdenv.lib.platforms.all; /* diff --git a/nixpkgs/pkgs/tools/archivers/atool/default.nix b/nixpkgs/pkgs/tools/archivers/atool/default.nix index 64a606a4cb50..0d24ead456a7 100644 --- a/nixpkgs/pkgs/tools/archivers/atool/default.nix +++ b/nixpkgs/pkgs/tools/archivers/atool/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "atool-0.39.0"; src = fetchurl { - url = mirror://savannah/atool/atool-0.39.0.tar.gz; + url = "mirror://savannah/atool/atool-0.39.0.tar.gz"; sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { configureScript = "${bash}/bin/bash configure"; meta = { - homepage = https://www.nongnu.org/atool; + homepage = "https://www.nongnu.org/atool"; description = "Archive command line helper"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/archivers/cabextract/default.nix b/nixpkgs/pkgs/tools/archivers/cabextract/default.nix index d8a874d0b2e9..14c4ede50041 100644 --- a/nixpkgs/pkgs/tools/archivers/cabextract/default.nix +++ b/nixpkgs/pkgs/tools/archivers/cabextract/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.cabextract.org.uk/; + homepage = "https://www.cabextract.org.uk/"; description = "Free Software for extracting Microsoft cabinet files"; platforms = platforms.all; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/archivers/cpio/default.nix b/nixpkgs/pkgs/tools/archivers/cpio/default.nix index 3f6b3ba4598c..a196ddcaa306 100644 --- a/nixpkgs/pkgs/tools/archivers/cpio/default.nix +++ b/nixpkgs/pkgs/tools/archivers/cpio/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/cpio/; + homepage = "https://www.gnu.org/software/cpio/"; description = "A program to create or extract from cpio archives"; license = licenses.gpl3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/archivers/cromfs/default.nix b/nixpkgs/pkgs/tools/archivers/cromfs/default.nix index 57a8a8e97380..e0eb11aa9a6f 100644 --- a/nixpkgs/pkgs/tools/archivers/cromfs/default.nix +++ b/nixpkgs/pkgs/tools/archivers/cromfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FUSE Compressed ROM filesystem with lzma"; - homepage = https://bisqwit.iki.fi/source/cromfs.html; + homepage = "https://bisqwit.iki.fi/source/cromfs.html"; license = licenses.gpl3; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix b/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix index 3f958f7f958d..31341e417875 100644 --- a/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix +++ b/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { checksummed in the archive in order to protect the data. If the archive is corrupt, you just loose the current file, not the whole archive. ''; - homepage = http://www.fsarchiver.org/; + homepage = "http://www.fsarchiver.org/"; license = licenses.lgpl2; maintainers = [ maintainers.etu ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/archivers/gnutar/default.nix b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix index caf507670f4f..749f795c449a 100644 --- a/nixpkgs/pkgs/tools/archivers/gnutar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/tar/; + homepage = "https://www.gnu.org/software/tar/"; description = "GNU implementation of the `tar' archiver"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/archivers/innoextract/default.nix b/nixpkgs/pkgs/tools/archivers/innoextract/default.nix index 6a8c8c712747..5dab19501456 100644 --- a/nixpkgs/pkgs/tools/archivers/innoextract/default.nix +++ b/nixpkgs/pkgs/tools/archivers/innoextract/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to unpack installers created by Inno Setup"; - homepage = https://constexpr.org/innoextract/; + homepage = "https://constexpr.org/innoextract/"; license = licenses.zlib; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/archivers/ndstool/default.nix b/nixpkgs/pkgs/tools/archivers/ndstool/default.nix index 7af30e313f45..9a6350a8df16 100644 --- a/nixpkgs/pkgs/tools/archivers/ndstool/default.nix +++ b/nixpkgs/pkgs/tools/archivers/ndstool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = https://github.com/devkitPro/ndstool; + homepage = "https://github.com/devkitPro/ndstool"; description = "A tool to unpack and repack nds rom"; maintainers = [ stdenv.lib.maintainers.marius851000 ]; license = stdenv.lib.licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/archivers/p7zip/default.nix b/nixpkgs/pkgs/tools/archivers/p7zip/default.nix index 465bc474a9e5..f44791ce021b 100644 --- a/nixpkgs/pkgs/tools/archivers/p7zip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/p7zip/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { - homepage = http://p7zip.sourceforge.net/; + homepage = "http://p7zip.sourceforge.net/"; description = "A port of the 7-zip archiver"; # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/archivers/pxattr/default.nix b/nixpkgs/pkgs/tools/archivers/pxattr/default.nix index b507b60287c9..74ad0669d693 100644 --- a/nixpkgs/pkgs/tools/archivers/pxattr/default.nix +++ b/nixpkgs/pkgs/tools/archivers/pxattr/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.lesbonscomptes.com/pxattr/index.html; + homepage = "https://www.lesbonscomptes.com/pxattr/index.html"; description = "Provides a single interface to extended file attributes"; maintainers = [ stdenv.lib.maintainers.vrthra ]; license = [ stdenv.lib.licenses.mit ]; diff --git a/nixpkgs/pkgs/tools/archivers/s-tar/default.nix b/nixpkgs/pkgs/tools/archivers/s-tar/default.nix index 48e5cc6c4361..30ff2bc36a25 100644 --- a/nixpkgs/pkgs/tools/archivers/s-tar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/s-tar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { The way star acts may be modified by additional options. Note that unpacking tar archives may be a security risk because star may overwrite existing files. ''; - homepage = http://cdrtools.sourceforge.net/private/star.html; + homepage = "http://cdrtools.sourceforge.net/private/star.html"; license = stdenv.lib.licenses.cddl; maintainers = [ stdenv.lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/archivers/sharutils/default.nix b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix index b4fc2377f0e4..aefe4f87eb4a 100644 --- a/nixpkgs/pkgs/tools/archivers/sharutils/default.nix +++ b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { by a copy of the shell. unshar may also process files containing concatenated shell archives. ''; - homepage = https://www.gnu.org/software/sharutils/; + homepage = "https://www.gnu.org/software/sharutils/"; license = licenses.gpl3Plus; maintainers = []; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/archivers/unar/default.nix b/nixpkgs/pkgs/tools/archivers/unar/default.nix index 1104548f77f8..259238cdec5e 100644 --- a/nixpkgs/pkgs/tools/archivers/unar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unar/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://unarchiver.c3.cx/unarchiver; + homepage = "http://unarchiver.c3.cx/unarchiver"; description = "An archive unpacker program"; longDescription = '' The Unarchiver is an archive unpacker program with support for the popular \ diff --git a/nixpkgs/pkgs/tools/archivers/undmg/default.nix b/nixpkgs/pkgs/tools/archivers/undmg/default.nix index 72be49d97927..79b861de485e 100644 --- a/nixpkgs/pkgs/tools/archivers/undmg/default.nix +++ b/nixpkgs/pkgs/tools/archivers/undmg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/matthewbauer/undmg; + homepage = "https://github.com/matthewbauer/undmg"; description = "Extract a DMG file"; license = licenses.gpl3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/archivers/unp/default.nix b/nixpkgs/pkgs/tools/archivers/unp/default.nix index 82e83a8c6a38..afe00972141c 100644 --- a/nixpkgs/pkgs/tools/archivers/unp/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unp/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Command line tool for unpacking archives easily"; - homepage = https://packages.qa.debian.org/u/unp.html; + homepage = "https://packages.qa.debian.org/u/unp.html"; license = with licenses; [ gpl2 ]; maintainers = [ maintainers.timor ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/nixpkgs/pkgs/tools/archivers/unrar/default.nix index 44e55a271fd3..9396267b3a10 100644 --- a/nixpkgs/pkgs/tools/archivers/unrar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "0071inswykarjbg4a80fz4n9xdinjfvxd9kmwz5gq0i1w2wd3c8f"; + sha256 = "19nsxdvf9ll99hvgzq6f89ymxhwki224lygjdabrg8ghikqvmlvk"; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility for RAR archives"; - homepage = https://www.rarlab.com/; + homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/archivers/unshield/default.nix b/nixpkgs/pkgs/tools/archivers/unshield/default.nix index cfab2443032b..dbcb2b24f100 100644 --- a/nixpkgs/pkgs/tools/archivers/unshield/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unshield/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool and library to extract CAB files from InstallShield installers"; - homepage = https://github.com/twogood/unshield; + homepage = "https://github.com/twogood/unshield"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/archivers/unzip/default.nix b/nixpkgs/pkgs/tools/archivers/unzip/default.nix index b8f649fbdcbb..b3b150637d60 100644 --- a/nixpkgs/pkgs/tools/archivers/unzip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unzip/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "unzip-6.0"; src = fetchurl { - url = mirror://sourceforge/infozip/unzip60.tar.gz; + url = "mirror://sourceforge/infozip/unzip60.tar.gz"; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = http://www.info-zip.org; + homepage = "http://www.info-zip.org"; description = "An extraction utility for archives compressed in .zip format"; license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/archivers/wimlib/default.nix b/nixpkgs/pkgs/tools/archivers/wimlib/default.nix index 9d58bf5c2f89..da01602cca43 100644 --- a/nixpkgs/pkgs/tools/archivers/wimlib/default.nix +++ b/nixpkgs/pkgs/tools/archivers/wimlib/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wimlib.net; + homepage = "https://wimlib.net"; description = "A library and program to extract, create, and modify WIM files"; platforms = platforms.unix; maintainers = with maintainers; [ andir ]; diff --git a/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix index 1a05c1ba2699..fd53cd9b54bb 100644 --- a/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix +++ b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; - homepage = https://github.com/ib/xarchiver; + homepage = "https://github.com/ib/xarchiver"; maintainers = [ stdenv.lib.maintainers.domenkozar ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/archivers/zip/default.nix b/nixpkgs/pkgs/tools/archivers/zip/default.nix index 09ba6510707b..173f48121090 100644 --- a/nixpkgs/pkgs/tools/archivers/zip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/zip/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz - https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz" + "https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz" ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compressor/archiver for creating and modifying zipfiles"; - homepage = http://www.info-zip.org; + homepage = "http://www.info-zip.org"; license = licenses.bsdOriginal; platforms = platforms.all; maintainers = [ ]; diff --git a/nixpkgs/pkgs/tools/archivers/zpaq/default.nix b/nixpkgs/pkgs/tools/archivers/zpaq/default.nix index 09c4e914bd88..dbdcdf5cada8 100644 --- a/nixpkgs/pkgs/tools/archivers/zpaq/default.nix +++ b/nixpkgs/pkgs/tools/archivers/zpaq/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Incremental journaling backup utility and archiver"; - homepage = http://mattmahoney.net/dc/zpaq.html; + homepage = "http://mattmahoney.net/dc/zpaq.html"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix index 4a824050c9fd..302654f77154 100644 --- a/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype pango ]; meta = with stdenv.lib; { - homepage = http://moinejf.free.fr/; + homepage = "http://moinejf.free.fr/"; license = licenses.gpl3; description = "A command line program which converts ABC to music sheet in PostScript or SVG format"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index b0b65a560bf3..0ccfaa081c9a 100644 --- a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.02.12"; + version = "2020.03.25"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "1h0ixdbhxdfvii9in9pdidkdv12qfwbhjy3diknywl0yvaa40xw0"; + sha256 = "0rzif8idsja8ryhx0y4zdk8lhn36h10ahfjqa8bmif0rdbyab0kv"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://abc.sourceforge.net/abcMIDI/"; - downloadPage = https://ifdo.ca/~seymour/runabc/top.html; + downloadPage = "https://ifdo.ca/~seymour/runabc/top.html"; license = licenses.gpl2Plus; description = "Utilities for converting between abc and MIDI"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix b/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix index 4590a0dfbc30..efd440256470 100644 --- a/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix +++ b/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program for computing the AccurateRip checksum of singletrack WAV files"; - homepage = https://github.com/leo-bogert/accuraterip-checksum; + homepage = "https://github.com/leo-bogert/accuraterip-checksum"; license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 7b92b973df4c..e2824bc07b66 100644 --- a/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://acoustid.org/fingerprinter; + homepage = "https://acoustid.org/fingerprinter"; description = "Audio fingerprinting tool using chromaprint"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ ehmry ]; diff --git a/nixpkgs/pkgs/tools/audio/alsaequal/caps_9.x.patch b/nixpkgs/pkgs/tools/audio/alsaequal/caps_9.x.patch new file mode 100644 index 000000000000..282e04049747 --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/alsaequal/caps_9.x.patch @@ -0,0 +1,21 @@ +--- ./ctl_equal.c ++++ ./ctl_equal.c +@@ -167,7 +167,7 @@ + snd_ctl_equal_t *equal; + const char *controls = ".alsaequal.bin"; + const char *library = "/usr/lib/ladspa/caps.so"; +- const char *module = "Eq"; ++ const char *module = "Eq10"; + long channels = 2; + const char *sufix = " Playback Volume"; + int err, i, index; +--- ./pcm_equal.c ++++ ./pcm_equal.c +@@ -151,7 +151,7 @@ + snd_config_t *sconf = NULL; + const char *controls = ".alsaequal.bin"; + const char *library = "/usr/lib/ladspa/caps.so"; +- const char *module = "Eq"; ++ const char *module = "Eq10"; + long channels = 2; + int err; diff --git a/nixpkgs/pkgs/tools/audio/alsaequal/default.nix b/nixpkgs/pkgs/tools/audio/alsaequal/default.nix new file mode 100644 index 000000000000..9498baca991b --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/alsaequal/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl +, alsaLib, caps +}: + +stdenv.mkDerivation rec { + name = "alsaequal"; + version = "0.6"; + + src = fetchurl { + url = "https://thedigitalmachine.net/tools/alsaequal-${version}.tar.bz2"; + sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli"; + }; + + buildInputs = [ alsaLib ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + # Borrowed from Arch Linux's AUR + patches = [ + # Adds executable permissions to resulting libraries + # and changes their destination directory from "usr/lib/alsa-lib" to "lib/alsa-lib" to better align with nixpkgs filesystem hierarchy. + ./makefile.patch + # Fixes control port check, which resulted in false error. + ./false_error.patch + # Fixes name change of an "Eq" to "Eq10" method in version 9 of caps library. + ./caps_9.x.patch + ]; + + postPatch = '' + sed -i 's#/usr/lib/ladspa/caps\.so#${caps}/lib/ladspa/caps\.so#g' ctl_equal.c pcm_equal.c + ''; + + preInstall = '' + mkdir -p "$out/lib/alsa-lib" + ''; + + meta = with stdenv.lib; { + description = "Real-time adjustable equalizer plugin for ALSA"; + homepage = "https://thedigitalmachine.net/alsaequal.html"; + license = licenses.gpl2; + maintainers = with maintainers; [ ymeister ]; + }; +} diff --git a/nixpkgs/pkgs/tools/audio/alsaequal/false_error.patch b/nixpkgs/pkgs/tools/audio/alsaequal/false_error.patch new file mode 100644 index 000000000000..1a8413da2741 --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/alsaequal/false_error.patch @@ -0,0 +1,13 @@ +--- ./ctl_equal.c ++++ ./ctl_equal.c +@@ -263,8 +263,8 @@ + for(i = 0; i < equal->num_input_controls; i++) { + if(equal->control_data->control[i].type == LADSPA_CNTRL_INPUT) { + index = equal->control_data->control[i].index; +- if(equal->klass->PortDescriptors[index] != +- (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) { ++ if(equal->klass->PortDescriptors[index] & ++ (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL) == 0) { + SNDERR("Problem with control file %s, %d.", controls, index); + return -1; + } diff --git a/nixpkgs/pkgs/tools/audio/alsaequal/makefile.patch b/nixpkgs/pkgs/tools/audio/alsaequal/makefile.patch new file mode 100644 index 000000000000..ee8aa170d60b --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/alsaequal/makefile.patch @@ -0,0 +1,13 @@ +--- ./Makefile ++++ ./Makefile +@@ -45,8 +45,8 @@ + + install: all + @echo Installing... +- $(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/ +- $(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/ ++ $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/lib/alsa-lib/ ++ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/lib/alsa-lib/ + + uninstall: + @echo Un-installing... diff --git a/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix index 75d8975ab32c..fdad7dd89844 100644 --- a/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Beets plugin to manage external files"; - homepage = https://github.com/geigerzaehler/beets-alternatives; + homepage = "https://github.com/geigerzaehler/beets-alternatives"; maintainers = [ stdenv.lib.maintainers.aszlig ]; license = stdenv.lib.licenses.mit; }; diff --git a/nixpkgs/pkgs/tools/audio/beets/check-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/check-plugin.nix index 49ee97ead06a..241dcdad4521 100644 --- a/nixpkgs/pkgs/tools/audio/beets/check-plugin.nix +++ b/nixpkgs/pkgs/tools/audio/beets/check-plugin.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Beets plugin to Verify and store checksums in your library"; - homepage = https://github.com/geigerzaehler/beets-check; + homepage = "https://github.com/geigerzaehler/beets-check"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix index fac37962f3cf..9432cb9bd0b9 100644 --- a/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix +++ b/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication { meta = { description = "Beets plugin to move non-music files during the import process"; - homepage = https://github.com/sbarakat/beets-copyartifacts; + homepage = "https://github.com/sbarakat/beets-copyartifacts"; license = stdenv.lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/tools/audio/beets/default.nix b/nixpkgs/pkgs/tools/audio/beets/default.nix index 1eb8dd114f5f..71ebe7ceb81d 100644 --- a/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -172,6 +172,13 @@ in pythonPackages.buildPythonApplication rec { nose rarfile responses + # Although considered as plugin dependencies, they are needed for the + # tests, for disabling them via an override makes the build fail. see: + # https://github.com/beetbox/beets/blob/v1.4.9/setup.py + pylast + mpd2 + discogs_client + pyxdg ]; patches = [ @@ -257,7 +264,7 @@ in pythonPackages.buildPythonApplication rec { meta = { description = "Music tagger and library organizer"; - homepage = http://beets.io; + homepage = "http://beets.io"; license = licenses.mit; maintainers = with maintainers; [ aszlig domenkozar pjones ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/audio/darkice/default.nix b/nixpkgs/pkgs/tools/audio/darkice/default.nix index c5f7bcd5a71d..89b93b02865f 100644 --- a/nixpkgs/pkgs/tools/audio/darkice/default.nix +++ b/nixpkgs/pkgs/tools/audio/darkice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://darkice.org/; + homepage = "http://darkice.org/"; description = "Live audio streamer"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ]; diff --git a/nixpkgs/pkgs/tools/audio/dir2opus/default.nix b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix index d6c988ef0bed..872006547031 100644 --- a/nixpkgs/pkgs/tools/audio/dir2opus/default.nix +++ b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; meta = with stdenv.lib; { - homepage = https://github.com/ehmry/dir2opus; + homepage = "https://github.com/ehmry/dir2opus"; maintainers = [ maintainers.ehmry ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/audio/ezstream/default.nix b/nixpkgs/pkgs/tools/audio/ezstream/default.nix index fbf90d2211c4..02a6e9d37f37 100644 --- a/nixpkgs/pkgs/tools/audio/ezstream/default.nix +++ b/nixpkgs/pkgs/tools/audio/ezstream/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { from standard input without reencoding and thus requires only very little CPU resources. ''; - homepage = http://icecast.org/ezstream/; + homepage = "http://icecast.org/ezstream/"; license = licenses.gpl2; maintainers = [ maintainers.barrucadu ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/audio/glyr/default.nix b/nixpkgs/pkgs/tools/audio/glyr/default.nix index 2acca1510400..41490381487e 100644 --- a/nixpkgs/pkgs/tools/audio/glyr/default.nix +++ b/nixpkgs/pkgs/tools/audio/glyr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.lgpl3; description = "A music related metadata searchengine"; - homepage = https://github.com/sahib/glyr; + homepage = "https://github.com/sahib/glyr"; maintainers = [ maintainers.sternenseemann ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix b/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix index f7e96971ab19..f95dcc8bb6dd 100644 --- a/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix +++ b/nixpkgs/pkgs/tools/audio/google-music-scripts/default.nix @@ -1,17 +1,22 @@ { lib, python3 }: -python3.pkgs.buildPythonApplication rec { +with python3.pkgs; + +buildPythonApplication rec { pname = "google-music-scripts"; - version = "4.0.1"; + version = "4.3.0"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "5b2e9fdde8781a6d226984f0b61add2415a3804123ceeecb20fcc8527de9389d"; + sha256 = "0dykjhqklbpqr1lvls0bgf6xkwvslj37lx4q8522hjbs150pwjmq"; }; - patches = [ ./loguru.patch ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "audio-metadata>=0.8,<0.9" "audio-metadata" + ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ appdirs audio-metadata google-music @@ -24,10 +29,12 @@ python3.pkgs.buildPythonApplication rec { ]; # No tests - doCheck = false; + checkPhase = '' + $out/bin/gms --help >/dev/null + ''; meta = with lib; { - homepage = https://github.com/thebigmunch/google-music-scripts; + homepage = "https://github.com/thebigmunch/google-music-scripts"; description = "A CLI utility for interacting with Google Music"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/nixpkgs/pkgs/tools/audio/google-music-scripts/loguru.patch b/nixpkgs/pkgs/tools/audio/google-music-scripts/loguru.patch deleted file mode 100644 index 141ce044c431..000000000000 --- a/nixpkgs/pkgs/tools/audio/google-music-scripts/loguru.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -24,7 +24,7 @@ audio-metadata = "^0.4" - google-music = "^3.0" - google-music-proto = "^2.4" - google-music-utils = "^2.1" --loguru = "^0.2" -+loguru = "^0.3" - pendulum = "^2.0" - natsort = ">=5.0,<7.0" - tomlkit = "^0.5" ---- a/setup.py -+++ b/setup.py -@@ -16,7 +16,7 @@ install_requires = \ - 'google-music-proto>=2.4,<3.0', - 'google-music-utils>=2.1,<3.0', - 'google-music>=3.0,<4.0', -- 'loguru>=0.2,<0.3', -+ 'loguru>=0.3,<0.4', - 'natsort>=5.0,<7.0', - 'pendulum>=2.0,<3.0', - 'tomlkit>=0.5,<0.6'] diff --git a/nixpkgs/pkgs/tools/audio/gvolicon/default.nix b/nixpkgs/pkgs/tools/audio/gvolicon/default.nix index 9029eb38b06f..5190699be087 100644 --- a/nixpkgs/pkgs/tools/audio/gvolicon/default.nix +++ b/nixpkgs/pkgs/tools/audio/gvolicon/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A simple and lightweight volume icon that sits in your system tray"; - homepage = https://github.com/Unia/gvolicon; + homepage = "https://github.com/Unia/gvolicon"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bennofs ]; diff --git a/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix b/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix index f69e60117ce3..2aa01dfe073f 100644 --- a/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix +++ b/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Swiss-army knife for multimedia streaming"; - homepage = https://www.liquidsoap.info/; + homepage = "https://www.liquidsoap.info/"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = ocamlPackages.ocaml.meta.platforms or []; diff --git a/nixpkgs/pkgs/tools/audio/midicsv/default.nix b/nixpkgs/pkgs/tools/audio/midicsv/default.nix new file mode 100644 index 000000000000..e5f3f6124b9b --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/midicsv/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "midicsv-1.1"; + + src = fetchurl { + url = "http://www.fourmilab.ch/webtools/midicsv/${name}.tar.gz"; + sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw"; + }; + + postPatch = '' + substituteInPlace Makefile --replace /usr/local $out + ''; + + meta = with stdenv.lib; { + description = "Losslessly translate MIDI to CSV and back"; + homepage = "http://www.fourmilab.ch/webtools/midicsv/"; + license = licenses.publicDomain; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/audio/mp3cat/default.nix b/nixpkgs/pkgs/tools/audio/mp3cat/default.nix index acd11bc75e6f..e7a1d004a019 100644 --- a/nixpkgs/pkgs/tools/audio/mp3cat/default.nix +++ b/nixpkgs/pkgs/tools/audio/mp3cat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { only outputs MP3 frames with valid headers, even if there is extra garbage in its input stream ''; - homepage = https://github.com/tomclegg/mp3cat; + homepage = "https://github.com/tomclegg/mp3cat"; license = licenses.gpl2; maintainers = [ maintainers.omnipotententity ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/audio/mpdas/default.nix b/nixpkgs/pkgs/tools/audio/mpdas/default.nix index bfb4f81c8166..507e62b0dae9 100644 --- a/nixpkgs/pkgs/tools/audio/mpdas/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdas/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music Player Daemon AudioScrobbler"; - homepage = https://50hz.ws/mpdas/; + homepage = "https://50hz.ws/mpdas/"; license = licenses.bsd3; maintainers = [ maintainers.taketwo ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/audio/mpdcron/Gemfile.lock b/nixpkgs/pkgs/tools/audio/mpdcron/Gemfile.lock index 39df4ddec9f7..603a9cfdafb1 100644 --- a/nixpkgs/pkgs/tools/audio/mpdcron/Gemfile.lock +++ b/nixpkgs/pkgs/tools/audio/mpdcron/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES nokogiri BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix index a791a81db351..c083c60a9625 100644 --- a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A cron like daemon for mpd"; - homepage = http://alip.github.io/mpdcron/; + homepage = "http://alip.github.io/mpdcron/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 manveru ]; diff --git a/nixpkgs/pkgs/tools/audio/mpdris2/default.nix b/nixpkgs/pkgs/tools/audio/mpdris2/default.nix index 0dbdcd7d25a3..029dcd127f13 100644 --- a/nixpkgs/pkgs/tools/audio/mpdris2/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdris2/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "MPRIS 2 support for mpd"; - homepage = https://github.com/eonpatapon/mpDris2/; + homepage = "https://github.com/eonpatapon/mpDris2/"; license = licenses.gpl3; maintainers = with maintainers; []; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/audio/pasystray/default.nix b/nixpkgs/pkgs/tools/audio/pasystray/default.nix index 782ea314359d..648dcad42bad 100644 --- a/nixpkgs/pkgs/tools/audio/pasystray/default.nix +++ b/nixpkgs/pkgs/tools/audio/pasystray/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PulseAudio system tray"; - homepage = https://github.com/christophgysin/pasystray; + homepage = "https://github.com/christophgysin/pasystray"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ exlevan kamilchm ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/audio/picotts/default.nix b/nixpkgs/pkgs/tools/audio/picotts/default.nix index d1b055f1d5f4..023bf4577740 100644 --- a/nixpkgs/pkgs/tools/audio/picotts/default.nix +++ b/nixpkgs/pkgs/tools/audio/picotts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; meta = { description = "Text to speech voice sinthesizer from SVox."; - homepage = https://github.com/naggety/picotts; + homepage = "https://github.com/naggety/picotts"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.canndrew ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/audio/playerctl/default.nix b/nixpkgs/pkgs/tools/audio/playerctl/default.nix index 8392228cef4c..3541453bafe4 100644 --- a/nixpkgs/pkgs/tools/audio/playerctl/default.nix +++ b/nixpkgs/pkgs/tools/audio/playerctl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line utility and library for controlling media players that implement MPRIS"; - homepage = https://github.com/acrisci/playerctl; + homepage = "https://github.com/acrisci/playerctl"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ puffnfresh ]; diff --git a/nixpkgs/pkgs/tools/audio/pnmixer/default.nix b/nixpkgs/pkgs/tools/audio/pnmixer/default.nix index 5b27a00a9556..c1e40ae5dbb9 100644 --- a/nixpkgs/pkgs/tools/audio/pnmixer/default.nix +++ b/nixpkgs/pkgs/tools/audio/pnmixer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ]; meta = with stdenv.lib; { - homepage = https://github.com/nicklan/pnmixer; + homepage = "https://github.com/nicklan/pnmixer"; description = "ALSA volume mixer for the system tray"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/audio/pulsemixer/default.nix b/nixpkgs/pkgs/tools/audio/pulsemixer/default.nix index 051743b46e7a..b735c40031f6 100644 --- a/nixpkgs/pkgs/tools/audio/pulsemixer/default.nix +++ b/nixpkgs/pkgs/tools/audio/pulsemixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pulsemixer"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "GeorgeFilipkin"; repo = pname; rev = version; - sha256 = "162nfpyqn4gp45x332a73n07c118vispz3jicin4p67x3f8f0g3j"; + sha256 = "1jagx9zmz5pfsld8y2rj2kqg6ww9f6vqiawfy3vhqc49x3xx92p4"; }; inherit libpulseaudio; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cli and curses mixer for pulseaudio"; - homepage = https://github.com/GeorgeFilipkin/pulsemixer; + homepage = "https://github.com/GeorgeFilipkin/pulsemixer"; license = licenses.mit; maintainers = [ maintainers.woffs ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/audio/qastools/default.nix b/nixpkgs/pkgs/tools/audio/qastools/default.nix index bdc431bcb928..86ef7f050b23 100644 --- a/nixpkgs/pkgs/tools/audio/qastools/default.nix +++ b/nixpkgs/pkgs/tools/audio/qastools/default.nix @@ -1,30 +1,24 @@ -{ mkDerivation, lib, fetchurl, cmake, alsaLib, udev, qtbase, qtsvg, qttools }: +{ mkDerivation, lib, fetchFromGitLab, cmake, alsaLib, udev, qtbase, qtsvg, qttools }: -let - version = "0.21.0"; -in - -mkDerivation { +mkDerivation rec { pname = "qastools"; - inherit version; + version = "0.22.0"; - src = fetchurl { - url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2"; - sha256 = "1zl9cn5h43n63yp3z1an87xvw554k9hlcz75ddb30lvpcczkmwrh"; + src = fetchFromGitLab { + owner = "sebholt"; + repo = pname; + rev = "v${version}"; + sha256 = "0px4fcn8dagivq5fyi5gy84yj86f6x0lk805mc4ry58d0wsbn68v"; }; - buildInputs = [ - alsaLib udev qtbase qtsvg qttools - ]; nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h" - ]; + buildInputs = [ alsaLib udev qtbase qtsvg qttools ]; meta = with lib; { description = "Collection of desktop applications for ALSA configuration"; - license = licenses.gpl3; + homepage = "https://gitlab.com/sebholt/qastools"; + license = licenses.mit; + maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch b/nixpkgs/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch new file mode 100644 index 000000000000..1854a43a2493 --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index ffcd883..c4b4ff7 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,8 +12,9 @@ CFLAGS += -MMD -Wall + LDLIBS_ASOUND ?= -lasound + LDLIBS_OPUS ?= -lopus + LDLIBS_ORTP ?= -lortp ++LDLIBS_BCTOOLBOX ?= -lbctoolbox + +-LDLIBS += $(LDLIBS_ASOUND) $(LDLIBS_OPUS) $(LDLIBS_ORTP) ++LDLIBS += $(LDLIBS_ASOUND) $(LDLIBS_OPUS) $(LDLIBS_ORTP) $(LDLIBS_BCTOOLBOX) + + .PHONY: all install dist clean + diff --git a/nixpkgs/pkgs/tools/audio/trx/default.nix b/nixpkgs/pkgs/tools/audio/trx/default.nix index 1d052adbba9f..6a23b6caead4 100644 --- a/nixpkgs/pkgs/tools/audio/trx/default.nix +++ b/nixpkgs/pkgs/tools/audio/trx/default.nix @@ -2,19 +2,25 @@ stdenv.mkDerivation rec { pname = "trx"; - version = "0.4"; + version = "0.5"; src = fetchurl { url = "https://www.pogo.org.uk/~mark/trx/releases/${pname}-${version}.tar.gz"; - sha256 = "1wsrkbqc090px8i9p8awz38znxjcqjb1dzjjdd8xkjmiprayjhkl"; + sha256 = "1jjgca92nifjhcr3n0fmpfr6f5gxlqyal2wmgdlgd7hx834r1if7"; }; + # Makefile is currently missing -lbctoolbox so the build fails when linking + # the libraries. This patch adds that flag. + patches = [ + ./add_bctoolbox_ldlib.patch + ]; + buildInputs = [ alsaLib libopus ortp bctoolbox ]; makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A simple toolset for broadcasting live audio using RTP/UDP and Opus"; - homepage = http://www.pogo.org.uk/~mark/trx/; + homepage = "http://www.pogo.org.uk/~mark/trx/"; license = licenses.gpl2; maintainers = [ maintainers.hansjoergschurr ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/audio/volumeicon/default.nix b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix index 3871bbd39a16..50290881dc77 100644 --- a/nixpkgs/pkgs/tools/audio/volumeicon/default.nix +++ b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A lightweight volume control that sits in your systray"; - homepage = http://softwarebakery.com/maato/volumeicon.html; + homepage = "http://softwarebakery.com/maato/volumeicon.html"; platforms = pkgs.lib.platforms.linux; maintainers = with maintainers; [ bobvanderlinden ]; license = pkgs.lib.licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix index 3d219eed012c..a872060ce212 100644 --- a/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix +++ b/nixpkgs/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix @@ -25,7 +25,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Command line interface for Amazon Glacier"; - homepage = https://github.com/uskudnik/amazon-glacier-cmd-interface; + homepage = "https://github.com/uskudnik/amazon-glacier-cmd-interface"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; diff --git a/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix b/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix index 44c14f2dc324..acdf31e47d8c 100644 --- a/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A script to run daily, weekly and monthly backups for your MySQL database"; - homepage = https://sourceforge.net/projects/automysqlbackup/; + homepage = "https://sourceforge.net/projects/automysqlbackup/"; platforms = platforms.linux; maintainers = [ maintainers.aanderse ]; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/backup/bacula/default.nix b/nixpkgs/pkgs/tools/backup/bacula/default.nix index f40d54adfc85..a9fd2f19b897 100644 --- a/nixpkgs/pkgs/tools/backup/bacula/default.nix +++ b/nixpkgs/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.6.2"; + name = "bacula-9.6.3"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "0hw7wvgh7ymyyar5diqjn9kflhcb8a9kjgz6phb0x9r06j8yahaw"; + sha256 = "02jvijwfw8nqrq61pyr5b9d5zjpmrsimkg6dq42rbd71g2k6a4zc"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/nixpkgs/pkgs/tools/backup/bareos/default.nix b/nixpkgs/pkgs/tools/backup/bareos/default.nix index 949e45de5e11..53de4853c627 100644 --- a/nixpkgs/pkgs/tools/backup/bareos/default.nix +++ b/nixpkgs/pkgs/tools/backup/bareos/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.bareos.org/; + homepage = "http://www.bareos.org/"; description = "A fork of the bacula project"; license = licenses.agpl3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/backup/bdsync/default.nix b/nixpkgs/pkgs/tools/backup/bdsync/default.nix index be8746932caf..53704ce39d42 100644 --- a/nixpkgs/pkgs/tools/backup/bdsync/default.nix +++ b/nixpkgs/pkgs/tools/backup/bdsync/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast block device synchronizing tool"; - homepage = https://github.com/TargetHolding/bdsync; + homepage = "https://github.com/TargetHolding/bdsync"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; diff --git a/nixpkgs/pkgs/tools/backup/borg/default.nix b/nixpkgs/pkgs/tools/backup/borg/default.nix index a12cc368ee58..de69a8db3de1 100644 --- a/nixpkgs/pkgs/tools/backup/borg/default.nix +++ b/nixpkgs/pkgs/tools/backup/borg/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A deduplicating backup program (attic fork)"; - homepage = https://www.borgbackup.org; + homepage = "https://www.borgbackup.org"; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage maintainers = with maintainers; [ flokli dotlambda globin ]; diff --git a/nixpkgs/pkgs/tools/backup/btar/default.nix b/nixpkgs/pkgs/tools/backup/btar/default.nix index 89f577e93ad0..3727a4b7f427 100644 --- a/nixpkgs/pkgs/tools/backup/btar/default.nix +++ b/nixpkgs/pkgs/tools/backup/btar/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Tar-compatible block-based archiver"; license = stdenv.lib.licenses.gpl3Plus; - homepage = http://viric.name/cgi-bin/btar; + homepage = "http://viric.name/cgi-bin/btar"; platforms = with stdenv.lib.platforms; all; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/nixpkgs/pkgs/tools/backup/btrbk/default.nix index ce43ebb5720b..ca043692788b 100644 --- a/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A backup tool for btrfs subvolumes"; - homepage = https://digint.ch/btrbk; + homepage = "https://digint.ch/btrbk"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ asymmetric the-kenny ]; diff --git a/nixpkgs/pkgs/tools/backup/bup/default.nix b/nixpkgs/pkgs/tools/backup/bup/default.nix index 4788091a5f48..182e37283dfd 100644 --- a/nixpkgs/pkgs/tools/backup/bup/default.nix +++ b/nixpkgs/pkgs/tools/backup/bup/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/bup/bup; + homepage = "https://github.com/bup/bup"; description = "Efficient file backup system based on the git packfile format"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/backup/burp/default.nix b/nixpkgs/pkgs/tools/backup/burp/default.nix index 5c0be4a2de7d..d9b4df98790e 100644 --- a/nixpkgs/pkgs/tools/backup/burp/default.nix +++ b/nixpkgs/pkgs/tools/backup/burp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "BURP - BackUp and Restore Program"; - homepage = https://burp.grke.org; + homepage = "https://burp.grke.org"; license = licenses.agpl3; maintainers = with maintainers; [ tokudan ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/backup/chunksync/default.nix b/nixpkgs/pkgs/tools/backup/chunksync/default.nix index 736a3122a6f0..6885f3f8265a 100644 --- a/nixpkgs/pkgs/tools/backup/chunksync/default.nix +++ b/nixpkgs/pkgs/tools/backup/chunksync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; - homepage = http://chunksync.florz.de/; + homepage = "http://chunksync.florz.de/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/backup/dedup/default.nix b/nixpkgs/pkgs/tools/backup/dedup/default.nix index 05a436049263..db9a05fcfde6 100644 --- a/nixpkgs/pkgs/tools/backup/dedup/default.nix +++ b/nixpkgs/pkgs/tools/backup/dedup/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Data deduplication program"; - homepage = https://git.2f30.org/dedup/file/README.html; + homepage = "https://git.2f30.org/dedup/file/README.html"; license = with licenses; [ bsd0 isc ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/nixpkgs/pkgs/tools/backup/dirvish/default.nix b/nixpkgs/pkgs/tools/backup/dirvish/default.nix index 0127e32fe93b..9b138d48f213 100644 --- a/nixpkgs/pkgs/tools/backup/dirvish/default.nix +++ b/nixpkgs/pkgs/tools/backup/dirvish/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dirvish is a fast, disk based, rotating network backup system"; - homepage = http://dirvish.org/; + homepage = "http://dirvish.org/"; license = stdenv.lib.licenses.osl2; platforms = platforms.linux; maintainers = [ maintainers.winpat ]; diff --git a/nixpkgs/pkgs/tools/backup/diskrsync/default.nix b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix index b2ef04dcffc7..812094444553 100644 --- a/nixpkgs/pkgs/tools/backup/diskrsync/default.nix +++ b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Rsync for block devices and disk images"; - homepage = https://github.com/dop251/diskrsync; + homepage = "https://github.com/dop251/diskrsync"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/nixpkgs/pkgs/tools/backup/duplicacy/default.nix b/nixpkgs/pkgs/tools/backup/duplicacy/default.nix index d7a248b7a49c..1d754e4324dd 100644 --- a/nixpkgs/pkgs/tools/backup/duplicacy/default.nix +++ b/nixpkgs/pkgs/tools/backup/duplicacy/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { ''; meta = with lib; { - homepage = https://duplicacy.com; + homepage = "https://duplicacy.com"; description = "A new generation cloud backup tool"; platforms = platforms.linux ++ platforms.darwin; license = lib.licenses.unfree; diff --git a/nixpkgs/pkgs/tools/backup/duplicati/default.nix b/nixpkgs/pkgs/tools/backup/duplicati/default.nix index bb24cb35d875..e2a5cc1c4cf9 100644 --- a/nixpkgs/pkgs/tools/backup/duplicati/default.nix +++ b/nixpkgs/pkgs/tools/backup/duplicati/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers"; - homepage = https://www.duplicati.com/; + homepage = "https://www.duplicati.com/"; license = licenses.lgpl21; maintainers = with maintainers; [ nyanloutre ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/backup/duply/default.nix b/nixpkgs/pkgs/tools/backup/duply/default.nix index 3e4375cb76c6..7808a0925b15 100644 --- a/nixpkgs/pkgs/tools/backup/duply/default.nix +++ b/nixpkgs/pkgs/tools/backup/duply/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { implementing backup job profiles, batch commands and more. Who says secure backups on non-trusted spaces are no child's play? ''; - homepage = https://duply.net/; + homepage = "https://duply.net/"; license = licenses.gpl2; maintainers = [ maintainers.bjornfor ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/backup/easysnap/default.nix b/nixpkgs/pkgs/tools/backup/easysnap/default.nix index a56d1274f92e..9b5450ba7a3b 100644 --- a/nixpkgs/pkgs/tools/backup/easysnap/default.nix +++ b/nixpkgs/pkgs/tools/backup/easysnap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "easysnap"; - version = "unstable-2019-02-17"; + version = "unstable-2020-04-04"; src = fetchFromGitHub { owner = "sjau"; repo = "easysnap"; - rev = "9ef5d1ff51ccf9939a88b7b32b4959d27cf61ecc"; - sha256 = "0m0217ni909nham15w5vxg8y7cw2zwjibnhvgnpxxsap8zkhv1m4"; + rev = "26f89c0c3cda01e2595ee19ae5fb8518da25b4ef"; + sha256 = "sha256:1k49k1m7y8s099wyiiz8411i77j1156ncirynmjfyvdhmhcyp5rw"; }; installPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/sjau/easysnap; + homepage = "https://github.com/sjau/easysnap"; description = "Customizable ZFS Snapshotting tool with zfs send/recv pulling"; license = licenses.gpl3; maintainers = with maintainers; [ sjau ]; diff --git a/nixpkgs/pkgs/tools/backup/flockit/default.nix b/nixpkgs/pkgs/tools/backup/flockit/default.nix index 8d71671f6fec..53baa6a6d934 100644 --- a/nixpkgs/pkgs/tools/backup/flockit/default.nix +++ b/nixpkgs/pkgs/tools/backup/flockit/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { Also see the following blog post: https://www.swiftstack.com/blog/2012/08/15/old-school-monkeypatching/ ''; - homepage = https://github.com/smerritt/flockit; + homepage = "https://github.com/smerritt/flockit"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.basvandijk ]; diff --git a/nixpkgs/pkgs/tools/backup/grab-site/default.nix b/nixpkgs/pkgs/tools/backup/grab-site/default.nix index c8093f4453e9..64a711606f85 100644 --- a/nixpkgs/pkgs/tools/backup/grab-site/default.nix +++ b/nixpkgs/pkgs/tools/backup/grab-site/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Crawler for web archiving with WARC output"; - homepage = https://github.com/ArchiveTeam/grab-site; + homepage = "https://github.com/ArchiveTeam/grab-site"; license = licenses.mit; maintainers = with maintainers; [ ivan ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix b/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix index d289febe1f09..e34155bb2389 100644 --- a/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HPE's implementation of the open-source tape filesystem standard ltfs"; - homepage = https://support.hpe.com/hpesc/public/km/product/1009214665/Product; + homepage = "https://support.hpe.com/hpesc/public/km/product/1009214665/Product"; license = licenses.lgpl21; maintainers = [ maintainers.redvers ]; platforms = platforms.linux; - downloadPage = https://github.com/nix-community/hpe-ltfs; + downloadPage = "https://github.com/nix-community/hpe-ltfs"; }; } diff --git a/nixpkgs/pkgs/tools/backup/httrack/default.nix b/nixpkgs/pkgs/tools/backup/httrack/default.nix index 6fe614195a4b..6e2b92e81288 100644 --- a/nixpkgs/pkgs/tools/backup/httrack/default.nix +++ b/nixpkgs/pkgs/tools/backup/httrack/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Easy-to-use offline browser / website mirroring utility"; - homepage = http://www.httrack.com; + homepage = "http://www.httrack.com"; license = licenses.gpl3; maintainers = with maintainers; [ the-kenny ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/backup/httrack/qt.nix b/nixpkgs/pkgs/tools/backup/httrack/qt.nix index 8cf3eb29462c..fe5b965e5707 100644 --- a/nixpkgs/pkgs/tools/backup/httrack/qt.nix +++ b/nixpkgs/pkgs/tools/backup/httrack/qt.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Easy-to-use offline browser / website mirroring utility - QT frontend"; - homepage = http://www.httrack.com; + homepage = "http://www.httrack.com"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile.lock b/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile.lock index 1fe903f15088..5faac2356799 100644 --- a/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile.lock +++ b/nixpkgs/pkgs/tools/backup/lvmsync/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES lvmsync BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/backup/lvmsync/default.nix b/nixpkgs/pkgs/tools/backup/lvmsync/default.nix index a52c6bf1ba7c..75962c98f8b6 100644 --- a/nixpkgs/pkgs/tools/backup/lvmsync/default.nix +++ b/nixpkgs/pkgs/tools/backup/lvmsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimised synchronisation of LVM snapshots over a network"; - homepage = https://theshed.hezmatt.org/lvmsync/; + homepage = "https://theshed.hezmatt.org/lvmsync/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ jluttine nicknovitski ]; diff --git a/nixpkgs/pkgs/tools/backup/monolith/default.nix b/nixpkgs/pkgs/tools/backup/monolith/default.nix new file mode 100644 index 000000000000..5d086abf7807 --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/monolith/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "monolith"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "Y2Z"; + repo = pname; + rev = "v${version}"; + sha256 = "08xbpn6kdfiyvz5pwx9hkzbgb40z6dicmiry7frclw0aibal9avi"; + }; + + cargoSha256 = "10zwyg54f05m6ldpnchqzxjkb6rlpcl80crdnk8s6wkf18qny4i3"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + checkPhase = "cargo test -- --skip tests::cli"; + + meta = with stdenv.lib; { + description = "Bundle any web page into a single HTML file"; + homepage = "https://github.com/Y2Z/monolith"; + license = licenses.unlicense; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/backup/mt-st/default.nix b/nixpkgs/pkgs/tools/backup/mt-st/default.nix index 0b7b7469af1b..57201d69dbac 100644 --- a/nixpkgs/pkgs/tools/backup/mt-st/default.nix +++ b/nixpkgs/pkgs/tools/backup/mt-st/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { longDescription = '' Fork of the standard "mt" tool with additional Linux-specific IOCTLs. ''; - homepage = https://github.com/iustin/mt-st; + homepage = "https://github.com/iustin/mt-st"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.redvers ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/backup/mtx/default.nix b/nixpkgs/pkgs/tools/backup/mtx/default.nix index 46f213a6ef4c..2a2dd80c566b 100644 --- a/nixpkgs/pkgs/tools/backup/mtx/default.nix +++ b/nixpkgs/pkgs/tools/backup/mtx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { that they properly report the MChanger bit as required by the SCSI T-10 SMC specification. ''; - homepage = https://sourceforge.net/projects/mtx/; + homepage = "https://sourceforge.net/projects/mtx/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.redvers ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/backup/mydumper/default.nix b/nixpkgs/pkgs/tools/backup/mydumper/default.nix index 7160e7f19503..88a727629903 100644 --- a/nixpkgs/pkgs/tools/backup/mydumper/default.nix +++ b/nixpkgs/pkgs/tools/backup/mydumper/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''High-perfomance MySQL backup tool''; - homepage = https://github.com/maxbube/mydumper; + homepage = "https://github.com/maxbube/mydumper"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/nixpkgs/pkgs/tools/backup/ori/default.nix b/nixpkgs/pkgs/tools/backup/ori/default.nix index 30ee0041c7cc..e3b4a0fb537e 100644 --- a/nixpkgs/pkgs/tools/backup/ori/default.nix +++ b/nixpkgs/pkgs/tools/backup/ori/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A secure distributed file system"; - homepage = http://ori.scs.stanford.edu/; + homepage = "http://ori.scs.stanford.edu/"; license = licenses.mit; platforms = platforms.unix; broken = true; # 2018-04-11 diff --git a/nixpkgs/pkgs/tools/backup/partclone/default.nix b/nixpkgs/pkgs/tools/backup/partclone/default.nix index fa4346c8cccc..2a325046123e 100644 --- a/nixpkgs/pkgs/tools/backup/partclone/default.nix +++ b/nixpkgs/pkgs/tools/backup/partclone/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition. ''; - homepage = https://partclone.org; + homepage = "https://partclone.org"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/backup/partimage/default.nix b/nixpkgs/pkgs/tools/backup/partimage/default.nix index 4a18deeb57c8..51a1a05fe6c5 100644 --- a/nixpkgs/pkgs/tools/backup/partimage/default.nix +++ b/nixpkgs/pkgs/tools/backup/partimage/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; + url = "mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2"; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Opensource disk backup software"; - homepage = http://www.partimage.org; + homepage = "http://www.partimage.org"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix b/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix index 98eae9cc6702..a610bb8e13a4 100644 --- a/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Non-blocking backup tool for MySQL"; - homepage = http://www.percona.com/software/percona-xtrabackup; + homepage = "http://www.percona.com/software/percona-xtrabackup"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/nixpkgs/pkgs/tools/backup/rdedup/default.nix b/nixpkgs/pkgs/tools/backup/rdedup/default.nix index 1ed5bfd9ef87..e2d415d92f6a 100644 --- a/nixpkgs/pkgs/tools/backup/rdedup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdedup/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Data deduplication with compression and public key encryption"; - homepage = https://github.com/dpc/rdedup; + homepage = "https://github.com/dpc/rdedup"; license = licenses.mpl20; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix index f3910893b7b2..a23be69f4cf7 100644 --- a/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix @@ -4,7 +4,7 @@ python2Packages.buildPythonApplication { name = "rdiff-backup-1.3.3"; src = fetchurl { - url = mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz; + url = "mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz"; sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf"; }; @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication { meta = { description = "Backup system trying to combine best a mirror and an incremental backup system"; - homepage = http://rdiff-backup.nongnu.org/; + homepage = "http://rdiff-backup.nongnu.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/nixpkgs/pkgs/tools/backup/restic/default.nix b/nixpkgs/pkgs/tools/backup/restic/default.nix index 345d14fd10b9..f8dbeadff095 100644 --- a/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { ''; meta = with lib; { - homepage = https://restic.net; + homepage = "https://restic.net"; description = "A backup program that is fast, efficient and secure"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix b/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix index 17397ce838f5..c0a06e1b9ae5 100644 --- a/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix +++ b/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple command line interface for backup rotation"; - homepage = https://github.com/xolox/python-rotate-backups; + homepage = "https://github.com/xolox/python-rotate-backups"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/nixpkgs/pkgs/tools/backup/rsbep/default.nix b/nixpkgs/pkgs/tools/backup/rsbep/default.nix index 90a8c665cd43..d7967c018a26 100644 --- a/nixpkgs/pkgs/tools/backup/rsbep/default.nix +++ b/nixpkgs/pkgs/tools/backup/rsbep/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Create resilient backups with Reed-Solomon error correction and byte-spreading"; - homepage = https://www.thanassis.space/rsbep.html; + homepage = "https://www.thanassis.space/rsbep.html"; license = licenses.gpl3; maintainers = [ maintainers.earvstedt ]; }; diff --git a/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix b/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix index eebdcf7ba915..0503dc3b6572 100644 --- a/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix +++ b/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A filesystem snapshot utility for making backups of local and remote systems"; - homepage = https://rsnapshot.org/; + homepage = "https://rsnapshot.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/backup/stenc/default.nix b/nixpkgs/pkgs/tools/backup/stenc/default.nix index ed4f944a960d..11859c4f8be4 100644 --- a/nixpkgs/pkgs/tools/backup/stenc/default.nix +++ b/nixpkgs/pkgs/tools/backup/stenc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "SCSI Tape Encryption Manager"; - homepage = https://github.com/scsitape/stenc; + homepage = "https://github.com/scsitape/stenc"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ woffs ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/backup/store-backup/default.nix b/nixpkgs/pkgs/tools/backup/store-backup/default.nix index a0f568b16b3e..bd1c0d802aa0 100644 --- a/nixpkgs/pkgs/tools/backup/store-backup/default.nix +++ b/nixpkgs/pkgs/tools/backup/store-backup/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = { description = "A backup suite that stores files on other disks"; - homepage = https://savannah.nongnu.org/projects/storebackup; + homepage = "https://savannah.nongnu.org/projects/storebackup"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/backup/tsm-client/default.nix b/nixpkgs/pkgs/tools/backup/tsm-client/default.nix index a1f7b1aba84e..c432d47becde 100644 --- a/nixpkgs/pkgs/tools/backup/tsm-client/default.nix +++ b/nixpkgs/pkgs/tools/backup/tsm-client/default.nix @@ -53,8 +53,8 @@ let meta = { - homepage = https://www.ibm.com/us-en/marketplace/data-protection-and-recovery; - downloadPage = https://www-01.ibm.com/support/docview.wss?uid=swg21239415; + homepage = "https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"; + downloadPage = "https://www-01.ibm.com/support/docview.wss?uid=swg21239415"; platforms = [ "x86_64-linux" ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.yarny ]; diff --git a/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix index 8f93474f8f16..f763296e1d6e 100644 --- a/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/nixpkgs/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -22,7 +22,7 @@ in with pkgs; eggDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/; + homepage = "https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/"; description = "A tool for generating import manifests for Ugarit"; license = licenses.bsd3; maintainers = [ maintainers.ebzzry ]; diff --git a/nixpkgs/pkgs/tools/backup/ugarit/default.nix b/nixpkgs/pkgs/tools/backup/ugarit/default.nix index e8f0ea22df10..bc69662dc2bd 100644 --- a/nixpkgs/pkgs/tools/backup/ugarit/default.nix +++ b/nixpkgs/pkgs/tools/backup/ugarit/default.nix @@ -32,7 +32,7 @@ in with pkgs; eggDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.kitten-technologies.co.uk/project/ugarit/; + homepage = "https://www.kitten-technologies.co.uk/project/ugarit/"; description = "A backup/archival system based around content-addressible storage"; license = licenses.bsd3; maintainers = [ maintainers.ebzzry ]; diff --git a/nixpkgs/pkgs/tools/backup/wal-e/default.nix b/nixpkgs/pkgs/tools/backup/wal-e/default.nix index 9c7cb0a83fd6..af1506bff6e9 100644 --- a/nixpkgs/pkgs/tools/backup/wal-e/default.nix +++ b/nixpkgs/pkgs/tools/backup/wal-e/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; - homepage = https://github.com/wal-e/wal-e; + homepage = "https://github.com/wal-e/wal-e"; maintainers = []; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/nixpkgs/pkgs/tools/backup/wal-g/default.nix index e5ed04bb4a1c..ad67f7ce880d 100644 --- a/nixpkgs/pkgs/tools/backup/wal-g/default.nix +++ b/nixpkgs/pkgs/tools/backup/wal-g/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, brotli, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, brotli }: buildGoModule rec { pname = "wal-g"; @@ -13,7 +13,7 @@ buildGoModule rec { modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm"; - buildInputs = [ brotli ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ brotli ]; doCheck = true; diff --git a/nixpkgs/pkgs/tools/backup/zbackup/default.nix b/nixpkgs/pkgs/tools/backup/zbackup/default.nix index d7a160328ed1..5de58c56f002 100644 --- a/nixpkgs/pkgs/tools/backup/zbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/zbackup/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake protobufc ]; meta = { description = "A versatile deduplicating backup tool"; - homepage = http://zbackup.org/; + homepage = "http://zbackup.org/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix index 1cb7e6474412..ff2f6062554f 100644 --- a/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix +++ b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/alunduil/zfs-replicate; + homepage = "https://github.com/alunduil/zfs-replicate"; description = "ZFS Snapshot Replication"; license = licenses.bsd2; maintainers = with maintainers; [ alunduil ]; diff --git a/nixpkgs/pkgs/tools/backup/znapzend/default.nix b/nixpkgs/pkgs/tools/backup/znapzend/default.nix index b44564efb827..90ed1068ca6e 100644 --- a/nixpkgs/pkgs/tools/backup/znapzend/default.nix +++ b/nixpkgs/pkgs/tools/backup/znapzend/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "High performance open source ZFS backup with mbuffer and ssh support"; - homepage = http://www.znapzend.org; + homepage = "http://www.znapzend.org"; license = licenses.gpl3; maintainers = with maintainers; [ otwieracz ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index e351867ca1bf..69db0053cfa1 100644 --- a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/blueman-project/blueman; + homepage = "https://github.com/blueman-project/blueman"; description = "GTK-based Bluetooth Manager"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix b/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix index 5c8f65ae5141..15661d6e360d 100644 --- a/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wiki.muiline.com/obex-data-server; + homepage = "http://wiki.muiline.com/obex-data-server"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix b/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix index 0771505b7269..c235c99d762c 100644 --- a/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/obexd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = http://www.bluez.org/; + homepage = "http://www.bluez.org/"; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix b/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix index 81d0849b408a..1c24697c6898 100644 --- a/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/obexfs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse obexftp bluez ]; meta = with stdenv.lib; { - homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFs; + homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFs"; description = "A tool to mount OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix b/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix index 3e40c7d8ef69..69779557300d 100644 --- a/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/obexftp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp; + homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"; description = "A library and tool to access files on OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix b/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix index e3a360818e63..ccf2eee1bb13 100644 --- a/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/openobex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dev.zuckschwerdt.org/openobex/; + homepage = "http://dev.zuckschwerdt.org/openobex/"; description = "An open source implementation of the Object Exchange (OBEX) protocol"; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix index 398641faf15e..5c7c68d9d9e3 100644 --- a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix +++ b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { runtime makes it very easy to use, particularly when paired with Linux kernels that provide EFI stub support. ''; - homepage = http://refind.sourceforge.net/; + homepage = "http://refind.sourceforge.net/"; maintainers = with maintainers; [ AndersonTorres samueldr ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix b/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix index ccf632dfe5a5..9b232be8ce00 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { - manipulate ISO-files - and probably more... ''; - homepage = http://bashburn.dose.se/; + homepage = "http://bashburn.dose.se/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix b/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix index b4f0d1039edc..df63ced882fe 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://he.fi/bchunk/; + homepage = "http://he.fi/bchunk/"; description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix b/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix index a9f5b321d3d7..cdc198873337 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Gnome CD/DVD Burner"; - homepage = https://wiki.gnome.org/Apps/Brasero; + homepage = "https://wiki.gnome.org/Apps/Brasero"; maintainers = [ maintainers.bdimcheff ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix index c7aab91adbeb..a6ba7fd332f3 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CloneCD to ISO converter"; - homepage = https://sourceforge.net/projects/ccd2iso/; + homepage = "https://sourceforge.net/projects/ccd2iso/"; license = licenses.gpl2; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix index 00a1864b0357..9d7336663a8e 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format"; - homepage = https://sourceforge.net/projects/cdi2iso.berlios; + homepage = "https://sourceforge.net/projects/cdi2iso.berlios"; license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix index ece45944c5c0..fde9eb1a3320 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install-doc" ]; meta = with stdenv.lib; { - homepage = https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html; + homepage = "https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html"; description = "Tools to inspect and manipulate CD/DVD optical disc images"; license = licenses.gpl2; maintainers = with maintainers; [ hhm ]; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix index 908808b79f3c..d0d12c34c059 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cdrdao-1.2.3"; src = fetchurl { - url = mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2; + url = "mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2"; sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; - homepage = http://cdrdao.sourceforge.net/; + homepage = "http://cdrdao.sourceforge.net/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix index 7de086dba607..251eee66f9cf 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { independent project. ''; - homepage = http://cdrkit.org/; + homepage = "http://cdrkit.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix index 2ee69682a1d5..87e633c504a8 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Convert CUE to ISO suitable to POPStarter"; - homepage = https://github.com/makefu/cue2pops-linux; + homepage = "https://github.com/makefu/cue2pops-linux"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cuetools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cuetools/default.nix index e4e34aa919b6..ebc631521773 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cuetools/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cuetools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of utilities for working with cue files and toc files"; - homepage = https://github.com/svend/cuetools; + homepage = "https://github.com/svend/cuetools"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel jcumming ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix b/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix index 2cb90129ed9a..aef0c3a636f9 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://www.pixelbeat.org/programs/dvd-vr/; - downloadPage = https://www.pixelbeat.org/programs/dvd-vr/; + homepage = "https://www.pixelbeat.org/programs/dvd-vr/"; + downloadPage = "https://www.pixelbeat.org/programs/dvd-vr/"; description = "A utility to identify and optionally copy recordings from a DVD-VR format disc"; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; diff --git a/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix index 6a4161ba1faa..5a3828d80131 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dvdisaster.net/; + homepage = "http://dvdisaster.net/"; description = "Data loss/scratch/aging protection for CD/DVD media"; longDescription = '' Dvdisaster provides a margin of safety against data loss on CD and diff --git a/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix index 922ab39063a0..2ebf8e655517 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility to uncompress ECM files to BIN CD format"; - homepage = https://github.com/alucryd/ecm-tools; + homepage = "https://github.com/alucryd/ecm-tools"; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix b/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix index 3bc1f886ccd2..0c30f0fe9801 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { installTargets = [ "install-bin" "install-devel" ]; meta = with stdenv.lib; { - homepage = https://github.com/rhinstaller/isomd5sum; + homepage = "https://github.com/rhinstaller/isomd5sum"; description = "Utilities for working with md5sum implanted in ISO images"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix b/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix index 09fbc8b38c87..39d0ab5fc2d6 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/lsdvd/; + homepage = "https://sourceforge.net/projects/lsdvd/"; description = "Display information about audio, video, and subtitle tracks on a DVD"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix index 43ed7ea7d389..082dada85fde 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format"; - homepage = http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html; + homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix index 94cd09674dac..8efc50c44935 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Convert SRT files to VTT"; license = licenses.mit; maintainers = with maintainers; [ ericdallo ]; - homepage = https://github.com/nwoltman/srt-to-vtt-cl; + homepage = "https://github.com/nwoltman/srt-to-vtt-cl"; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix b/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix index ec8ef6c16510..d81790d66a85 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://unetbootin.sourceforge.net/; + homepage = "http://unetbootin.sourceforge.net/"; description = "A tool to create bootable live USB drives from ISO images"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix b/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix index 48a58c0c7d11..2b918c4ffebc 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; - homepage = http://vobcopy.org/projects/c/c.shtml; + homepage = "http://vobcopy.org/projects/c/c.shtml"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix index fe7a1a044149..9e5ee52fca8d 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchgit { inherit rev; - url = https://github.com/ruediger/VobSub2SRT.git; + url = "https://github.com/ruediger/VobSub2SRT.git"; sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ tesseract ]; meta = { - homepage = https://github.com/ruediger/VobSub2SRT; + homepage = "https://github.com/ruediger/VobSub2SRT"; description = "Converts VobSub subtitles into SRT subtitles"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/cd-dvd/xorriso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/xorriso/default.nix index 901b0c329c5e..b3f268214db3 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/xorriso/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/xorriso/; + homepage = "https://www.gnu.org/software/xorriso/"; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/compression/advancecomp/default.nix b/nixpkgs/pkgs/tools/compression/advancecomp/default.nix index 46c8f4338c69..e648aa6feb64 100644 --- a/nixpkgs/pkgs/tools/compression/advancecomp/default.nix +++ b/nixpkgs/pkgs/tools/compression/advancecomp/default.nix @@ -28,12 +28,19 @@ stdenv.mkDerivation rec { }) ]; + # autover.sh relies on 'git describe', which obviously doesn't work as we're not cloning + # the full git repo. so we have to put the version number in `.version`, otherwise + # the binaries get built reporting "none" as their version number. + postPatch = '' + echo "${version}" >.version + ''; + meta = with stdenv.lib; { description = ''A set of tools to optimize deflate-compressed files''; license = licenses.gpl3 ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux ++ platforms.darwin; - homepage = https://github.com/amadvance/advancecomp; + homepage = "https://github.com/amadvance/advancecomp"; }; } diff --git a/nixpkgs/pkgs/tools/compression/bsc/default.nix b/nixpkgs/pkgs/tools/compression/bsc/default.nix index c1ddb242dad0..384cbfc3839b 100644 --- a/nixpkgs/pkgs/tools/compression/bsc/default.nix +++ b/nixpkgs/pkgs/tools/compression/bsc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High performance block-sorting data compression library"; - homepage = http://libbsc.com/; + homepage = "http://libbsc.com/"; # Later commits changed the licence to Apache2 (no release yet, though) license = with licenses; [ lgpl3Plus ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix b/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix index 53b968c5134b..7520fc824c01 100644 --- a/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix +++ b/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Decompress Mozilla Firefox bookmarks backup files"; - homepage = https://github.com/avih/dejsonlz4; + homepage = "https://github.com/avih/dejsonlz4"; license = licenses.bsd2; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/compression/dtrx/default.nix b/nixpkgs/pkgs/tools/compression/dtrx/default.nix index 19bc2fdc1769..81a446066d97 100644 --- a/nixpkgs/pkgs/tools/compression/dtrx/default.nix +++ b/nixpkgs/pkgs/tools/compression/dtrx/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; - homepage = https://brettcsmith.org/2007/dtrx/; + homepage = "https://brettcsmith.org/2007/dtrx/"; license = licenses.gpl3Plus; maintainers = [ maintainers.spwhitt ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/compression/gzip/default.nix b/nixpkgs/pkgs/tools/compression/gzip/default.nix index e6409f051227..10cfa0868600 100644 --- a/nixpkgs/pkgs/tools/compression/gzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/gzip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "SHELL=/bin/sh" "GREP=grep" ]; meta = { - homepage = https://www.gnu.org/software/gzip/; + homepage = "https://www.gnu.org/software/gzip/"; description = "GNU zip compression program"; longDescription = diff --git a/nixpkgs/pkgs/tools/compression/gzrt/default.nix b/nixpkgs/pkgs/tools/compression/gzrt/default.nix index 6ce50bb3d996..4367f4b6d61f 100644 --- a/nixpkgs/pkgs/tools/compression/gzrt/default.nix +++ b/nixpkgs/pkgs/tools/compression/gzrt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.urbanophile.com/arenn/hacking/gzrt/; + homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/compression/kzipmix/default.nix b/nixpkgs/pkgs/tools/compression/kzipmix/default.nix index 6fcff7b29280..f68b0cdc751a 100644 --- a/nixpkgs/pkgs/tools/compression/kzipmix/default.nix +++ b/nixpkgs/pkgs/tools/compression/kzipmix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "kzipmix-20091108"; src = fetchurl { - url = http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz; + url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz"; sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A tool that aggressively optimizes the sizes of Zip archives"; license = stdenv.lib.licenses.unfree; - homepage = http://advsys.net/ken/utils.htm; + homepage = "http://advsys.net/ken/utils.htm"; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/nixpkgs/pkgs/tools/compression/lhasa/default.nix b/nixpkgs/pkgs/tools/compression/lhasa/default.nix index 64a9ad7f6562..edf42266acdb 100644 --- a/nixpkgs/pkgs/tools/compression/lhasa/default.nix +++ b/nixpkgs/pkgs/tools/compression/lhasa/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "lhasa-0.3.1"; src = fetchurl { - url = https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz; + url = "https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz"; sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; }; meta = { @@ -14,7 +14,7 @@ stdenv.mkDerivation { the tool is a library, so that it can be reused for other purposes. ''; license = stdenv.lib.licenses.isc; - homepage = http://fragglet.github.io/lhasa; + homepage = "http://fragglet.github.io/lhasa"; maintainers = with stdenv.lib; [ maintainers.sander ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/nixpkgs/pkgs/tools/compression/lrzip/default.nix index 2c6765b2e837..aaddb6299c4b 100644 --- a/nixpkgs/pkgs/tools/compression/lrzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/lrzip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib lzo bzip2 nasm perl ]; meta = { - homepage = http://ck.kolivas.org/apps/lrzip/; + homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; license = stdenv.lib.licenses.gpl2Plus; inherit version; diff --git a/nixpkgs/pkgs/tools/compression/lz4/default.nix b/nixpkgs/pkgs/tools/compression/lz4/default.nix index fd967fce9c6c..6bc365b8e1e1 100644 --- a/nixpkgs/pkgs/tools/compression/lz4/default.nix +++ b/nixpkgs/pkgs/tools/compression/lz4/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { pname = "lz4"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { - sha256 = "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0"; + sha256 = "0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61"; rev = "v${version}"; repo = pname; owner = pname; }; - patches = [ - # Fix detection of Darwin - (fetchpatch { - url = "https://github.com/lz4/lz4/commit/024216ef7394b6411eeaa5b52d0cec9953a44249.patch"; - sha256 = "0j0j2pr6pkplxf083hlwl5q4cfp86q3wd8mc64bcfcr7ysc5pzl3"; - }) - ]; - # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; @@ -61,7 +53,7 @@ stdenv.mkDerivation rec { multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. ''; - homepage = https://lz4.github.io/lz4/; + homepage = "https://lz4.github.io/lz4/"; license = with licenses; [ bsd2 gpl2Plus ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/compression/lzfse/default.nix b/nixpkgs/pkgs/tools/compression/lzfse/default.nix index 0c54c3b452b6..72560c1d9ae2 100644 --- a/nixpkgs/pkgs/tools/compression/lzfse/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzfse/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; #bug meta = with stdenv.lib; { - homepage = https://github.com/lzfse/lzfse; + homepage = "https://github.com/lzfse/lzfse"; description = "a reference C implementation of the LZFSE compressor"; longDescription = '' This is a reference C implementation of the LZFSE compressor introduced in the Compression library with OS X 10.11 and iOS 9. diff --git a/nixpkgs/pkgs/tools/compression/lzham/default.nix b/nixpkgs/pkgs/tools/compression/lzham/default.nix index 0aa30ceb6632..9c18e4d69fed 100644 --- a/nixpkgs/pkgs/tools/compression/lzham/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzham/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lossless data compression codec with LZMA-like ratios but 1.5x-8x faster decompression speed"; - homepage = https://github.com/richgel999/lzham_codec; + homepage = "https://github.com/richgel999/lzham_codec"; license = with licenses; [ mit ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/compression/lzip/default.nix b/nixpkgs/pkgs/tools/compression/lzip/default.nix index 4ec40deab6c3..62f57a8cca79 100644 --- a/nixpkgs/pkgs/tools/compression/lzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzip/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.nongnu.org/lzip/lzip.html; + homepage = "https://www.nongnu.org/lzip/lzip.html"; description = "A lossless data compressor based on the LZMA algorithm"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/compression/lzop/default.nix b/nixpkgs/pkgs/tools/compression/lzop/default.nix index 00eb5f265aaf..48645942038f 100644 --- a/nixpkgs/pkgs/tools/compression/lzop/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ lzo ]; meta = with stdenv.lib; { - homepage = http://www.lzop.org; + homepage = "http://www.lzop.org"; description = "Fast file compressor"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix b/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix index 28c7c1d69f70..04323f8c49ec 100644 --- a/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix +++ b/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5; + homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5"; }; } diff --git a/nixpkgs/pkgs/tools/compression/ncompress/default.nix b/nixpkgs/pkgs/tools/compression/ncompress/default.nix index 8e55d24fc985..b60a23e660ca 100644 --- a/nixpkgs/pkgs/tools/compression/ncompress/default.nix +++ b/nixpkgs/pkgs/tools/compression/ncompress/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://ncompress.sourceforge.net/; + homepage = "http://ncompress.sourceforge.net/"; license = stdenv.lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/compression/pbzip2/default.nix b/nixpkgs/pkgs/tools/compression/pbzip2/default.nix index 3314544084f8..1c78d27654d2 100644 --- a/nixpkgs/pkgs/tools/compression/pbzip2/default.nix +++ b/nixpkgs/pkgs/tools/compression/pbzip2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with stdenv.lib; { - homepage = http://compression.ca/pbzip2/; + homepage = "http://compression.ca/pbzip2/"; description = "A parallel implementation of bzip2 for multi-core machines"; license = licenses.bsd2; maintainers = with maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/compression/pigz/default.nix b/nixpkgs/pkgs/tools/compression/pigz/default.nix index 1fabedaf62d8..1953b793657e 100644 --- a/nixpkgs/pkgs/tools/compression/pigz/default.nix +++ b/nixpkgs/pkgs/tools/compression/pigz/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.zlib.net/pigz/; + homepage = "http://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; license = licenses.zlib; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/compression/pxz/default.nix b/nixpkgs/pkgs/tools/compression/pxz/default.nix index f9ca3aa18575..e731d91f6d6e 100644 --- a/nixpkgs/pkgs/tools/compression/pxz/default.nix +++ b/nixpkgs/pkgs/tools/compression/pxz/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://jnovy.fedorapeople.org/pxz/; + homepage = "https://jnovy.fedorapeople.org/pxz/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [pashev]; description = ''Parallel XZ is a compression utility that takes advantage of diff --git a/nixpkgs/pkgs/tools/compression/rzip/default.nix b/nixpkgs/pkgs/tools/compression/rzip/default.nix index 8773121e6461..fe4ac14ad021 100644 --- a/nixpkgs/pkgs/tools/compression/rzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/rzip/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "rzip-2.1"; src = fetchurl { - url = mirror://samba/rzip/rzip-2.1.tar.gz; + url = "mirror://samba/rzip/rzip-2.1.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; buildInputs = [ bzip2 ]; @@ -11,13 +11,13 @@ stdenv.mkDerivation { patches = [ (fetchpatch { name = "CVE-2017-8364-fill-buffer.patch"; - url = https://sources.debian.net/data/main/r/rzip/2.1-4.1/debian/patches/80-CVE-2017-8364-fill-buffer.patch; + url = "https://sources.debian.net/data/main/r/rzip/2.1-4.1/debian/patches/80-CVE-2017-8364-fill-buffer.patch"; sha256 = "0jcjlx9ksdvxvjyxmyzscx9ar9992iy5icw0sc3n0p09qi4d6x1r"; }) ]; meta = { - homepage = https://rzip.samba.org/; + homepage = "https://rzip.samba.org/"; description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/compression/upx/default.nix b/nixpkgs/pkgs/tools/compression/upx/default.nix index f602a52d85ab..06dcaa26077a 100644 --- a/nixpkgs/pkgs/tools/compression/upx/default.nix +++ b/nixpkgs/pkgs/tools/compression/upx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://upx.github.io/; + homepage = "https://upx.github.io/"; description = "The Ultimate Packer for eXecutables"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/compression/xar/default.nix b/nixpkgs/pkgs/tools/compression/xar/default.nix index 691f3a8ee5d8..b877f78b8c35 100644 --- a/nixpkgs/pkgs/tools/compression/xar/default.nix +++ b/nixpkgs/pkgs/tools/compression/xar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = https://mackyle.github.io/xar/; + homepage = "https://mackyle.github.io/xar/"; description = "Extensible Archiver"; longDescription = diff --git a/nixpkgs/pkgs/tools/compression/xdelta/default.nix b/nixpkgs/pkgs/tools/compression/xdelta/default.nix index 8251d7a497eb..2420f3fab61c 100644 --- a/nixpkgs/pkgs/tools/compression/xdelta/default.nix +++ b/nixpkgs/pkgs/tools/compression/xdelta/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { file differences. This is similar to diff and patch, but it is targeted for binary files and does not generate human readable output. ''; - homepage = http://xdelta.org/; + homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix b/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix index bf2601dd3738..ae4a5ebac3ec 100644 --- a/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix +++ b/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { file differences. This is similar to diff and patch, but it is targeted for binary files and does not generate human readable output. ''; - homepage = http://xdelta.org/; + homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/compression/xz/default.nix b/nixpkgs/pkgs/tools/compression/xz/default.nix index 0ff349e96e80..545384c396d2 100644 --- a/nixpkgs/pkgs/tools/compression/xz/default.nix +++ b/nixpkgs/pkgs/tools/compression/xz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, enableStatic ? false }: stdenv.mkDerivation rec { - name = "xz-5.2.4"; + name = "xz-5.2.5"; src = fetchurl { url = "https://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "1gxpayfagb4v7xfhs2w6h7k56c6hwwav1rk48bj8hggljlmgs4rk"; + sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/doc"; meta = with stdenv.lib; { - homepage = https://tukaani.org/xz/; + homepage = "https://tukaani.org/xz/"; description = "XZ, general-purpose data compression software, successor of LZMA"; longDescription = diff --git a/nixpkgs/pkgs/tools/compression/zdelta/default.nix b/nixpkgs/pkgs/tools/compression/zdelta/default.nix index 20748c31ab81..b59e7d5708ba 100644 --- a/nixpkgs/pkgs/tools/compression/zdelta/default.nix +++ b/nixpkgs/pkgs/tools/compression/zdelta/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://cis.poly.edu/zdelta; + homepage = "http://cis.poly.edu/zdelta"; platforms = platforms.linux; license = licenses.zlib; }; diff --git a/nixpkgs/pkgs/tools/compression/zstd/default.nix b/nixpkgs/pkgs/tools/compression/zstd/default.nix index 82a6a3a8a53c..50cbc7313653 100644 --- a/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { speed is preserved and remain roughly the same at all settings, a property shared by most LZ compression algorithms, such as zlib. ''; - homepage = https://facebook.github.io/zstd/; + homepage = "https://facebook.github.io/zstd/"; license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only. platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/compression/zsync/default.nix b/nixpkgs/pkgs/tools/compression/zsync/default.nix index 830e5f10ef6d..7984e2bd5893 100644 --- a/nixpkgs/pkgs/tools/compression/zsync/default.nix +++ b/nixpkgs/pkgs/tools/compression/zsync/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; meta = { - homepage = http://zsync.moria.org.uk/; + homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix b/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix index b9c5c55a8e47..9664526761b9 100644 --- a/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = https://github.com/mischief/9pfs; + homepage = "https://github.com/mischief/9pfs"; description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/aefs/default.nix b/nixpkgs/pkgs/tools/filesystems/aefs/default.nix index 1be33e1299d2..ea94c26248e9 100644 --- a/nixpkgs/pkgs/tools/filesystems/aefs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/aefs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse ]; meta = with stdenv.lib; { - homepage = https://github.com/edolstra/aefs; + homepage = "https://github.com/edolstra/aefs"; description = "A cryptographic filesystem implemented in userspace using FUSE"; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; diff --git a/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix index 7f8a8c4f931f..3340bdba0e6d 100644 --- a/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ fuse readline libgcrypt gmp ]; meta = with stdenv.lib; { - homepage = https://github.com/simonvetter/afpfs-ng; + homepage = "https://github.com/simonvetter/afpfs-ng"; description = "A client implementation of the Apple Filing Protocol"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix index 001e644b7e7d..48e964bf687d 100644 --- a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; - homepage = https://whoozle.github.io/android-file-transfer-linux/; + homepage = "https://whoozle.github.io/android-file-transfer-linux/"; license = licenses.lgpl21; maintainers = [ maintainers.xaverdh ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix index b66d67fbc9f2..2df5043867aa 100644 --- a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://avf.sourceforge.net/; + homepage = "http://avf.sourceforge.net/"; description = "Virtual filesystem that allows browsing of compressed files"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix b/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix index d449bf1266a0..5aeff6baaa9a 100644 --- a/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jamielinux/bashmount; + homepage = "https://github.com/jamielinux/bashmount"; description = "A menu-driven bash script for the management of removable media with udisks"; maintainers = [ maintainers.koral ]; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix index d3e790a3cf13..749aa04ebc70 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { User documentation is in Documentation/bcache.txt in the Linux kernel tree. ''; - homepage = https://bcache.evilpiepirate.org/; + homepage = "https://bcache.evilpiepirate.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index 144ed0a38459..26158b0361d5 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,30 +1,58 @@ { stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, zstd, lz4 }: +, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages +, fuseSupport ? false, fuse3 ? null }: + +assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2019-10-12"; + version = "2020-04-04"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "6e696ea08703eecd0d1c7b8c520b6f62f06f4f26"; - sha256 = "0m3valm68vc73b4kydlga17fglxa9bldrjaszlladzl5bd0zb967"; + rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d"; + sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ]; - installFlags = [ "PREFIX=${placeholder "out"}" ]; - - preInstall = '' + postPatch = '' substituteInPlace Makefile \ + --replace "pytest-3" "pytest --verbose" \ --replace "INITRAMFS_DIR=/etc/initramfs-tools" \ "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + libuuid libscrypt libsodium keyutils liburcu zlib libaio + zstd lz4 python3Packages.pytest + ] ++ stdenv.lib.optional fuseSupport fuse3; + + doCheck = true; + + checkFlags = [ + "BCACHEFS_TEST_USE_VALGRIND=no" + ]; + + checkInputs = [ + valgrind + ]; + + preCheck = stdenv.lib.optionalString fuseSupport '' + rm tests/test_fuse.py + ''; + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; - homepage = https://bcachefs.org/; + homepage = "https://bcachefs.org/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak chiiruno ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index 834aa7290abc..065a673eb03b 100644 --- a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.3"; + version = "1.14.4"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "09csi8brp6v98gy9xcl6lkbz1wgs796wch1qviw2wa1n16wd91vw"; + sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7"; }; dontStrip = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; - homepage = https://bindfs.org; + homepage = "https://bindfs.org"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix index 57dc51e41115..ab49ce02225f 100644 --- a/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; meta = { - homepage = http://www.coker.com.au/bonnie++/; + homepage = "http://www.coker.com.au/bonnie++/"; description = "Hard drive and file system benchmark suite"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix index 3ddc95273972..5dba4b4bbf1a 100644 --- a/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { the terminal and in your browser. When you've done using your files, unmount the file system with `fusermount -u mountpoint`. ''; - homepage = https://github.com/drotiro/boxfs2; + homepage = "https://github.com/drotiro/boxfs2"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index e3545315d6f7..9b4bf4799676 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; + homepage = "https://btrfs.wiki.kernel.org/"; license = licenses.gpl2; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix b/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix index 791d59b7ac27..aa0f317787f8 100644 --- a/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix @@ -23,7 +23,7 @@ python2.pkgs.buildPythonApplication rec { Sources and destinations can be local btrfs file systems, remote btrfs file systems over SSH, or S3 buckets. ''; - homepage = https://github.com/AmesCornish/buttersink/wiki; + homepage = "https://github.com/AmesCornish/buttersink/wiki"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix new file mode 100644 index 000000000000..4ac6c1d5b21e --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, buildPythonApplication +, docopt, anytree +}: + +buildPythonApplication rec { + + pname = "catcli"; + version = "0.5.13"; + + src = fetchFromGitHub { + owner = "deadc0de6"; + repo = pname; + rev = "v${version}"; + sha256 = "04mrkqmm2c8fhi1h1hddc4yh3dqhcvkmcwzhj0ggn34v7wavgb5i"; + }; + + propagatedBuildInputs = [ docopt anytree ]; + + postPatch = '' patchShebangs . ''; + + meta = with stdenv.lib; { + description = "The command line catalog tool for your offline data"; + homepage = "https://github.com/deadc0de6/catcli"; + license = licenses.gpl3; + maintainers = with maintainers; [ petersjt014 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch deleted file mode 100644 index 9604da87fb50..000000000000 --- a/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py -index a8a3ec07c1..bcc9b86c37 100644 ---- a/src/pybind/mgr/dashboard/module.py -+++ b/src/pybind/mgr/dashboard/module.py -@@ -25,40 +25,6 @@ except ImportError: - - from .services.sso import load_sso_db - --# The SSL code in CherryPy 3.5.0 is buggy. It was fixed long ago, --# but 3.5.0 is still shipping in major linux distributions --# (Fedora 27, Ubuntu Xenial), so we must monkey patch it to get SSL working. --if cherrypy is not None: -- v = StrictVersion(cherrypy.__version__) -- # It was fixed in 3.7.0. Exact lower bound version is probably earlier, -- # but 3.5.0 is what this monkey patch is tested on. -- if StrictVersion("3.5.0") <= v < StrictVersion("3.7.0"): -- from cherrypy.wsgiserver.wsgiserver2 import HTTPConnection,\ -- CP_fileobject -- -- def fixed_init(hc_self, server, sock, makefile=CP_fileobject): -- hc_self.server = server -- hc_self.socket = sock -- hc_self.rfile = makefile(sock, "rb", hc_self.rbufsize) -- hc_self.wfile = makefile(sock, "wb", hc_self.wbufsize) -- hc_self.requests_seen = 0 -- -- HTTPConnection.__init__ = fixed_init -- --# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify --# that the ports its listening on are in fact bound. When using the any address --# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes) --# ipv6 isn't yet configured / supported and CherryPy throws an uncaught --# exception. --if cherrypy is not None: -- v = StrictVersion(cherrypy.__version__) -- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on -- # centos:7) and back to at least 3.0.0. -- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"): -- # https://github.com/cherrypy/cherrypy/issues/1100 -- from cherrypy.process import servers -- servers.wait_for_occupied_port = lambda host, port: None -- - if 'COVERAGE_ENABLED' in os.environ: - import coverage - __cov = coverage.Coverage(config_file="{}/.coveragerc".format(os.path.dirname(__file__)), -diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py -index b7fecf8d85..dfd4160591 100644 ---- a/src/pybind/mgr/prometheus/module.py -+++ b/src/pybind/mgr/prometheus/module.py -@@ -18,20 +18,6 @@ from rbd import RBD - DEFAULT_ADDR = '::' - DEFAULT_PORT = 9283 - --# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify --# that the ports its listening on are in fact bound. When using the any address --# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes) --# ipv6 isn't yet configured / supported and CherryPy throws an uncaught --# exception. --if cherrypy is not None: -- v = StrictVersion(cherrypy.__version__) -- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on -- # centos:7) and back to at least 3.0.0. -- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"): -- # https://github.com/cherrypy/cherrypy/issues/1100 -- from cherrypy.process import servers -- servers.wait_for_occupied_port = lambda host, port: None -- - # cherrypy likes to sys.exit on error. don't let it take us down too! - def os_exit_noop(*args, **kwargs): - pass diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index abf6ed1361b9..ea610dfcc7f0 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -93,7 +93,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.7"; + version = "14.2.8"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,12 +101,11 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0qiqhm6hvz299q54k3i4crnb5dhpq6xnn2yqih9pxn9van0dq1ln"; + sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki"; }; patches = [ ./0000-fix-SPDK-build-env.patch - ./0000-dont-check-cherrypy-version.patch ]; nativeBuildInputs = [ @@ -174,7 +173,7 @@ in rec { doCheck = false; # uses pip to install things from the internet meta = { - homepage = https://ceph.com/; + homepage = "https://ceph.com/"; description = "Distributed storage system"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak krav johanot ]; @@ -186,7 +185,7 @@ in rec { ceph-client = runCommand "ceph-client-${version}" { meta = { - homepage = https://ceph.com/; + homepage = "https://ceph.com/"; description = "Tools needed to mount Ceph's RADOS Block Devices"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak johanot krav ]; diff --git a/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix b/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix index 6c0a6c287031..c18bbe5a4559 100644 --- a/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; - homepage = http://chunkfs.florz.de/; + homepage = "http://chunkfs.florz.de/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix b/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix index 533bb2322e72..5beff7bf1c5c 100644 --- a/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = { - homepage = http://www.brain-dump.org/projects/ciopfs/; + homepage = "http://www.brain-dump.org/projects/ciopfs/"; description = "A case-insensitive filesystem layered on top of any other filesystem"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/convoy/default.nix b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix index 00ef368ad3da..77d6dca066a4 100644 --- a/nixpkgs/pkgs/tools/filesystems/convoy/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = [lvm2]; meta = with stdenv.lib; { - homepage = https://github.com/rancher/convoy; + homepage = "https://github.com/rancher/convoy"; description = "A Docker volume plugin, managing persistent container volumes."; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix index 93a70f1f0881..8f7f4f1a313f 100644 --- a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cryptographic filesystem for the cloud"; - homepage = https://www.cryfs.org; + homepage = "https://www.cryfs.org"; license = licenses.lgpl3; maintainers = with maintainers; [ peterhoeg c0bw3b ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix index 5636909093e6..a0306693b28e 100644 --- a/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "curlftpfs-0.9.2"; src = fetchurl { - url = mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz; + url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz"; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; nativeBuildInputs = [ pkgconfig ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; - homepage = http://curlftpfs.sourceforge.net; + homepage = "http://curlftpfs.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix b/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix index 0890db67fe72..3548cf0a3dca 100644 --- a/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; meta = { - homepage = http://www.darlinghq.org/; + homepage = "http://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix index 366db929f582..e3e4444c6c18 100644 --- a/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchurl +, fetchpatch +, autoreconfHook , neon , procps , substituteAll @@ -14,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21"; }; + nativeBuildInputs = [ + autoreconfHook # neon-0.31.patch requires reconfiguration + ]; + buildInputs = [ neon zlib ]; patches = [ @@ -23,6 +29,15 @@ stdenv.mkDerivation rec { src = ./0001-umount_davfs-substitute-ps-command.patch; ps = "${procps}/bin/ps"; }) + + # Fix build with neon 0.31 + # http://savannah.nongnu.org/bugs/?58101 + (fetchpatch { + name = "neon-0.31.patch"; + url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737"; + sha256 = "EtQfcstWkn8AcbZo93midGt076gq20AvGGJyQ3FO/YQ="; + extraPrefix = ""; # empty means add 'a/' and 'b/' + }) ]; configureFlags = [ "--sysconfdir=/etc" ]; @@ -33,7 +48,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://savannah.nongnu.org/projects/davfs2; + homepage = "https://savannah.nongnu.org/projects/davfs2"; description = "Mount WebDAV shares like a typical filesystem"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix index cf87f9ca98e0..10e6e2f9c801 100644 --- a/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Read BitLocker encrypted partitions in Linux"; - homepage = https://github.com/aorimn/dislocker; + homepage = "https://github.com/aorimn/dislocker"; license = licenses.gpl2; maintainers = with maintainers; [ elitak ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/djmount/default.nix b/nixpkgs/pkgs/tools/filesystems/djmount/default.nix index e3c8c2944fba..15086d28c988 100644 --- a/nixpkgs/pkgs/tools/filesystems/djmount/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/djmount/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse]; meta = { - homepage = http://djmount.sourceforge.net/; + homepage = "http://djmount.sourceforge.net/"; description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.jagajaga ]; diff --git a/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix index 369d2e74f301..5af1580d0a51 100644 --- a/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; - homepage = https://github.com/dosfstools/dosfstools; + homepage = "https://github.com/dosfstools/dosfstools"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.gpl3; }; diff --git a/nixpkgs/pkgs/tools/filesystems/duff/default.nix b/nixpkgs/pkgs/tools/filesystems/duff/default.nix index d68ad10bd0dc..48511b97c04e 100644 --- a/nixpkgs/pkgs/tools/filesystems/duff/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/duff/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { Duff is a Unix command-line utility for quickly finding duplicates in a given set of files. ''; - homepage = https://duff.dreda.org/; + homepage = "https://duff.dreda.org/"; license = licenses.zlib; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix index 0950445bd3ec..53ebbb2f8d44 100644 --- a/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; - homepage = https://github.com/markfasheh/duperemove; + homepage = "https://github.com/markfasheh/duperemove"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 thoughtpolice ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index c23e60e79b2c..469ed6fdf343 100644 --- a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://e2fsprogs.sourceforge.net/; + homepage = "http://e2fsprogs.sourceforge.net/"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix b/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix index 14f6afa99f0c..9c86ced90f7f 100644 --- a/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://home.earthlink.net/~k_sheff/sw/e2tools/; + homepage = "http://home.earthlink.net/~k_sheff/sw/e2tools/"; description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/encfs/default.nix b/nixpkgs/pkgs/tools/filesystems/encfs/default.nix index 19767b7013ae..24aa52e366f1 100644 --- a/nixpkgs/pkgs/tools/filesystems/encfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/encfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An encrypted filesystem in user-space via FUSE"; - homepage = https://vgough.github.io/encfs; + homepage = "https://vgough.github.io/encfs"; license = with licenses; [ gpl3 lgpl3 ]; platforms = with platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix b/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix index 1e1edfab8dd1..19e0e4ee63ec 100644 --- a/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch; + url = "https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch"; sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c"; }) ./glibc-fix.patch @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { It's much more effective and works much better than extundelete. ''; - homepage = http://ext4magic.sourceforge.net/ext4magic_en.html; + homepage = "http://ext4magic.sourceforge.net/ext4magic_en.html"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.rkoe ]; diff --git a/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix index b84992e1acbb..447f7a656d12 100644 --- a/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Utility that can recover deleted files from an ext3 or ext4 partition"; - homepage = http://extundelete.sourceforge.net/; + homepage = "http://extundelete.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix index c5ec523e247d..2ab168a19a5a 100644 --- a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./f2fs-tools-cross-fix.patch ]; meta = with stdenv.lib; { - homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/; + homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; description = "Userland tools for the f2fs filesystem"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/nixpkgs/pkgs/tools/filesystems/f3/default.nix index d28875829388..3559579fe80f 100644 --- a/nixpkgs/pkgs/tools/filesystems/f3/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/f3/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Fight Flash Fraud"; - homepage = http://oss.digirati.com.br/f3/; + homepage = "http://oss.digirati.com.br/f3/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix b/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix index 5a60f8c055e5..c1d048889c70 100644 --- a/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The FAT16/FAT32 non-destructive resizer"; - homepage = https://sourceforge.net/projects/fatresize; + homepage = "https://sourceforge.net/projects/fatresize"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix index aee053ad1355..dafe4c851767 100644 --- a/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ help2man ]; meta = with stdenv.lib; { - homepage = http://fatsort.sourceforge.net/; + homepage = "http://fatsort.sourceforge.net/"; description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix b/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix index 8eeb052b22f0..f9b6a941f68f 100644 --- a/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix @@ -5,7 +5,7 @@ perlPackages.buildPerlPackage { version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz; + url = "mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz"; sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix index 75e5280d391d..3e76653dd3e0 100644 --- a/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix @@ -5,7 +5,7 @@ throw "It still does not build" stdenv.mkDerivation { name = "fsfs-0.1.1"; src = fetchurl { - url = mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz; + url = "mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz"; sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://fsfs.sourceforge.net/; + homepage = "http://fsfs.sourceforge.net/"; description = "Secure distributed file system in user space"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 00f893139427..4c8012de4f14 100644 --- a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -1,25 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }: stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.7.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "10wsssf9mxgkgcqks3z02y9ya8xh4wd45lsb1jrvw31wmz9zpalc"; + sha256 = "0h1ay2l7zyiqplh8whanw68mcfri79lc03wjjrhqji5ddwznv6fa"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse3 ]; - meta = with lib; { + meta = with stdenv.lib; { description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; - maintainers = with maintainers; [ ma9e ]; + maintainers = with maintainers; [ ma9e ] ++ teams.podman.members; platforms = platforms.unix; inherit (src.meta) homepage; }; diff --git a/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix b/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix index 41c4cc84f966..2d24cb71bbed 100644 --- a/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://sourceforge.net/projects/fuseiso; + homepage = "https://sourceforge.net/projects/fuseiso"; description = "FUSE module to mount ISO filesystem images"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix b/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix index 0ef85abd2b77..8d0c0325aa9d 100644 --- a/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "genext2fs-1.4.1"; src = fetchurl { - url = mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz; + url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz"; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://genext2fs.sourceforge.net/; + homepage = "http://genext2fs.sourceforge.net/"; description = "A tool to generate ext2 filesystem images without requiring root privileges"; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/filesystems/genimage/default.nix b/nixpkgs/pkgs/tools/filesystems/genimage/default.nix index e905222ad45e..c3b867fbb601 100644 --- a/nixpkgs/pkgs/tools/filesystems/genimage/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/genimage/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://git.pengutronix.de/cgit/genimage; + homepage = "https://git.pengutronix.de/cgit/genimage"; description = "Generate filesystem images from directory trees"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix b/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix index 1e6c73f725a8..d9d97a424bdd 100644 --- a/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://romfs.sourceforge.net/; + homepage = "http://romfs.sourceforge.net/"; description = "Tool for creating romfs file system images"; license = licenses.gpl2; maintainers = with maintainers; [ pxc ]; diff --git a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix index 7c36e37b33fd..0f66955360f7 100644 --- a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { and any subsequent changes made to the files will be automatically committed to the remote. ''; - homepage = https://github.com/PressLabs/gitfs; + homepage = "https://github.com/PressLabs/gitfs"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.robbinch ]; diff --git a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index 8491bf20e8f1..70a0aff118db 100644 --- a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -43,7 +43,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Encrypted overlay filesystem written in Go"; license = licenses.mit; - homepage = https://nuetzlich.net/gocryptfs/; + homepage = "https://nuetzlich.net/gocryptfs/"; maintainers = with maintainers; [ flokli offline ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/filesystems/grive2/default.nix b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix index f325fc97e32c..01b63003d62d 100644 --- a/nixpkgs/pkgs/tools/filesystems/grive2/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console Google Drive client"; - homepage = https://github.com/vitalif/grive2; + homepage = "https://github.com/vitalif/grive2"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix index b0f7981ebb3c..d97b05abb6c7 100644 --- a/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTPFS2, a FUSE-based HTTP file system for Linux"; - homepage = http://httpfs.sourceforge.net/; + homepage = "http://httpfs.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix index 9b1c2b66e7aa..5bb8b4e91e2b 100644 --- a/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/TurboGit/hubicfuse; + homepage = "https://github.com/TurboGit/hubicfuse"; description = "FUSE-based filesystem to access hubic cloud storage"; platforms = platforms.linux; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix b/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix index aef6087d3f28..5e6025c03482 100644 --- a/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/ifuse; + homepage = "https://github.com/libimobiledevice/ifuse"; description = "A fuse filesystem implementation to access the contents of iOS devices"; longDescription = '' Mount directories of an iOS device locally using fuse. By default the media diff --git a/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/nixpkgs/pkgs/tools/filesystems/irods/common.nix index 902d7d7d1a1e..fa498263baac 100644 --- a/nixpkgs/pkgs/tools/filesystems/irods/common.nix +++ b/nixpkgs/pkgs/tools/filesystems/irods/common.nix @@ -47,7 +47,7 @@ with stdenv; important in data management. The development infrastructure supports exhaustive testing on supported platforms; plug-in support for microservices, storage resources, drivers, and databases; and extensive documentation, training and support services.''; - homepage = https://irods.org; + homepage = "https://irods.org"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix b/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix index 8b899da32c10..954393e45897 100644 --- a/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IBM JFS utilities"; - homepage = http://jfs.sourceforge.net; + homepage = "http://jfs.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix index 58963753a51a..56afb8f0f55d 100644 --- a/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A FUSE filesystem for MTP devices like Android phones"; - homepage = https://github.com/JasonFerrara/jmtpfs; + homepage = "https://github.com/JasonFerrara/jmtpfs"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.coconnor ]; diff --git a/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix index 4d90e189b950..94aa07b10437 100644 --- a/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://mhddfs.uvw.ru/; + homepage = "http://mhddfs.uvw.ru/"; description = "Combines a several mount points into the single one"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.makefu ]; diff --git a/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix b/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix index 6733b3df45ea..086791de787a 100644 --- a/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to build and unpack SPIFFS images"; license = licenses.mit; - homepage = https://github.com/igrr/mkspiffs; + homepage = "https://github.com/igrr/mkspiffs"; maintainers = with maintainers; [ haslersn ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index fe9f1ae11e60..4a912d3b42c2 100644 --- a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.110"; + version = "3.0.112"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "16m3mxmik2ifrv1g9cp68k57w8xwsxacws3sh1ajlba4azj9sf8v"; + sha256 = "04ymwg9r9x9gqjwy9jbjv7zzfgwal0xlfy6z5bwl27m2ys6l5k4a"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://moosefs.com; + homepage = "https://moosefs.com"; description = "Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix b/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix index b453067eaef8..9675f44583a3 100644 --- a/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { which only understands the MP3 format, or transcode files through simple drag-and-drop in a file browser. ''; - homepage = https://khenriks.github.io/mp3fs/; + homepage = "https://khenriks.github.io/mp3fs/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/filesystems/mtools/default.nix b/nixpkgs/pkgs/tools/filesystems/mtools/default.nix index b477ad8deace..58bd9340c5b0 100644 --- a/nixpkgs/pkgs/tools/filesystems/mtools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.23"; + name = "mtools-4.0.24"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i"; + sha256 = "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14"; }; patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/mtools/; + homepage = "https://www.gnu.org/software/mtools/"; description = "Utilities to access MS-DOS disks"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix index bf048113714f..bede0e5fca01 100644 --- a/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/cjd/mtpfs; + homepage = "https://github.com/cjd/mtpfs"; description = "FUSE Filesystem providing access to MTP devices"; platforms = platforms.all; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix b/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix index 0a4207d0715f..faa0a1ebfe86 100644 --- a/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec{ meta = { description = "Apple Filing Protocol Server"; - homepage = http://netatalk.sourceforge.net/; + homepage = "http://netatalk.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 003a0e24fb52..b05abd72bac7 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -42,7 +42,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://fedoraproject.org/wiki/Blivet; + homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index b5f3a2f3e1f6..3feed2388809 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePython python; meta = { - homepage = http://code.google.com/p/cryptsetup/; + homepage = "http://code.google.com/p/cryptsetup/"; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 804b052b61ae..c8c748b4c45f 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://sourceware.org/lvm2/; + homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index f30bd958cf3a..b3b18579334f 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools for the Linux multipathing driver"; - homepage = http://christophe.varoqui.free.fr/; + homepage = "http://christophe.varoqui.free.fr/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 046fe81e64ac..2a0ffe326dcb 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { which also serves as a sample implementation and script backend. ''; - homepage = https://www.gnu.org/software/parted/; + homepage = "https://www.gnu.org/software/parted/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 9d067359c44a..0698dcd9ecb7 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { ''; meta = { - homepage = http://fedoraproject.org/wiki/Pykickstart; + homepage = "http://fedoraproject.org/wiki/Pykickstart"; description = "Read and write Fedora kickstart files"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index e0947b01f51b..f71e7c3a06db 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { ''; meta = { - homepage = https://fedorahosted.org/pyparted/; + homepage = "https://fedorahosted.org/pyparted/"; description = "Python interface for libparted"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix b/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix index 1d402090355f..abe171170d41 100644 --- a/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.tuxera.com/community/open-source-ntfs-3g/; + homepage = "https://www.tuxera.com/community/open-source-ntfs-3g/"; description = "FUSE-based NTFS driver with full write support"; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix index 424f84ec34f9..54cb54b1df4b 100644 --- a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ nettle ]; meta = with stdenv.lib; { - homepage = https://rdfind.pauldreik.se/; + homepage = "https://rdfind.pauldreik.se/"; description = "Removes or hardlinks duplicate files very swiftly"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.wmertens ]; diff --git a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix index dbc391d00828..896d472b8329 100644 --- a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - homepage = https://sourceforge.net/projects/reiser4/; + homepage = "https://sourceforge.net/projects/reiser4/"; description = "Reiser4 utilities"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix index 10962f10a8f5..daafdbf231fd 100644 --- a/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - homepage = http://www.namesys.com/; + homepage = "http://www.namesys.com/"; description = "ReiserFS utilities"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/relfs/default.nix b/nixpkgs/pkgs/tools/filesystems/relfs/default.nix deleted file mode 100644 index c99a95714c09..000000000000 --- a/nixpkgs/pkgs/tools/filesystems/relfs/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchcvs, ocaml, fuse, postgresql, pcre -, libuuid, gnome_vfs, pkgconfig, GConf }: - -stdenv.mkDerivation { - name = "relfs-2008.03.05"; - - src = fetchcvs { - cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs"; - module = "relfs"; - date = "2008-03-05"; - sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs GConf ]; - - buildPhase = '' - cd deps - sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl - make - cd ../src - sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c - sed -e 's@/usr/local/@'\$out/'@' -i Makefile - sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile - make - mkdir -p \$out/bin - echo ' - createuser -A -D \$1 - dropdb relfs_\$1 ; - rm -rf /tmp/relfs-\$1-tmp; - mkdir /tmp/relfs-\$1-tmp; - USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp & - sleep 1 && - kill -15 \''${!}; - rm -rf /tmp/relfs-\$1-tmp ; - psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1; - ALTER TABLE obj OWNER TO \$1; - ALTER TABLE obj_mimetype OWNER TO \$1; - ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant; - chmod a+x \$out/bin/relfs_grant; - ''; - - meta = with stdenv.lib; { - description = "A relational filesystem on top of FUSE"; - homepage = http://relfs.sourceforge.net; - license = licenses.gpl2; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/tools/filesystems/rmount/default.nix b/nixpkgs/pkgs/tools/filesystems/rmount/default.nix index 72172ef5baa2..529fc0244916 100644 --- a/nixpkgs/pkgs/tools/filesystems/rmount/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/rmount/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Luis-Hebendanz/rmount; + homepage = "https://github.com/Luis-Hebendanz/rmount"; description = "Remote mount utility which parses a json file"; license = licenses.mit; maintainers = [ maintainers.luis ]; diff --git a/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix b/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix index 8085eb5f2347..96389214c7e0 100644 --- a/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps"; - homepage = https://github.com/mlafeldt/romdirfs; + homepage = "https://github.com/mlafeldt/romdirfs"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ genesis ]; diff --git a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix index 186da6255ebf..1906f6805354 100644 --- a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/archiecobbs/s3backer; + homepage = "https://github.com/archiecobbs/s3backer"; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix index 36ac3630e54d..d4c7d9b76674 100644 --- a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz; + url = "mirror://sourceforge/squashfs/squashfs4.3.tar.gz"; sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix index be46abb2694d..04c7d7c9d2a9 100644 --- a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "smbnetfs"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2"; - sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4"; + sha256 = "19x9978k90w9a65lrpsphk7swsq8zkws9jc27q4zbndrm0r2snr0"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; inherit version; - homepage = https://sourceforge.net/projects/smbnetfs/; + homepage = "https://sourceforge.net/projects/smbnetfs/"; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix b/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix index b5ffdade98f8..db9afedad96e 100644 --- a/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = { - homepage = http://www.snapraid.it/; + homepage = "http://www.snapraid.it/"; description = "A backup program for disk arrays"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.makefu ]; diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index bc8ce7b19c53..767c5168ff20 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,21 +1,21 @@ { stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig -, lz4, xz, zlib, zstd +, lz4, lzo, xz, zlib, zstd }: stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "0.8"; + version = "0.9"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1km18qm9kgmm39aj9yq2aaq99708nmj9cpa9lqf5bp1y617bhh7y"; + sha256 = "1jx6bga0k07cckpv0yk77kwql7rjiicf9wkbadc8yqhp463xn90q"; }; nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; - buildInputs = [ zlib xz lz4 zstd ]; + buildInputs = [ zlib xz lz4 lzo zstd ]; meta = with lib; { - homepage = https://github.com/AgentD/squashfs-tools-ng; + homepage = "https://github.com/AgentD/squashfs-tools-ng"; license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix index f02a913bc257..645633a87e1e 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; meta = { - homepage = http://squashfs.sourceforge.net/; + homepage = "http://squashfs.sourceforge.net/"; description = "Tool for creating and unpacking squashfs filesystems"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix index e828698b0e97..27335a9cf5da 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystem to mount squashfs archives"; - homepage = https://github.com/vasi/squashfuse; + homepage = "https://github.com/vasi/squashfuse"; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; license = "BSD-2-Clause"; diff --git a/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix b/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix index ebfb211732e8..4ae4ebb6f197 100644 --- a/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "svnfs-0.4"; src = fetchurl { - url = http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz; + url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz"; sha256 = "1lrzjr0812lrnkkwk60bws9k1hq2iibphm0nhqyv26axdsygkfky"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "FUSE filesystem for accessing Subversion repositories"; - homepage = http://www.jmadden.eu/index.php/svnfs/; + homepage = "http://www.jmadden.eu/index.php/svnfs/"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix index 67e21ac4c2c4..c7d11d415a51 100644 --- a/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.tmsu.org; + homepage = "http://www.tmsu.org"; description = "A tool for tagging your files using a virtual filesystem"; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix b/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix index 62b4b9301397..f18eb9e82271 100644 --- a/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk"; - homepage = https://sourceforge.net/projects/u3-tool/ ; + homepage = "https://sourceforge.net/projects/u3-tool/"; license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ makefu ]; diff --git a/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix index 73272b83989e..695e071effcf 100644 --- a/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FUSE UnionFS implementation"; - homepage = https://github.com/rpodgorny/unionfs-fuse; + homepage = "https://github.com/rpodgorny/unionfs-fuse"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix b/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix index 50a50ad18f05..af1caecfd748 100644 --- a/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [fuse glib neon]; meta = with stdenv.lib; { - homepage = http://noedler.de/projekte/wdfs/; + homepage = "http://noedler.de/projekte/wdfs/"; license = licenses.gpl2; description = "User-space filesystem that allows to mount a webdav share"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix index aa28ee625969..b5254a92024a 100644 --- a/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://xfs.org/; + homepage = "http://xfs.org/"; description = "SGI XFS utilities"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix index b97480d655b4..334aa6ad9c60 100644 --- a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://help.yandex.com/disk/cli-clients.xml; + homepage = "https://help.yandex.com/disk/cli-clients.xml"; description = "A free cloud file storage service"; maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix index 734c8df9b6ae..f9fd8a3c7f35 100644 --- a/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://frippery.org/uml/; + homepage = "https://frippery.org/uml/"; description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/graphics/appleseed/default.nix b/nixpkgs/pkgs/tools/graphics/appleseed/default.nix index cafe0bb7b11a..e9e57595e3d3 100644 --- a/nixpkgs/pkgs/tools/graphics/appleseed/default.nix +++ b/nixpkgs/pkgs/tools/graphics/appleseed/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source, physically-based global illumination rendering engine"; - homepage = https://appleseedhq.net/; + homepage = "https://appleseedhq.net/"; maintainers = with maintainers; [ hodapp ]; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix index 3f8bdf3ac6b2..115a9a3e4a56 100644 --- a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix +++ b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.argyllcms.com; + homepage = "http://www.argyllcms.com"; description = "Color management system (compatible with ICC)"; license = licenses.gpl3; maintainers = []; diff --git a/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index b3b03892fcb3..285dd9e7d4e6 100644 --- a/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "2.63"; + version = "2.65"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - sha256 = "1szy0hmh8fx73ngpfn5p934snv148kf1amdnbcjc0n5zb4x9vzck"; + sha256 = "1b40khffrvwm3nd5nx1iybhkc25zs6whrb3wynw7y3i87p3palyz"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/graphics/barcode/default.nix b/nixpkgs/pkgs/tools/graphics/barcode/default.nix index 179085e1fd6b..48558d022597 100644 --- a/nixpkgs/pkgs/tools/graphics/barcode/default.nix +++ b/nixpkgs/pkgs/tools/graphics/barcode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # Maybe other non-darwin Unix downloadPage = "https://ftp.gnu.org/gnu/barcode/"; updateWalker = true; - homepage = https://www.gnu.org/software/barcode/; + homepage = "https://www.gnu.org/software/barcode/"; license = licenses.gpl3; }; } diff --git a/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix b/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix index 499004013196..b22a2e8970b6 100644 --- a/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix +++ b/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/sonald/blur-effect; + homepage = "https://github.com/sonald/blur-effect"; description = "Off-screen image blurring utility using OpenGL ES 3.0"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/graphics/briss/default.nix b/nixpkgs/pkgs/tools/graphics/briss/default.nix index e57f80f738f3..3ac49b690d71 100644 --- a/nixpkgs/pkgs/tools/graphics/briss/default.nix +++ b/nixpkgs/pkgs/tools/graphics/briss/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://sourceforge.net/projects/briss/; + homepage = "https://sourceforge.net/projects/briss/"; description = "Java application for cropping PDF files"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/graphics/cfdg/default.nix b/nixpkgs/pkgs/tools/graphics/cfdg/default.nix index 1fd4d3324a0b..8122e5a5ec2d 100644 --- a/nixpkgs/pkgs/tools/graphics/cfdg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/cfdg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cfdg"; - version = "3.2_2"; + version = "3.3"; src = fetchFromGitHub { owner = "MtnViewJohn"; repo = "context-free"; rev = "Version${version}"; - sha256 = "14v1gya7h0p9dj16hw87wpmjfddmkz537w3kjvaribgxxp0gzyz5"; + sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh"; }; buildInputs = [ libpng bison flex ffmpeg icu ]; diff --git a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix index 3d48b328934b..5213245b7d4b 100644 --- a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix +++ b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Multi-language OCR system"; - homepage = https://launchpad.net/cuneiform-linux; + homepage = "https://launchpad.net/cuneiform-linux"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; diff --git a/nixpkgs/pkgs/tools/graphics/dcraw/default.nix b/nixpkgs/pkgs/tools/graphics/dcraw/default.nix index 11ff4b743ddd..f8e78d017120 100644 --- a/nixpkgs/pkgs/tools/graphics/dcraw/default.nix +++ b/nixpkgs/pkgs/tools/graphics/dcraw/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.dechifro.org/dcraw/; + homepage = "https://www.dechifro.org/dcraw/"; description = "Decoder for many camera raw picture formats"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; # Once had cygwin problems diff --git a/nixpkgs/pkgs/tools/graphics/ditaa/default.nix b/nixpkgs/pkgs/tools/graphics/ditaa/default.nix index c8c330d80e5b..89a18ae1fe2a 100644 --- a/nixpkgs/pkgs/tools/graphics/ditaa/default.nix +++ b/nixpkgs/pkgs/tools/graphics/ditaa/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ditaa-0.11.0"; src = fetchurl { - url = https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar; + url = "https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar"; sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert ascii art diagrams into proper bitmap graphics"; - homepage = https://github.com/stathissideris/ditaa; + homepage = "https://github.com/stathissideris/ditaa"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/graphics/editres/default.nix b/nixpkgs/pkgs/tools/graphics/editres/default.nix index cb83e02689cf..1dc4891d6423 100644 --- a/nixpkgs/pkgs/tools/graphics/editres/default.nix +++ b/nixpkgs/pkgs/tools/graphics/editres/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = https://cgit.freedesktop.org/xorg/app/editres/; + homepage = "https://cgit.freedesktop.org/xorg/app/editres/"; description = "A dynamic resource editor for X Toolkit applications"; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix b/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix index 8c46e8154c10..89c861267f0b 100644 --- a/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://enblend.sourceforge.net/; + homepage = "http://enblend.sourceforge.net/"; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/tools/graphics/eplot/default.nix b/nixpkgs/pkgs/tools/graphics/eplot/default.nix index ff2091fc2998..de729e38662d 100644 --- a/nixpkgs/pkgs/tools/graphics/eplot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/eplot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { This package also includes the complementary 'ec' tool (say "extract column"). ''; - homepage = http://liris.cnrs.fr/christian.wolf/software/eplot/; + homepage = "http://liris.cnrs.fr/christian.wolf/software/eplot/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/graphics/epstool/default.nix b/nixpkgs/pkgs/tools/graphics/epstool/default.nix index 2ad52d2de437..aed49158599a 100644 --- a/nixpkgs/pkgs/tools/graphics/epstool/default.nix +++ b/nixpkgs/pkgs/tools/graphics/epstool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps"; - homepage = http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm; + homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; license = licenses.gpl2; maintainers = [ maintainers.asppsa ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/escrotum/default.nix b/nixpkgs/pkgs/tools/graphics/escrotum/default.nix index 16f33251dd6a..4a887688c4f5 100644 --- a/nixpkgs/pkgs/tools/graphics/escrotum/default.nix +++ b/nixpkgs/pkgs/tools/graphics/escrotum/default.nix @@ -23,7 +23,7 @@ buildPythonApplication { ''; meta = with lib; { - homepage = https://github.com/Roger/escrotum; + homepage = "https://github.com/Roger/escrotum"; description = "Linux screen capture using pygtk, inspired by scrot"; platforms = platforms.linux; maintainers = with maintainers; [ rasendubi ]; diff --git a/nixpkgs/pkgs/tools/graphics/exif/default.nix b/nixpkgs/pkgs/tools/graphics/exif/default.nix index 83fec1287a6b..68007ec3a6b2 100644 --- a/nixpkgs/pkgs/tools/graphics/exif/default.nix +++ b/nixpkgs/pkgs/tools/graphics/exif/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libexif popt libintl ]; meta = with stdenv.lib; { - homepage = https://libexif.github.io; + homepage = "https://libexif.github.io"; description = "A utility to read and manipulate EXIF data in digital photographs"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/tools/graphics/exiftags/default.nix b/nixpkgs/pkgs/tools/graphics/exiftags/default.nix index 9ce95154cb0b..3ca748aa956f 100644 --- a/nixpkgs/pkgs/tools/graphics/exiftags/default.nix +++ b/nixpkgs/pkgs/tools/graphics/exiftags/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "exiftags-1.01"; src = fetchurl { - url = https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz; + url = "https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz"; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://johnst.org/sw/exiftags/; + homepage = "http://johnst.org/sw/exiftags/"; description = "Displays EXIF data from JPEG files"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/graphics/facedetect/default.nix b/nixpkgs/pkgs/tools/graphics/facedetect/default.nix index cb697148d045..690c7336b695 100644 --- a/nixpkgs/pkgs/tools/graphics/facedetect/default.nix +++ b/nixpkgs/pkgs/tools/graphics/facedetect/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.thregr.org/~wavexx/software/facedetect/; + homepage = "https://www.thregr.org/~wavexx/software/facedetect/"; description = "A simple face detector for batch processing"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/default.nix b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/default.nix deleted file mode 100644 index 17e1c710586b..000000000000 --- a/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{stdenv, fetchFromGitHub, fetchurl, torch, torch-hdf5, loadcaffe, bash - , python, numpy, scipy, h5py, scikitlearn, pillow - }: -stdenv.mkDerivation rec { - pname = "fast-neural-doodle"; - version = "0.0pre2016-07-01"; - buildInputs = [ - torch torch-hdf5 python numpy h5py scikitlearn scipy pillow - ]; - - inherit torch loadcaffe bash python; - torch_hdf5 = torch-hdf5; - python_libPrefix = python.libPrefix; - - src = fetchFromGitHub { - owner = "DmitryUlyanov"; - repo = "fast-neural-doodle"; - rev = "00c35a4440d1d58b029d7bdf9bc56743b1a1835f"; - sha256 = "0xhmhxhjm59pfjm2q27g2xfb35hg0vlqkk3sb3llx2qqq2c7jk8m"; - }; - models = [ - (fetchurl { - url = "https://gist.githubusercontent.com/ksimonyan/3785162f95cd2d5fee77/raw/bb2b4fe0a9bb0669211cf3d0bc949dfdda173e9e/VGG_ILSVRC_19_layers_deploy.prototxt"; - sha256 = "09cpz7pyvc8sypg2q5j2i8yqwj1sjdbnmd6skl293p9pv13dmjg7"; - }) - (fetchurl { - url = "https://bethgelab.org/media/uploads/deeptextures/vgg_normalised.caffemodel"; - sha256 = "11qckdvlck7wwl3pan0nawgxm8l2ccddi272i5l8rs9qzm7b23rf"; - }) - (fetchurl { - url = "http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_19_layers.caffemodel"; - sha256 = "0m399x7pl4lnhy435ycsyz8xpzapqmx9n1sz698y2vhcqhkwdd1i"; - }) - ]; - installPhase = '' - mkdir -p "$out"/{doc/fast-neural-doodle,lib/lua/fast_neural_doodle,lib/${python.libPrefix}/fast_neural_doodle,bin} - cp -r data src fast_neural_doodle.lua "$out/lib/lua/fast_neural_doodle/" - for file in $models; do - ln -s "$file" "$out/lib/lua/fast_neural_doodle/data/pretrained/$(basename "$file" | sed -e 's/[^-]*-//')" - done; - cp get_mask_hdf5.py "$out/lib/${python.libPrefix}/fast_neural_doodle" - cp *.md LICENSE "$out/doc/fast-neural-doodle" - - export pythonpath="$PYTHONPATH" - - substituteAll "${./get-mask-hdf5.sh}" "$out/bin/get-mask-hdf5" - substituteAll "${./fast-neural-doodle.sh}" "$out/bin/fast-neural-doodle" - - chmod a+x "$out/bin"/* - - "$out/bin/get-mask-hdf5" --n_colors=4 --style_image data/Renoir/style.png --style_mask data/Renoir/style_mask.png --target_mask data/Renoir/target_mask.png --out_hdf5 masks.hdf5 - - "$out/bin/fast-neural-doodle" -gpu -1 -masks_hdf5 masks.hdf5 -num_iterations 1 - ''; - meta = { - inherit version; - description = ''Faster neural doodle''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh deleted file mode 100644 index a089d5a95061..000000000000 --- a/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh +++ /dev/null @@ -1,28 +0,0 @@ -#! @bash@/bin/bash - -declare -a args -c=1 -flag= - -for arg in "$@"; do - if test "$arg" = "${arg#-}" && test "$arg" = "${arg#/}" && test -n "$flag"; then - arg="$PWD/$arg" - flag= - elif (test "$arg" != "${arg%_image}" || test "$arg" == "-masks_hdf5") && test "$arg" != "${arg#-}"; then - flag=1 - else - flag= - fi - args[c]="$arg"; - c=$((c+1)); -done - -cd "@out@/lib/lua/fast_neural_doodle" - -export LUA_PATH="$LUA_PATH${LUA_PATH:+;}@loadcaffe@/lua/?/init.lua;@loadcaffe@/lua/?.lua" -export LUA_PATH="$LUA_PATH${LUA_PATH:+;}@torch_hdf5@/lua/?/init.lua;@torch_hdf5@/lua/?.lua" -export LUA_CPATH="$LUA_CPATH${LUA_CPATH:+;}@loadcaffe@/lib/?.so" - -set -x - -@torch@/bin/th fast_neural_doodle.lua "${args[@]}" diff --git a/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh deleted file mode 100644 index cfff76d141fb..000000000000 --- a/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! @bash@/bin/bash - -export PYTHONPATH="@pythonpath@" - -@python@/bin/python "@out@/lib/@python_libPrefix@/fast_neural_doodle/get_mask_hdf5.py" "$@" diff --git a/nixpkgs/pkgs/tools/graphics/fbv/default.nix b/nixpkgs/pkgs/tools/graphics/fbv/default.nix index c7fab1710672..561c007ff161 100644 --- a/nixpkgs/pkgs/tools/graphics/fbv/default.nix +++ b/nixpkgs/pkgs/tools/graphics/fbv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View pictures on a linux framebuffer device"; - homepage = http://s-tech.elsat.net.pl/fbv/; + homepage = "http://s-tech.elsat.net.pl/fbv/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix b/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix index 8f94624febe8..ef699b5437a0 100644 --- a/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/feedgnuplot/default.nix @@ -48,7 +48,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "General purpose pipe-oriented plotting tool"; - homepage = https://github.com/dkogan/feedgnuplot/; + homepage = "https://github.com/dkogan/feedgnuplot/"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ mnacamura ]; diff --git a/nixpkgs/pkgs/tools/graphics/fgallery/default.nix b/nixpkgs/pkgs/tools/graphics/fgallery/default.nix index 2bce8ec4941b..cc387e29412b 100644 --- a/nixpkgs/pkgs/tools/graphics/fgallery/default.nix +++ b/nixpkgs/pkgs/tools/graphics/fgallery/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Static photo gallery generator"; - homepage = http://www.thregr.org/~wavexx/software/fgallery/; + homepage = "http://www.thregr.org/~wavexx/software/fgallery/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/graphics/fim/default.nix b/nixpkgs/pkgs/tools/graphics/fim/default.nix index 3fc82a9c72a0..6a3d9a29db37 100644 --- a/nixpkgs/pkgs/tools/graphics/fim/default.nix +++ b/nixpkgs/pkgs/tools/graphics/fim/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { to be a highly customizable and scriptable for users who are comfortable with software like the VIM text editor or the Mutt mail user agent. ''; - homepage = https://www.nongnu.org/fbi-improved/; + homepage = "https://www.nongnu.org/fbi-improved/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/tools/graphics/flam3/default.nix b/nixpkgs/pkgs/tools/graphics/flam3/default.nix index a6277f58cbdb..0f1bf8065514 100644 --- a/nixpkgs/pkgs/tools/graphics/flam3/default.nix +++ b/nixpkgs/pkgs/tools/graphics/flam3/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cosmic recursive fractal flames"; - homepage = https://flam3.com/; + homepage = "https://flam3.com/"; maintainers = [ maintainers.nand0p ]; platforms = platforms.linux; license = licenses.cc-by-nc-sa-20; diff --git a/nixpkgs/pkgs/tools/graphics/ggobi/default.nix b/nixpkgs/pkgs/tools/graphics/ggobi/default.nix index de02865c36e2..82ee194ad121 100644 --- a/nixpkgs/pkgs/tools/graphics/ggobi/default.nix +++ b/nixpkgs/pkgs/tools/graphics/ggobi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Visualization program for exploring high-dimensional data"; - homepage = http://www.ggobi.org/; + homepage = "http://www.ggobi.org/"; license = licenses.cpl10; platforms = platforms.linux; maintainers = [ maintainers.michelk ]; diff --git a/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix b/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix index 9b3836b9decc..007ba0f99720 100644 --- a/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; - homepage = https://www.lcdf.org/gifsicle/; + homepage = "https://www.lcdf.org/gifsicle/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; maintainers = with stdenv.lib.maintainers; [ zimbatm ]; diff --git a/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/nixpkgs/pkgs/tools/graphics/gifski/default.nix index 3d1e2114196a..8c808657f4c5 100644 --- a/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "0gsk1pagg89q1mi3d28q6dsnanncwphw9lrb7qybppw0vyvqlqbx"; + sha256 = "1ly465y435cha22rmnq632hgq2s7y0akrcna6m30f6l078br8mhn"; }; - cargoSha256 = "0k7pzcll7hn2a354vviyj8dr0kq63cwsldgv303kwklmxji02d0v"; + cargoSha256 = "0khfkh1ylqv4v5dsb4hsha5fh3b62hcvkp3swplv64h626p3q54s"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/graphics/glee/default.nix b/nixpkgs/pkgs/tools/graphics/glee/default.nix index a68e64c0894c..58fcfbfd9aca 100644 --- a/nixpkgs/pkgs/tools/graphics/glee/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glee/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GL Easy Extension Library"; - homepage = https://sourceforge.net/p/glee/glee/; + homepage = "https://sourceforge.net/p/glee/glee/"; maintainers = with maintainers; [ nand0p ]; platforms = platforms.linux; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index 5668e755d017..deea9e10a1a0 100644 --- a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "OpenGL (ES) 2.0 benchmark"; - homepage = https://github.com/glmark2/glmark2; + homepage = "https://github.com/glmark2/glmark2"; license = licenses.gpl3Plus; longDescription = '' glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of diff --git a/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix b/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix index 0710f47cb571..a1160fd73838 100644 --- a/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Test utilities for OpenGL"; - homepage = https://www.mesa3d.org/; + homepage = "https://www.mesa3d.org/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix b/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix index a8dd35ce7b04..b7650b220809 100644 --- a/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix @@ -137,7 +137,7 @@ mkDerivation rec { meta = with lib; { description = variants.${variant}.description; - homepage = http://gmic.eu/; + homepage = "http://gmic.eu/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/nixpkgs/pkgs/tools/graphics/gmic/default.nix index 3f181d12ba07..f4be95556c8f 100644 --- a/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open and full-featured framework for image processing"; - homepage = http://gmic.eu/; + homepage = "http://gmic.eu/"; license = licenses.cecill20; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix b/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix index 0ac1c1a21553..fc1892317fa1 100644 --- a/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix @@ -48,18 +48,22 @@ in (if aquaterm then "--with-aquaterm" else "--without-aquaterm") ]; + CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11"; + postInstall = lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ --prefix PATH : '${fontconfig.bin}/bin' \ --run '. ${./set-gdfontpath-from-fontconfig.sh}' + '' + lib.optionalString (stdenv.isDarwin && withQt) '' + wrapQtApp $out/bin/gnuplot ''; enableParallelBuilding = true; meta = with lib; { - homepage = http://www.gnuplot.info/; + homepage = "http://www.gnuplot.info/"; description = "A portable command-line driven graphing utility for many platforms"; platforms = platforms.linux ++ platforms.darwin; license = { @@ -69,7 +73,7 @@ in # be distributed as patches to the released version. Permission to # distribute binaries produced by compiling modified sources is granted, # provided you: ... - url = https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright; + url = "https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright"; }; maintainers = with maintainers; [ lovek323 ]; }; diff --git a/nixpkgs/pkgs/tools/graphics/graphviz/base.nix b/nixpkgs/pkgs/tools/graphics/graphviz/base.nix index 3b9d8a4cca5d..a65f5ce455c3 100644 --- a/nixpkgs/pkgs/tools/graphics/graphviz/base.nix +++ b/nixpkgs/pkgs/tools/graphics/graphviz/base.nix @@ -12,7 +12,7 @@ let # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196 fetchpatch { name = "CVE-2018-10196.patch"; - url = https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff; + url = "https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff"; sha256 = "074qx6ch9blrnlilmz7p96fkiz2va84x2fbqdza5k4808rngirc7"; excludes = ["tests/*"]; # we don't run them and they don't apply }; @@ -80,7 +80,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://graphviz.org; + homepage = "https://graphviz.org"; description = "Graph visualization tools"; license = licenses.epl10; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/graphics/grim/default.nix b/nixpkgs/pkgs/tools/graphics/grim/default.nix index ed7ed5fdef05..ab0418bd0dc6 100644 --- a/nixpkgs/pkgs/tools/graphics/grim/default.nix +++ b/nixpkgs/pkgs/tools/graphics/grim/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Grab images from a Wayland compositor"; - homepage = https://github.com/emersion/grim; + homepage = "https://github.com/emersion/grim"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ buffet ]; diff --git a/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix b/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix index 7465ebb78836..ebb50cfad2ee 100644 --- a/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { to make annotations on the screen. ''; - homepage = https://github.com/bk138/gromit-mpx; + homepage = "https://github.com/bk138/gromit-mpx"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/graphics/guff/default.nix b/nixpkgs/pkgs/tools/graphics/guff/default.nix index db218a812e69..f03adb7bff0f 100644 --- a/nixpkgs/pkgs/tools/graphics/guff/default.nix +++ b/nixpkgs/pkgs/tools/graphics/guff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A plot device"; - homepage = https://github.com/silentbicycle/guff; + homepage = "https://github.com/silentbicycle/guff"; license = licenses.isc; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/graphics/icoutils/default.nix b/nixpkgs/pkgs/tools/graphics/icoutils/default.nix index b16dbe219853..0689c9cc2486 100644 --- a/nixpkgs/pkgs/tools/graphics/icoutils/default.nix +++ b/nixpkgs/pkgs/tools/graphics/icoutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.nongnu.org/icoutils/; + homepage = "https://www.nongnu.org/icoutils/"; description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/tools/graphics/ifm/default.nix b/nixpkgs/pkgs/tools/graphics/ifm/default.nix index c6e8df31dd08..8478395a874f 100644 --- a/nixpkgs/pkgs/tools/graphics/ifm/default.nix +++ b/nixpkgs/pkgs/tools/graphics/ifm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # ifm-scan.l:16:10: fatal error: ifm-parse.h: No such file or directory meta = with lib; { - homepage = https://bitbucket.org/zondo/ifm; + homepage = "https://bitbucket.org/zondo/ifm"; description = "Interactive fiction mapper"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/imageworsener/default.nix b/nixpkgs/pkgs/tools/graphics/imageworsener/default.nix index 7c3d89317001..3eade7ee76b9 100644 --- a/nixpkgs/pkgs/tools/graphics/imageworsener/default.nix +++ b/nixpkgs/pkgs/tools/graphics/imageworsener/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A raster image scaling and processing utility"; - homepage = https://entropymine.com/imageworsener/; + homepage = "https://entropymine.com/imageworsener/"; changelog = "https://github.com/jsummers/${pname}/blob/${version}/changelog.txt"; license = licenses.mit; maintainers = with maintainers; [ emily ]; diff --git a/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix b/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix index 1099b11176c8..c994ee02811e 100644 --- a/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for easy screencapping and uploading to imgur"; - homepage = https://github.com/jomo/imgur-screenshot/; + homepage = "https://github.com/jomo/imgur-screenshot/"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ lw ]; diff --git a/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix b/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix index 883453379c4e..14761e7763ce 100644 --- a/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix +++ b/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; - homepage = https://github.com/ram-on/imgurbash2; + homepage = "https://github.com/ram-on/imgurbash2"; }; } diff --git a/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix b/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix index 1be5f0120fd9..05818bf8dda1 100644 --- a/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix +++ b/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jbig2enc-0.28"; src = fetchurl { - url = https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz; + url = "https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz"; sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; }; diff --git a/nixpkgs/pkgs/tools/graphics/jhead/default.nix b/nixpkgs/pkgs/tools/graphics/jhead/default.nix index 13df4ede8ecf..9f5ffcad8fd6 100644 --- a/nixpkgs/pkgs/tools/graphics/jhead/default.nix +++ b/nixpkgs/pkgs/tools/graphics/jhead/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.sentex.net/~mwandel/jhead/; + homepage = "http://www.sentex.net/~mwandel/jhead/"; description = "Exif Jpeg header manipulation tool"; license = licenses.publicDomain; maintainers = with maintainers; [ rycee ]; diff --git a/nixpkgs/pkgs/tools/graphics/kst/default.nix b/nixpkgs/pkgs/tools/graphics/kst/default.nix index 480ae328cd38..9c0c8bae49b7 100644 --- a/nixpkgs/pkgs/tools/graphics/kst/default.nix +++ b/nixpkgs/pkgs/tools/graphics/kst/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Real-time large-dataset viewing and plotting tool"; - homepage = https://kst-plot.kde.org/; + homepage = "https://kst-plot.kde.org/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; diff --git a/nixpkgs/pkgs/tools/graphics/leela/default.nix b/nixpkgs/pkgs/tools/graphics/leela/default.nix index d1b31f391526..0c56f3859839 100644 --- a/nixpkgs/pkgs/tools/graphics/leela/default.nix +++ b/nixpkgs/pkgs/tools/graphics/leela/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "CLI frontend to the poppler-glib libary of PDF tools"; - homepage = https://github.com/TrilbyWhite/Leela; + homepage = "https://github.com/TrilbyWhite/Leela"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/lepton/default.nix b/nixpkgs/pkgs/tools/graphics/lepton/default.nix index 2a4f8a310ada..0088422c6a4a 100644 --- a/nixpkgs/pkgs/tools/graphics/lepton/default.nix +++ b/nixpkgs/pkgs/tools/graphics/lepton/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ]; meta = with stdenv.lib; { - homepage = https://github.com/dropbox/lepton; + homepage = "https://github.com/dropbox/lepton"; description = "A tool to losslessly compress JPEGs"; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix index aed8b0573bae..83178824eab6 100644 --- a/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix +++ b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { glm freetype ]; meta = with stdenv.lib; { - homepage = https://logstalgia.io/; + homepage = "https://logstalgia.io/"; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/graphics/lprof/default.nix b/nixpkgs/pkgs/tools/graphics/lprof/default.nix index 42ccc4d5022e..9c666462ef76 100644 --- a/nixpkgs/pkgs/tools/graphics/lprof/default.nix +++ b/nixpkgs/pkgs/tools/graphics/lprof/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz; + url = "mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz"; sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Little CMS ICC profile construction set"; - homepage = https://sourceforge.net/projects/lprof; + homepage = "https://sourceforge.net/projects/lprof"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix index 6a0db954da64..fc8a98c19930 100644 --- a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix +++ b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source, physically based, unbiased rendering engine"; - homepage = https://luxcorerender.org/; + homepage = "https://luxcorerender.org/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/maim/default.nix b/nixpkgs/pkgs/tools/graphics/maim/default.nix index 8f3a4dc5c659..29c9144f89fe 100644 --- a/nixpkgs/pkgs/tools/graphics/maim/default.nix +++ b/nixpkgs/pkgs/tools/graphics/maim/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "maim"; - version = "5.5.3"; + version = "5.6.3"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "1kbxsz8whfxl5blwsvpva2q95zwy72argwhi1cfqh5lrhzq5zrpp"; + sha256 = "181mjjrjb9fs1ficcv9miqbk94v95j1yli7fjp2dj514g7nj9l3x"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { take only a region, and relies on slop to query for regions. maim is supposed to be an improved scrot. ''; + changelog = "https://github.com/naelstrof/maim/releases/tag/v${version}"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; diff --git a/nixpkgs/pkgs/tools/graphics/mesa-demos/default.nix b/nixpkgs/pkgs/tools/graphics/mesa-demos/default.nix new file mode 100644 index 000000000000..12e751e0f087 --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/mesa-demos/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa, pkg-config, wayland }: + +stdenv.mkDerivation rec { + pname = "mesa-demos"; + version = "8.4.0"; + + src = fetchurl { + url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${pname}-${version}.tar.bz2"; + sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81"; + }; + + buildInputs = [ freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland ]; + nativeBuildInputs = [ pkg-config ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Collection of demos and test programs for OpenGL and Mesa"; + homepage = "https://www.mesa3d.org/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/mscgen/default.nix b/nixpkgs/pkgs/tools/graphics/mscgen/default.nix index 613a906a7b4e..f6bec5983c2a 100644 --- a/nixpkgs/pkgs/tools/graphics/mscgen/default.nix +++ b/nixpkgs/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,15 @@ -{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp, runtimeShell }: +{ stdenv +, bison +, fetchurl +, flex +, gd +, libjpeg +, libpng +, libwebp +, pkg-config +, runtimeShell +, zlib +}: let version = "0.20"; @@ -12,15 +23,18 @@ stdenv.mkDerivation { sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; - buildInputs = [ flex bison gd libjpeg libpng freetype zlib libwebp ]; + nativeBuildInputs = [ bison flex pkg-config ]; + buildInputs = [ gd libjpeg libpng libwebp zlib ]; doCheck = true; preCheck = '' sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh ''; + outputs = [ "out" "man" ]; + meta = { - homepage = http://www.mcternan.me.uk/mscgen/; + homepage = "http://www.mcternan.me.uk/mscgen/"; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/graphics/neural-style/default.nix b/nixpkgs/pkgs/tools/graphics/neural-style/default.nix deleted file mode 100644 index a4706e95ceef..000000000000 --- a/nixpkgs/pkgs/tools/graphics/neural-style/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{stdenv, fetchFromGitHub, torch, loadcaffe, fetchurl, bash}: -stdenv.mkDerivation rec { - pname = "neural-style"; - version = "0.0pre2016.08.15"; - buildInputs = [torch loadcaffe]; - src = fetchFromGitHub { - owner = "jcjohnson"; - repo = "neural-style"; - rev = "ec5ba3a690d3090428d3b92b0c5d686a311bf432"; - sha256 = "14qzbs9f95izvd0vbbirhymdw9pq2nw0jvhrh7vnyzr99xllwp02"; - }; - models = [ - (fetchurl { - url = "https://gist.githubusercontent.com/ksimonyan/3785162f95cd2d5fee77/raw/bb2b4fe0a9bb0669211cf3d0bc949dfdda173e9e/VGG_ILSVRC_19_layers_deploy.prototxt"; - sha256 = "09cpz7pyvc8sypg2q5j2i8yqwj1sjdbnmd6skl293p9pv13dmjg7"; - }) - (fetchurl { - url = "https://bethgelab.org/media/uploads/deeptextures/vgg_normalised.caffemodel"; - sha256 = "11qckdvlck7wwl3pan0nawgxm8l2ccddi272i5l8rs9qzm7b23rf"; - }) - (fetchurl { - url = "http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_19_layers.caffemodel"; - sha256 = "0m399x7pl4lnhy435ycsyz8xpzapqmx9n1sz698y2vhcqhkwdd1i"; - }) - ]; - installPhase = '' - mkdir -p "$out"/{bin,lib/lua/neural-style/models,share/doc/neural-style,share/neural-style} - for file in $models; do - ln -s "$file" "$out/lib/lua/neural-style/models/$(basename "$file" | sed -e 's/[^-]*-//')" - done; - cp README* INSTALL* LICEN?E* "$out"/share/doc/neural-style/ - cp neural_style.lua "$out"/lib/lua/neural-style - - substituteAll "${./neural-style.sh}" "$out/bin/neural-style" - chmod a+x "$out/bin/neural-style" - cp "$out/bin/neural-style" . - cp "$out/lib/lua/neural-style/models/"* models/ - - echo "Testing..." - - "$out/bin/neural-style" -style_image examples/inputs/golden_gate.jpg \ - -content_image examples/inputs/golden_gate.jpg -output_image $PWD/test.png \ - -gpu -1 -save_iter 1 -print_iter 1 -num_iterations 1 || true - - cp -f "$out/lib/lua/neural-style/models/"* models/ - - test -e test.png || exit 1 - ''; - inherit torch bash loadcaffe; - meta = { - inherit version; - description = ''A torch implementation of the paper A Neural Algorithm of Artistic Style''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - # Eats a lot of RAM - platforms = ["x86_64-linux"]; - }; -} diff --git a/nixpkgs/pkgs/tools/graphics/neural-style/neural-style.sh b/nixpkgs/pkgs/tools/graphics/neural-style/neural-style.sh deleted file mode 100644 index 07a4d6dedc04..000000000000 --- a/nixpkgs/pkgs/tools/graphics/neural-style/neural-style.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! @bash@/bin/bash - -declare -a args -c=1 -flag= - -for arg in "$@"; do - if test "$arg" = "${arg#-}" && test "$arg" = "${arg#/}" && test -n "$flag"; then - arg="$PWD/$arg" - flag= - elif test "$arg" != "${arg%_image}" && test "$arg" != "${arg#-}"; then - flag=1 - else - flag= - fi - args[c]="$arg"; - c=$((c+1)); -done - -cd "@out@/lib/lua/neural-style" - -export LUA_PATH="$LUA_PATH${LUA_PATH:+;}@loadcaffe@/lua/?/init.lua;@loadcaffe@/lua/?.lua" -export LUA_CPATH="$LUA_CPATH${LUA_CPATH:+;}@loadcaffe@/lib/?.so" - -@torch@/bin/th neural_style.lua "${args[@]}" diff --git a/nixpkgs/pkgs/tools/graphics/nifskope/default.nix b/nixpkgs/pkgs/tools/graphics/nifskope/default.nix index 65ccfecedd68..68cf812d052a 100644 --- a/nixpkgs/pkgs/tools/graphics/nifskope/default.nix +++ b/nixpkgs/pkgs/tools/graphics/nifskope/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://niftools.sourceforge.net/wiki/NifSkope; + homepage = "http://niftools.sourceforge.net/wiki/NifSkope"; description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; maintainers = with maintainers; [ eelco ma27 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/optar/default.nix b/nixpkgs/pkgs/tools/graphics/optar/default.nix index b831e359e9cc..4eee8acb9798 100644 --- a/nixpkgs/pkgs/tools/graphics/optar/default.nix +++ b/nixpkgs/pkgs/tools/graphics/optar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Optar stands for OPTical ARchiver - it's a codec for encoding data on paper"; - homepage = http://ronja.twibright.com/optar/; + homepage = "http://ronja.twibright.com/optar/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; # possibly others, but only tested on Linux diff --git a/nixpkgs/pkgs/tools/graphics/optipng/default.nix b/nixpkgs/pkgs/tools/graphics/optipng/default.nix index bc849b21117f..93c2f2c35025 100644 --- a/nixpkgs/pkgs/tools/graphics/optipng/default.nix +++ b/nixpkgs/pkgs/tools/graphics/optipng/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { '' else null; meta = with stdenv.lib; { - homepage = http://optipng.sourceforge.net/; + homepage = "http://optipng.sourceforge.net/"; description = "A PNG optimizer"; license = licenses.zlib; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/nixpkgs/pkgs/tools/graphics/oxipng/default.nix index 7326e2427d03..be29136c7038 100644 --- a/nixpkgs/pkgs/tools/graphics/oxipng/default.nix +++ b/nixpkgs/pkgs/tools/graphics/oxipng/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; meta = with stdenv.lib; { - homepage = https://github.com/shssoichiro/oxipng; + homepage = "https://github.com/shssoichiro/oxipng"; description = "A multithreaded lossless PNG compression optimizer"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; diff --git a/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix b/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix index 46eb61d1cf75..b1463544bbd7 100644 --- a/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF converter to SVG format"; - homepage = http://www.cityinthesky.co.uk/opensource/pdf2svg; + homepage = "http://www.cityinthesky.co.uk/opensource/pdf2svg"; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/graphics/pdfread/default.nix b/nixpkgs/pkgs/tools/graphics/pdfread/default.nix index 8733b2c1caa0..80f7404bc94f 100644 --- a/nixpkgs/pkgs/tools/graphics/pdfread/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pdfread/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { # But that needs user registration to allow downloading. # This is an evolution from pdfread 1.7 in http://pdfread.sourceforge.net/ # Temporary place: - url = http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip; + url = "http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip"; sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; }; @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "PDF/DJVU to ebook format converter"; - homepage = https://www.mobileread.com/forums/showthread.php?t=21906; + homepage = "https://www.mobileread.com/forums/showthread.php?t=21906"; license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/nixpkgs/pkgs/tools/graphics/pfstools/default.nix index 668f73c04f42..051adb0742f9 100644 --- a/nixpkgs/pkgs/tools/graphics/pfstools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pfstools/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ]; meta = with stdenv.lib; { - homepage = http://pfstools.sourceforge.net/; + homepage = "http://pfstools.sourceforge.net/"; description = "Toolkit for manipulation of HDR images"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/nixpkgs/pkgs/tools/graphics/pgf/default.nix b/nixpkgs/pkgs/tools/graphics/pgf/default.nix index 6ae45cc85331..88684541fcc6 100644 --- a/nixpkgs/pkgs/tools/graphics/pgf/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pgf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { # configureFlags = optional static "--enable-static --disable-shared"; meta = { - homepage = http://www.libpgf.org/; + homepage = "http://www.libpgf.org/"; description = "Progressive Graphics Format command line program"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/ploticus/default.nix b/nixpkgs/pkgs/tools/graphics/ploticus/default.nix index d0e678578723..409a91dba0d5 100644 --- a/nixpkgs/pkgs/tools/graphics/ploticus/default.nix +++ b/nixpkgs/pkgs/tools/graphics/ploticus/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz; + url = "mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz"; sha256 = "1065r0nizjixi9sxxfxrnwg10r458i6fgsd23nrxa200rypvdk7c"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { over colors, styles, options and details.''; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - homepage = http://ploticus.sourceforge.net/; + homepage = "http://ploticus.sourceforge.net/"; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/tools/graphics/plotutils/default.nix b/nixpkgs/pkgs/tools/graphics/plotutils/default.nix index 61e21b1a33da..7292b2ac37bf 100644 --- a/nixpkgs/pkgs/tools/graphics/plotutils/default.nix +++ b/nixpkgs/pkgs/tools/graphics/plotutils/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { graphics. ''; - homepage = https://www.gnu.org/software/plotutils/; + homepage = "https://www.gnu.org/software/plotutils/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber ]; diff --git a/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix b/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix index f7bd8d520c87..085b6ae4a951 100644 --- a/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngcheck/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://pmt.sourceforge.net/pngcrush; + homepage = "http://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix b/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix index fce1f3f913cf..67d3eb15ba12 100644 --- a/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; meta = { - homepage = http://pmt.sourceforge.net/pngcrush; + homepage = "http://pmt.sourceforge.net/pngcrush"; description = "A PNG optimizer"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/tools/graphics/pngnq/default.nix b/nixpkgs/pkgs/tools/graphics/pngnq/default.nix index e01f3ea2acc5..ca1edda454e9 100644 --- a/nixpkgs/pkgs/tools/graphics/pngnq/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngnq/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pngnq.sourceforge.net/; + homepage = "http://pngnq.sourceforge.net/"; description = "A PNG quantizer"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/graphics/pngout/default.nix b/nixpkgs/pkgs/tools/graphics/pngout/default.nix index 9d0e1b0ea879..33a62478a4b6 100644 --- a/nixpkgs/pkgs/tools/graphics/pngout/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngout/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "pngout-20150319"; src = fetchurl { - url = http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz; + url = "http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz"; sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A tool that aggressively optimizes the sizes of PNG images"; license = stdenv.lib.licenses.unfree; - homepage = http://advsys.net/ken/utils.htm; + homepage = "http://advsys.net/ken/utils.htm"; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/nixpkgs/pkgs/tools/graphics/pngquant/default.nix b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix index 51be6afd102e..2c9e3b272e70 100644 --- a/nixpkgs/pkgs/tools/graphics/pngquant/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng zlib lcms2 ]; meta = with stdenv.lib; { - homepage = https://pngquant.org/; + homepage = "https://pngquant.org/"; description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix b/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix index ed8fa5ee5192..2300c65f24b5 100644 --- a/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pngtoico-1.0"; src = fetchurl { - url = mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz; + url = "mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz"; sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libpng ]; meta = { - homepage = https://www.kernel.org/pub/software/graphics/pngtoico/; + homepage = "https://www.kernel.org/pub/software/graphics/pngtoico/"; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/graphics/povray/default.nix b/nixpkgs/pkgs/tools/graphics/povray/default.nix index ead44897968f..94ce3e7f06b1 100644 --- a/nixpkgs/pkgs/tools/graphics/povray/default.nix +++ b/nixpkgs/pkgs/tools/graphics/povray/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.povray.org/; + homepage = "http://www.povray.org/"; description = "Persistence of Vision Raytracer"; license = licenses.free; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix b/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix index ebd265b8a80c..ec06088ae52f 100644 --- a/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pstoedit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Translates PostScript and PDF graphics into other vector formats"; - homepage = https://sourceforge.net/projects/pstoedit/; + homepage = "https://sourceforge.net/projects/pstoedit/"; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/graphics/s2png/default.nix b/nixpkgs/pkgs/tools/graphics/s2png/default.nix index e7d3b8151a44..745a032b068a 100644 --- a/nixpkgs/pkgs/tools/graphics/s2png/default.nix +++ b/nixpkgs/pkgs/tools/graphics/s2png/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=" "DESTDIR=$(out)" ]; meta = { - homepage = https://github.com/dbohdan/s2png/; + homepage = "https://github.com/dbohdan/s2png/"; description = "Store any data in PNG images"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.dbohdan ]; diff --git a/nixpkgs/pkgs/tools/graphics/scanbd/default.nix b/nixpkgs/pkgs/tools/graphics/scanbd/default.nix index fd26869d298b..14f925a4fd2d 100644 --- a/nixpkgs/pkgs/tools/graphics/scanbd/default.nix +++ b/nixpkgs/pkgs/tools/graphics/scanbd/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { scanbd can use all sane-backends or some special backends from the (old) scanbuttond project. ''; - homepage = http://scanbd.sourceforge.net/; - downloadPage = https://sourceforge.net/projects/scanbd/; + homepage = "http://scanbd.sourceforge.net/"; + downloadPage = "https://sourceforge.net/projects/scanbd/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/nixpkgs/pkgs/tools/graphics/scrot/default.nix index 413bc8c52f1e..56df615e5750 100644 --- a/nixpkgs/pkgs/tools/graphics/scrot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/scrot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ]; meta = with stdenv.lib; { - homepage = https://github.com/resurrecting-open-source-projects/scrot; + homepage = "https://github.com/resurrecting-open-source-projects/scrot"; description = "A command-line screen capture utility"; platforms = platforms.linux; maintainers = with maintainers; [ globin ]; diff --git a/nixpkgs/pkgs/tools/graphics/sng/default.nix b/nixpkgs/pkgs/tools/graphics/sng/default.nix index 71bf0160a1e1..45f5a6f2c235 100644 --- a/nixpkgs/pkgs/tools/graphics/sng/default.nix +++ b/nixpkgs/pkgs/tools/graphics/sng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; - homepage = http://sng.sourceforge.net/; + homepage = "http://sng.sourceforge.net/"; license = licenses.zlib; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix b/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix index 2c586cd3b1f6..73dd9c04be99 100644 --- a/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix +++ b/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "v1.5"; src = fetchurl { - url = mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip; + url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip"; sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Application for generating 3D structures by specifying a design grammar"; - homepage = http://structuresynth.sourceforge.net; + homepage = "http://structuresynth.sourceforge.net"; maintainers = with maintainers; [ hodapp ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/swfdec/default.nix b/nixpkgs/pkgs/tools/graphics/swfdec/default.nix index 8a64e25d879a..d721d06ad584 100644 --- a/nixpkgs/pkgs/tools/graphics/swfdec/default.nix +++ b/nixpkgs/pkgs/tools/graphics/swfdec/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://swfdec.freedesktop.org/wiki/; + homepage = "https://swfdec.freedesktop.org/wiki/"; }; } diff --git a/nixpkgs/pkgs/tools/graphics/transfig/default.nix b/nixpkgs/pkgs/tools/graphics/transfig/default.nix index db204113226e..960e7fd3ba38 100644 --- a/nixpkgs/pkgs/tools/graphics/transfig/default.nix +++ b/nixpkgs/pkgs/tools/graphics/transfig/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "transfig-3.2.4"; src = fetchurl { - url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; + url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz"; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; diff --git a/nixpkgs/pkgs/tools/graphics/unpaper/default.nix b/nixpkgs/pkgs/tools/graphics/unpaper/default.nix index 44a86e961ec8..f3e6f0d8b96f 100644 --- a/nixpkgs/pkgs/tools/graphics/unpaper/default.nix +++ b/nixpkgs/pkgs/tools/graphics/unpaper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libav libxslt ]; meta = with stdenv.lib; { - homepage = https://www.flameeyes.eu/projects/unpaper; + homepage = "https://www.flameeyes.eu/projects/unpaper"; description = "Post-processing tool for scanned sheets of paper"; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/graphics/viu/default.nix b/nixpkgs/pkgs/tools/graphics/viu/default.nix index dcb95ecc5530..ba35711a6ee2 100644 --- a/nixpkgs/pkgs/tools/graphics/viu/default.nix +++ b/nixpkgs/pkgs/tools/graphics/viu/default.nix @@ -2,16 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "0.2.1"; + version = "1.0"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "0p4ibvv0qrflqdc2bi9rjn7yhn01ncxrpqpxmh8cbq67rbvm7jnx"; + sha256 = "1ivhm6js0ylnxwp84jmm2vmnl4iy1cwr3m9imx7lmcl0i3c8b9if"; }; + # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 + doCheck = false; - cargoSha256 = "1wvqln3xr192ml9gfzfv6qdv59g654xyaw15d790sysm82gd0inz"; + cargoSha256 = "15zdnr95a363w4rddv1fbz796m01430gzly5p953m23g2mbxdmp0"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index f61835ac81f8..71bcdc2e2691 100644 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = https://www.lunarg.com; + homepage = "https://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 5537540382bf..66c8b1d5cc74 100644 --- a/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; - homepage = https://github.com/DeadSix27/waifu2x-converter-cpp; + homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.xzfc ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix b/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix index baa05be821bc..60e6b56b2e4b 100644 --- a/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix +++ b/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }: stdenv.mkDerivation { pname = "wdisplays-unstable"; - version = "2020-01-12"; + version = "2020-03-15"; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "cyclopsian"; repo = "wdisplays"; - rev = "ba331cab535318888a562f5a2731d2523b310dac"; - sha256 = "0fk3l78hirxdi74iqmq6mxi9daqnxdkbb5a2wfshmr11ic9xixpm"; + rev = "0faafdc04d7dd47d3a4e385f348cb9d267f2e60d"; + sha256 = "1y3bzh4mi6d67n6v0i8j5snpaikpbyr89acayr4m6bx85qnrq4g2"; }; meta = let inherit (stdenv) lib; in { diff --git a/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix b/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix index 2aa6abcccfc4..ee083c3e301b 100644 --- a/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://wkhtmltopdf.org/; + homepage = "https://wkhtmltopdf.org/"; description = "Tools for rendering web pages to PDF or images"; longDescription = '' wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools diff --git a/nixpkgs/pkgs/tools/graphics/xcftools/default.nix b/nixpkgs/pkgs/tools/graphics/xcftools/default.nix index 749631999e49..a8b0b406aa42 100644 --- a/nixpkgs/pkgs/tools/graphics/xcftools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/xcftools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://henning.makholm.net/software; + homepage = "http://henning.makholm.net/software"; description = "Command-line tools for converting Gimp XCF files"; longDescription = '' A set of fast command-line tools for extracting information from diff --git a/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix b/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix index 1e3da5dddecf..f917328460c2 100644 --- a/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix +++ b/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/eworm-de/xcur2png/releases; + homepage = "https://github.com/eworm-de/xcur2png/releases"; description = "Convert X cursors to PNG images"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix b/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix index 6dd0b2068784..be8b20fd052c 100644 --- a/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix +++ b/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "yafaray-core"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "YafaRay"; repo = "Core"; rev = "v${version}"; - sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6"; + sha256 = "0ipkrgn5siad6y8naw1pgxkxas70l09g97vabyfbx1k67xrr4ldp"; }; preConfigure = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open source raytracer"; - homepage = http://www.yafaray.org; + homepage = "http://www.yafaray.org"; maintainers = with maintainers; [ hodapp ]; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/graphics/zbar/default.nix b/nixpkgs/pkgs/tools/graphics/zbar/default.nix index 7610b4e56fb0..dc109440274f 100644 --- a/nixpkgs/pkgs/tools/graphics/zbar/default.nix +++ b/nixpkgs/pkgs/tools/graphics/zbar/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ delroth raskin ]; platforms = platforms.unix; license = licenses.lgpl21; - homepage = https://github.com/mchehab/zbar; + homepage = "https://github.com/mchehab/zbar"; }; } diff --git a/nixpkgs/pkgs/tools/graphics/zxing/default.nix b/nixpkgs/pkgs/tools/graphics/zxing/default.nix index 97bbeb4d2d43..d295a5899c50 100644 --- a/nixpkgs/pkgs/tools/graphics/zxing/default.nix +++ b/nixpkgs/pkgs/tools/graphics/zxing/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://github.com/zxing/zxing; + homepage = "https://github.com/zxing/zxing"; }; } diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index 230b2926561b..043b4438b3cc 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isFcitxEngine = true; description = "A standalone module for fcitx that uses web API to provide better pinyin result"; - homepage = https://github.com/fcitx/fcitx-cloudpinyin; + homepage = "https://github.com/fcitx/fcitx-cloudpinyin"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 9e0ef551d82c..02724a94be39 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isFcitxEngine = true; description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin"; - homepage = https://github.com/fcitx/fcitx-libpinyin; + homepage = "https://github.com/fcitx/fcitx-libpinyin"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 9f062036438f..f04acb72b472 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -96,7 +96,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isFcitxEngine = true; description = "Fcitx engine for Google japanese input method"; - homepage = https://github.com/google/mozc; + homepage = "https://github.com/google/mozc"; downloadPage = "http://download.fcitx-im.org/fcitx-mozc/"; license = licenses.free; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 095be7469cd8..1410dcc1f1cd 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isFcitxEngine = true; - homepage = https://github.com/fcitx/fcitx-rime; - downloadPage = https://download.fcitx-im.org/fcitx-rime/; + homepage = "https://github.com/fcitx/fcitx-rime"; + downloadPage = "https://download.fcitx-im.org/fcitx-rime/"; description = "Rime support for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 60de9e6910e3..99a92a95060a 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -19,7 +19,7 @@ let sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4"; }; table = fetchurl { - url = http://download.fcitx-im.org/data/table.tar.gz; + url = "http://download.fcitx-im.org/data/table.tar.gz"; sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; }; pystroke-data = let PY_STROKE_VER="20121124"; in fetchurl { @@ -31,7 +31,7 @@ let sha256 = "011cg7wssssm6hm564cwkrrnck2zj5rxi7p9z5akvhg6gp4nl522"; }; pinyin-data = fetchurl { - url = http://download.fcitx-im.org/data/pinyin.tar.gz; + url = "http://download.fcitx-im.org/data/pinyin.tar.gz"; sha256 = "1qfq5dy4czvd1lvdnxzyaiir9x8b1m46jjny11y0i33m9ar2jf2q"; }; in @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/fcitx/fcitx; + homepage = "https://github.com/fcitx/fcitx"; description = "A Flexible Input Method Framework"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock index c35e7658d635..1ca313c6cd54 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock +++ b/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES fusuma BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index cfdfa85ad9f6..34d918cb7da7 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the anthy input method"; - homepage = https://github.com/fujiwarat/ibus-anthy; + homepage = "https://github.com/fujiwarat/ibus-anthy"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index d5e2f50299e3..978ac675581f 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "Ibus Hangul engine"; - homepage = https://github.com/choehwanjin/ibus-hangul; + homepage = "https://github.com/choehwanjin/ibus-hangul"; license = licenses.gpl2; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index 589ddd09144f..0b16b54ad48b 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "libkkc (Japanese Kana Kanji input method) engine for ibus"; - homepage = https://github.com/ueno/ibus-kkc; + homepage = "https://github.com/ueno/ibus-kkc"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ vanzef ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 552d9f5e5325..48d082564b76 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "m17n engine for ibus"; - homepage = https://github.com/ibus/ibus-m17n; + homepage = "https://github.com/ibus/ibus-m17n"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index a33eb277926c..9b73345d5e8e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -15,7 +15,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isIbusEngine = true; description = "Japanese input method from Google"; - homepage = https://github.com/google/mozc; + homepage = "https://github.com/google/mozc"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index b77394f218b8..316593990d96 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { isIbusEngine = true; description = "Chinese tables for IBus-Table"; - homepage = https://github.com/definite/ibus-table-chinese; + homepage = "https://github.com/definite/ibus-table-chinese"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pneumaticat ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index dc11acb4756b..cc0d12745b12 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mike-fabian.github.io/ibus-typing-booster/; + homepage = "https://mike-fabian.github.io/ibus-typing-booster/"; license = licenses.gpl3Plus; description = "A typing booster engine for the IBus platform"; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 85fccc46de08..4e6b92f77c55 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; meta = with stdenv.lib; { - homepage = https://github.com/ibus/ibus-qt/; + homepage = "https://github.com/ibus/ibus-qt/"; description = "Qt4 interface to the ibus input method"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix b/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix index a2f01c7367c8..489a24c3a589 100644 --- a/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Manipulate the scancode/keycode translation tables of keyboard drivers."; - homepage = http://0pointer.de/lennart/projects/keyfuzz/; + homepage = "http://0pointer.de/lennart/projects/keyfuzz/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mboes ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix index 2764d2fee729..b816a6898ab3 100644 --- a/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/bulletmark/libinput-gestures; + homepage = "https://github.com/bulletmark/libinput-gestures"; description = "Gesture mapper for libinput"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix b/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix index 68889d45df04..1e24d5d969f9 100644 --- a/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Japanese Kana Kanji conversion input method library"; - homepage = https://github.com/ueno/libkkc; + homepage = "https://github.com/ueno/libkkc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vanzef ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix b/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix index 8732d1a816d1..1abd84608454 100644 --- a/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ; meta = { - homepage = https://www.nongnu.org/m17n/; + homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (database)"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix b/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix index baf57ed90498..f7bff5092051 100644 --- a/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ m17n_db ]; meta = { - homepage = https://www.nongnu.org/m17n/; + homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (runtime)"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/m17n-lib/otf.nix b/nixpkgs/pkgs/tools/inputmethods/m17n-lib/otf.nix index a69f46e9678c..7703de957167 100644 --- a/nixpkgs/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/nixpkgs/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.nongnu.org/m17n/; + homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (libotf)"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix b/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix index b93c59d9789b..ef316ec55a0a 100644 --- a/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/nabi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Easy Hangul XIM"; - homepage = https://github.com/choehwanjin/nabi; + homepage = "https://github.com/choehwanjin/nabi"; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index 2f8425bd8b54..d760e9d320a6 100644 --- a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { This package provides a collection of standard kana-to-kanji dictionaries for the SKK Japanese input method. ''; - homepage = https://github.com/skk-dev/dict; + homepage = "https://github.com/skk-dev/dict"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix index 19d871bc77fc..8a7423eea1f4 100644 --- a/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { (merge, sort etc.) the dictionaries formatted for SKK Japanese input method. ''; - homepage = https://github.com/skk-dev/skktools; + homepage = "https://github.com/skk-dev/skktools"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index afacc302eda1..4295e2b3fdd8 100644 --- a/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Japanese handwriting model for the Zinnia engine"; - homepage = http://tegaki.org/; + homepage = "http://tegaki.org/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix index c915e8128913..6bda390dc4aa 100644 --- a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/JoseExposito/touchegg; + homepage = "https://github.com/JoseExposito/touchegg"; description = "Macro binding for touch surfaces"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix b/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix index a9e106f2c720..22987fe639f6 100644 --- a/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { interprets the event data received and executes scripts configured in its configuration. ''; - homepage = https://github.com/wertarbyte/triggerhappy/; + homepage = "https://github.com/wertarbyte/triggerhappy/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau taha ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix b/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix index b23e0c369a62..b1516aa56ab0 100644 --- a/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Online hand recognition system with machine learning"; - homepage = http://taku910.github.io/zinnia/; + homepage = "http://taku910.github.io/zinnia/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/nixpkgs/pkgs/tools/misc/3llo/Gemfile.lock b/nixpkgs/pkgs/tools/misc/3llo/Gemfile.lock index 0696ba341651..45a37b5e1ca6 100644 --- a/nixpkgs/pkgs/tools/misc/3llo/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/3llo/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES 3llo (= 0.3.0) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/3llo/default.nix b/nixpkgs/pkgs/tools/misc/3llo/default.nix index 82a8d2aaad12..75dc8f772c1c 100644 --- a/nixpkgs/pkgs/tools/misc/3llo/default.nix +++ b/nixpkgs/pkgs/tools/misc/3llo/default.nix @@ -11,7 +11,7 @@ bundlerApp { dontBuild = false; patches = [ (fetchpatch { - url = https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch; + url = "https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch"; sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v"; }) ]; @@ -25,7 +25,7 @@ bundlerApp { meta = with lib; { description = "Trello interactive CLI on terminal"; license = licenses.mit; - homepage = https://github.com/qcam/3llo; + homepage = "https://github.com/qcam/3llo"; maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/3mux/default.nix b/nixpkgs/pkgs/tools/misc/3mux/default.nix new file mode 100644 index 000000000000..3371b7956237 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/3mux/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "3mux"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "aaronjanse"; + repo = pname; + rev = "v${version}"; + sha256 = "02ry066psvlqdyhimci7nskw4sfb70dw5z7ag7s7rz36gmx1vnmr"; + }; + + modSha256 = "1ag9lx8xcp2z9lrg404914zin45n8f4s08365yk71q5vyiwxjj3i"; + + meta = with stdenv.lib; { + description = "Terminal multiplexer inspired by i3"; + homepage = "https://github.com/aaronjanse/3mux"; + license = licenses.mit; + maintainers = with maintainers; [ aaronjanse filalex77 ]; + # TODO: fix modules build on darwin + broken = stdenv.isDarwin; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/abduco/default.nix b/nixpkgs/pkgs/tools/misc/abduco/default.nix index 8545d86427a4..a0868344d4cf 100644 --- a/nixpkgs/pkgs/tools/misc/abduco/default.nix +++ b/nixpkgs/pkgs/tools/misc/abduco/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; meta = { - homepage = http://brain-dump.org/projects/abduco; + homepage = "http://brain-dump.org/projects/abduco"; license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/misc/aescrypt/default.nix b/nixpkgs/pkgs/tools/misc/aescrypt/default.nix index 75d8d71b8952..42941c263e6d 100644 --- a/nixpkgs/pkgs/tools/misc/aescrypt/default.nix +++ b/nixpkgs/pkgs/tools/misc/aescrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; - homepage = https://www.aescrypt.com/; + homepage = "https://www.aescrypt.com/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/agedu/default.nix b/nixpkgs/pkgs/tools/misc/agedu/default.nix index d0254e9ce9f5..6463ed1df289 100644 --- a/nixpkgs/pkgs/tools/misc/agedu/default.nix +++ b/nixpkgs/pkgs/tools/misc/agedu/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "agedu-${date}.${rev}"; # upstream provides tarballs but it seems they disappear after the next version is released src = fetchgit { - url = https://git.tartarus.org/simon/agedu.git; + url = "https://git.tartarus.org/simon/agedu.git"; inherit rev; sha256 = "0i930izna3s73p2q52qa377ixd14zij5q1n7w3irl7csyy78g0cd"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { agedu uses this information to tell you which files waste disk space when you haven't used them since a long time. ''; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/agedu/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/agedu/"; license = licenses.mit; maintainers = with maintainers; [ symphorien ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix b/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix index 7b869d66d1c3..3102dd635ca2 100644 --- a/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -8,6 +8,7 @@ , gtk2 , gst_all_1 , gnome2 +, gnome-icon-theme , libnotify , libxml2 , libunique @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { gtk2 gst_all_1.gstreamer gnome2.GConf - gnome2.gnome_icon_theme + gnome-icon-theme libnotify libxml2 libunique @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://alarm-clock.pseudoberries.com/; + homepage = "http://alarm-clock.pseudoberries.com/"; description = "A fully-featured alarm clock for your GNOME panel or equivalent"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/apparix/default.nix b/nixpkgs/pkgs/tools/misc/apparix/default.nix index 550ab4972d97..155fa8190d9f 100644 --- a/nixpkgs/pkgs/tools/misc/apparix/default.nix +++ b/nixpkgs/pkgs/tools/misc/apparix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://micans.org/apparix; + homepage = "http://micans.org/apparix"; description = "Add directory bookmarks, distant listing, and distant editing to the command line"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/misc/aptly/default.nix b/nixpkgs/pkgs/tools/misc/aptly/default.nix index 55cfa09aa24f..c163fdad3a1e 100644 --- a/nixpkgs/pkgs/tools/misc/aptly/default.nix +++ b/nixpkgs/pkgs/tools/misc/aptly/default.nix @@ -39,7 +39,7 @@ buildGoPackage { ''; meta = with stdenv.lib; { - homepage = https://www.aptly.info; + homepage = "https://www.aptly.info"; description = "Debian repository management tool"; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/argtable/default.nix b/nixpkgs/pkgs/tools/misc/argtable/default.nix index c16e4aded0d0..867b2eaba5d0 100644 --- a/nixpkgs/pkgs/tools/misc/argtable/default.nix +++ b/nixpkgs/pkgs/tools/misc/argtable/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "3.0.1"; src = fetchgit { - url = https://github.com/argtable/argtable3.git; + url = "https://github.com/argtable/argtable3.git"; rev = "de93cfd85f755250285b337cba053a709a270721"; sha256 = "0fbvk78s3dwryrzgafdra0lb8w7lb873c6xgldl94ps9828x85i3"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.argtable.org/; + homepage = "https://www.argtable.org/"; description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library"; license = licenses.bsd3; maintainers = with maintainers; [ artuuge ]; diff --git a/nixpkgs/pkgs/tools/misc/asciinema/default.nix b/nixpkgs/pkgs/tools/misc/asciinema/default.nix index d42c666e9674..67c324d4aeed 100644 --- a/nixpkgs/pkgs/tools/misc/asciinema/default.nix +++ b/nixpkgs/pkgs/tools/misc/asciinema/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Terminal session recorder and the best companion of asciinema.org"; - homepage = https://asciinema.org/; + homepage = "https://asciinema.org/"; license = with lib.licenses; [ gpl3 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/autojump/default.nix b/nixpkgs/pkgs/tools/misc/autojump/default.nix index 8294e92d13f3..85e500388341 100644 --- a/nixpkgs/pkgs/tools/misc/autojump/default.nix +++ b/nixpkgs/pkgs/tools/misc/autojump/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { Autojump supports tab-completion. ''; - homepage = https://github.com/wting/autojump; + homepage = "https://github.com/wting/autojump"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ domenkozar yurrriq ]; diff --git a/nixpkgs/pkgs/tools/misc/automirror/default.nix b/nixpkgs/pkgs/tools/misc/automirror/default.nix index 84778fb1c2d0..dde9c2d02d3a 100644 --- a/nixpkgs/pkgs/tools/misc/automirror/default.nix +++ b/nixpkgs/pkgs/tools/misc/automirror/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/schlomo/automirror; + homepage = "https://github.com/schlomo/automirror"; description = "Automatic Display Mirror"; license = licenses.gpl3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/nixpkgs/pkgs/tools/misc/autorandr/default.nix index adf73037af89..c6f664a10086 100644 --- a/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -53,7 +53,7 @@ in }; meta = with stdenv.lib; { - homepage = https://github.com/phillipberndt/autorandr/; + homepage = "https://github.com/phillipberndt/autorandr/"; description = "Automatically select a display configuration based on connected devices"; license = licenses.gpl3Plus; maintainers = with maintainers; [ coroa globin ]; diff --git a/nixpkgs/pkgs/tools/misc/autorevision/default.nix b/nixpkgs/pkgs/tools/misc/autorevision/default.nix index ee07221b7559..abaca62c400c 100644 --- a/nixpkgs/pkgs/tools/misc/autorevision/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorevision/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extracts revision metadata from your VCS repository"; - homepage = https://autorevision.github.io/; + homepage = "https://autorevision.github.io/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix b/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix index c7829239c41f..c5f4b0f5670a 100644 --- a/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = https://requester.mturk.com/developer; + homepage = "https://requester.mturk.com/developer"; description = "Command line tools for interacting with the Amazon Mechanical Turk"; license = stdenv.lib.licenses.amazonsl; diff --git a/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix index 6f2afc888e84..bfb622ee7419 100644 --- a/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/Microsoft/azure-vhd-utils; + homepage = "https://github.com/Microsoft/azure-vhd-utils"; description = "Read, inspect and upload VHD files for Azure"; longDescription = "Go package to read Virtual Hard Disk (VHD) file, a CLI interface to upload local VHD to Azure storage and to inspect a local VHD"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/bandwidth/default.nix b/nixpkgs/pkgs/tools/misc/bandwidth/default.nix index b4cbc747b1dc..5de77aea0e04 100644 --- a/nixpkgs/pkgs/tools/misc/bandwidth/default.nix +++ b/nixpkgs/pkgs/tools/misc/bandwidth/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://zsmith.co/bandwidth.html; + homepage = "https://zsmith.co/bandwidth.html"; description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix b/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix index 14ab790d9c76..3e8ae31835a6 100644 --- a/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix +++ b/nixpkgs/pkgs/tools/misc/bashplotlib/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/glamp/bashplotlib; + homepage = "https://github.com/glamp/bashplotlib"; description = "Plotting in the terminal"; maintainers = with maintainers; [ dtzWill ]; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/bc/default.nix b/nixpkgs/pkgs/tools/misc/bc/default.nix index 111ab254accb..d065732a2991 100644 --- a/nixpkgs/pkgs/tools/misc/bc/default.nix +++ b/nixpkgs/pkgs/tools/misc/bc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU software calculator"; - homepage = https://www.gnu.org/software/bc/; + homepage = "https://www.gnu.org/software/bc/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/tools/misc/bcunit/default.nix b/nixpkgs/pkgs/tools/misc/bcunit/default.nix index 4a440e133feb..203735d79b0b 100644 --- a/nixpkgs/pkgs/tools/misc/bcunit/default.nix +++ b/nixpkgs/pkgs/tools/misc/bcunit/default.nix @@ -1,22 +1,30 @@ -{stdenv, fetchFromGitHub, cmake}: +{ cmake +, fetchFromGitLab +, stdenv +}: + stdenv.mkDerivation rec { - name = "${baseName}-${version}"; - baseName = "bcunit"; - version = "3.0.2"; - buildInputs = [cmake]; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; - repo = baseName; - rev = version; - sha256 = "063yl7kxkix76r49qrj0h1qpz2p538d1yw8aih0x4i47g35k00y7"; + pname = "bcunit"; + # Latest release 3.0.2 is missing some functions needed by bctoolbox. See: + # https://gitlab.linphone.org/BC/public/bcunit/issues/1 + version = "unstable-2019-11-19"; + + buildInputs = [ cmake ]; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = "3c720fbf67dd3c02b0c7011ed4036982b2c93532"; + sha256 = "1237hpmkls2igp60gdfkbknxpgwvxn1vmv2m41vyl25xw1d3g35w"; }; - meta = { + meta = with stdenv.lib; { inherit version; - description = ''A fork of CUnit test framework''; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A fork of CUnit test framework"; + homepage = "https://gitlab.linphone.org/BC/public/bcunit"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ raskin jluttine ]; + platforms = platforms.linux; }; } - diff --git a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index 07bc5de371f3..a29098268f98 100644 --- a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.194"; + version = "1.195"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "10c0rbhqscizfa063m6mms31i0knh25bxr35s008b6mp5pxr33mc"; + sha256 = "04dsxp6vcy9z9gh41bq970wvdnhkmbdlizsy0dyhsl5axm5i84xz"; }; nativeBuildInputs = [ dpkg ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "BDF to PSF converter"; - homepage = https://packages.debian.org/sid/bdf2psf; + homepage = "https://packages.debian.org/sid/bdf2psf"; longDescription = '' Font converter to generate console fonts from BDF source fonts ''; diff --git a/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix b/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix index deb88f70eb50..15154f73a699 100644 --- a/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix +++ b/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "130kaw2485qhb2171w2i9kpl1lhbkfwdz3j19cy63xk63fhyd8kb"; + sha256 = "02dzvrgwpgbd0wgfnlpiv2qlwvspwl7a0qh8cg363lpnxv8akw9q"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/bepasty/default.nix b/nixpkgs/pkgs/tools/misc/bepasty/default.nix index cc63dab9645a..460f20a5f5f9 100644 --- a/nixpkgs/pkgs/tools/misc/bepasty/default.nix +++ b/nixpkgs/pkgs/tools/misc/bepasty/default.nix @@ -52,7 +52,7 @@ in with python.pkgs; buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/bepasty/bepasty-server; + homepage = "https://github.com/bepasty/bepasty-server"; description = "Binary pastebin server"; license = lib.licenses.mit; maintainers = [ lib.maintainers.makefu ]; diff --git a/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix index c0339834b649..ddda4ef4445a 100644 --- a/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.99"; src = fetchurl { - url = https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz; + url = "https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz"; sha256 = "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of tools for translating from BibTeX to HTML"; - homepage = https://www.lri.fr/~filliatr/bibtex2html/; + homepage = "https://www.lri.fr/~filliatr/bibtex2html/"; license = licenses.gpl2; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.scolobb ]; diff --git a/nixpkgs/pkgs/tools/misc/bibtool/default.nix b/nixpkgs/pkgs/tools/misc/bibtool/default.nix index df7564a4b848..2f90745785a2 100644 --- a/nixpkgs/pkgs/tools/misc/bibtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibtool/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for manipulating BibTeX bibliographies"; - homepage = http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html; + homepage = "http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.rycee ]; diff --git a/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/nixpkgs/pkgs/tools/misc/birdfont/default.nix index 8cc21158e8a9..a0e133ec5047 100644 --- a/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format"; - homepage = https://birdfont.org; + homepage = "https://birdfont.org"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix b/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix index 3d51f282daef..e5ad56376cac 100644 --- a/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML parser for Vala and C programs"; - homepage = https://birdfont.org/xmlbird.php; + homepage = "https://birdfont.org/xmlbird.php"; license = licenses.lgpl3; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix b/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix index 8d587e34af46..5bf38f1b0e7a 100644 --- a/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for the blink(1) notification light"; - homepage = https://blink1.thingm.com/; + homepage = "https://blink1.thingm.com/"; license = stdenv.lib.licenses.cc-by-sa-30; maintainers = [ stdenv.lib.maintainers.cransom ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/blsd/default.nix b/nixpkgs/pkgs/tools/misc/blsd/default.nix index 1b860fc1b4d5..6e6a9b7c5abd 100644 --- a/nixpkgs/pkgs/tools/misc/blsd/default.nix +++ b/nixpkgs/pkgs/tools/misc/blsd/default.nix @@ -19,7 +19,7 @@ buildGoPackage { buildInputs = [ libgit2 ]; meta = with stdenv.lib; { - homepage = https://github.com/junegunn/blsd; + homepage = "https://github.com/junegunn/blsd"; description = "List directories in breadth-first order"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; diff --git a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix index 6b7a51e08f51..8273d60bd596 100644 --- a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix @@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "bmap-related tools"; - homepage = https://github.com/intel/bmap-tools; + homepage = "https://github.com/intel/bmap-tools"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/bmon/default.nix b/nixpkgs/pkgs/tools/misc/bmon/default.nix index e4664e34b964..d99cce78bbfd 100644 --- a/nixpkgs/pkgs/tools/misc/bmon/default.nix +++ b/nixpkgs/pkgs/tools/misc/bmon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network bandwidth monitor"; - homepage = https://github.com/tgraf/bmon; + homepage = "https://github.com/tgraf/bmon"; # Licensed unter BSD and MIT # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT diff --git a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix index f86d44c580de..1924968f2d35 100644 --- a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix +++ b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; # needs "y" tool meta = { - homepage = http://bogofilter.sourceforge.net/; + homepage = "http://bogofilter.sourceforge.net/"; longDescription = '' Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) by a statistical analysis of the message's header and diff --git a/nixpkgs/pkgs/tools/misc/bonfire/default.nix b/nixpkgs/pkgs/tools/misc/bonfire/default.nix index 12b0ad2abf1f..85d54c167360 100644 --- a/nixpkgs/pkgs/tools/misc/bonfire/default.nix +++ b/nixpkgs/pkgs/tools/misc/bonfire/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/bonfire; + homepage = "https://pypi.python.org/pypi/bonfire"; description = "CLI Graylog Client with Follow Mode"; license = licenses.bsd3; maintainers = [ maintainers.womfoo ]; diff --git a/nixpkgs/pkgs/tools/misc/brltty/default.nix b/nixpkgs/pkgs/tools/misc/brltty/default.nix index fa7457b417e5..1320f28ede24 100644 --- a/nixpkgs/pkgs/tools/misc/brltty/default.nix +++ b/nixpkgs/pkgs/tools/misc/brltty/default.nix @@ -6,11 +6,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-6.0"; + name = "brltty-6.1"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0lmp9ab8gp4yv8m3qx4gxns3prrh7kvh8sfcd6vc45h40cgcsjxg"; + sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It drives the braille display, and provides complete screen review functionality. Some speech capability has also been incorporated. ''; - homepage = http://www.brltty.com/; + homepage = "http://www.brltty.com/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bramd ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/broot/default.nix b/nixpkgs/pkgs/tools/misc/broot/default.nix index b7e2fb00a140..5d31570aacd5 100644 --- a/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.4"; + version = "0.13.5b"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0xd7vsybv6w5llvb85g6bx6r33lr0ki077rwzdvwb9c8w64fvs2h"; + sha256 = "0gcv9w79r9q3rzrdqiq9xgh68ya653sq84vzgf0fb154zmzjkxfv"; }; - cargoSha256 = "16qad0m2vygwrbz40ww0mb0ba5wn2wna1n78bc8nxh60x0qiigi9"; + cargoSha256 = "0534jykfnqs1gfnmijkpcf91ddpbggw7p25h4arci14lgd2wrmgd"; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/brotab/default.nix b/nixpkgs/pkgs/tools/misc/brotab/default.nix index 2b6274c631da..7e827f007eb9 100644 --- a/nixpkgs/pkgs/tools/misc/brotab/default.nix +++ b/nixpkgs/pkgs/tools/misc/brotab/default.nix @@ -1,29 +1,32 @@ { lib, fetchFromGitHub, glibcLocales, python }: python.pkgs.buildPythonApplication rec { - version = "1.1.0"; + version = "1.2.1"; pname = "brotab"; src = fetchFromGitHub { owner = "balta2ar"; repo = pname; rev = version; - sha256 = "17yj5i8p28a7zmixdfa1i4gfc7c2fmdkxlymazasar58dz8m68mw"; + sha256 = "14yz0szwzdjvwkw24rma34y6iiwnw9qzsm89gkglc0xxa6msg6j3"; }; propagatedBuildInputs = with python.pkgs; [ requests flask - requests - pytest psutil + setuptools + ]; + + checkBuildInputs = with python.pkgs; [ + pytest ]; # test_integration.py requires Chrome browser session checkPhase = '' ${python.interpreter} -m unittest brotab/tests/test_{brotab,utils}.py ''; - + meta = with lib; { homepage = "https://github.com/balta2ar/brotab"; description = "Control your browser's tabs from the command line"; diff --git a/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix b/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix index b86bc38cb267..150371f82b6e 100644 --- a/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix +++ b/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple commandline torrent creator"; - homepage = http://mathr.co.uk/blog/torrent.html; + homepage = "http://mathr.co.uk/blog/torrent.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/tools/misc/chafa/default.nix b/nixpkgs/pkgs/tools/misc/chafa/default.nix index e3cc8c938ead..e63ad0e42af5 100644 --- a/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.2.2"; + version = "1.4.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "10in960wzvmb25biifi480dz87c034vwb8mcshclssl7gmzgpzdn"; + sha256 = "0vf658dd9sb2d3yh65c8nals9z0z7rykqqigmxq2h92x2ysjbg6x"; }; nativeBuildInputs = [ autoconf diff --git a/nixpkgs/pkgs/tools/misc/chelf/default.nix b/nixpkgs/pkgs/tools/misc/chelf/default.nix index f9740f223754..96949dd5da57 100644 --- a/nixpkgs/pkgs/tools/misc/chelf/default.nix +++ b/nixpkgs/pkgs/tools/misc/chelf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "change or display the stack size of an ELF binary"; - homepage = https://github.com/Gottox/chelf; + homepage = "https://github.com/Gottox/chelf"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 979a658ac022..beb7c41f906b 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -1,22 +1,20 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "chezmoi"; - version = "1.7.16"; + version = "1.7.18"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1fkjdpqal0yzm58l146pf5xpbhij9iq79933i9a77v2jihdbjn52"; + sha256 = "12gx78cbs7abizlqhs7y2w6lwlk5d1hhvixj0ki8d1d5vdr747bc"; }; - modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "15b3hik3nzb7xnd6806dqdb36v7z2a0wmvxbrfwvnbigd8zd2y0j"; buildFlagsArray = [ - "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" + "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix index 4d33d957b4d1..084d51d2a3ab 100644 --- a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix +++ b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "CLI client for cheat.sh, a community driven cheat sheet"; license = licenses.mit; maintainers = with maintainers; [ fgaz evanjs ]; - homepage = https://github.com/chubin/cheat.sh; + homepage = "https://github.com/chubin/cheat.sh"; }; } diff --git a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix index 12c7f91f5abe..8189a07c214b 100644 --- a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix +++ b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Driver and configuration tool for Corsair keyboards and mice"; - homepage = https://github.com/ckb-next/ckb-next; + homepage = "https://github.com/ckb-next/ckb-next"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ kierdavis ]; diff --git a/nixpkgs/pkgs/tools/misc/clac/default.nix b/nixpkgs/pkgs/tools/misc/clac/default.nix index 544379d8d217..8aea37ebddff 100644 --- a/nixpkgs/pkgs/tools/misc/clac/default.nix +++ b/nixpkgs/pkgs/tools/misc/clac/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = https://github.com/soveran/clac; + homepage = "https://github.com/soveran/clac"; }; } diff --git a/nixpkgs/pkgs/tools/misc/clasp/default.nix b/nixpkgs/pkgs/tools/misc/clasp/default.nix index 31c35af81186..2748c0126cde 100644 --- a/nixpkgs/pkgs/tools/misc/clasp/default.nix +++ b/nixpkgs/pkgs/tools/misc/clasp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Answer set solver for (extended) normal and disjunctive logic programs"; - homepage = http://potassco.sourceforge.net/; + homepage = "http://potassco.sourceforge.net/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/misc/clex/default.nix b/nixpkgs/pkgs/tools/misc/clex/default.nix index d5fd4e97df10..5e5bf4166ff9 100644 --- a/nixpkgs/pkgs/tools/misc/clex/default.nix +++ b/nixpkgs/pkgs/tools/misc/clex/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { to be executed by the shell. There are no built-in commands, CLEX is an add-on to your favorite shell. ''; - homepage = http://www.clex.sk; + homepage = "http://www.clex.sk"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/clipman/default.nix b/nixpkgs/pkgs/tools/misc/clipman/default.nix index 3153c843025a..15eeb8b7b86d 100644 --- a/nixpkgs/pkgs/tools/misc/clipman/default.nix +++ b/nixpkgs/pkgs/tools/misc/clipman/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { ''; meta = with lib; { - homepage = https://github.com/yory8/clipman; + homepage = "https://github.com/yory8/clipman"; license = licenses.gpl3; maintainers = with maintainers; [ ma27 ]; description = "A simple clipboard manager for Wayland"; diff --git a/nixpkgs/pkgs/tools/misc/clipster/default.nix b/nixpkgs/pkgs/tools/misc/clipster/default.nix index 699285f26647..bb14830bf063 100644 --- a/nixpkgs/pkgs/tools/misc/clipster/default.nix +++ b/nixpkgs/pkgs/tools/misc/clipster/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { - Ability to delete items in clipboard history. ''; license = licenses.agpl3; - homepage = https://github.com/mrichar1/clipster; + homepage = "https://github.com/mrichar1/clipster"; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; }; diff --git a/nixpkgs/pkgs/tools/misc/cloc/default.nix b/nixpkgs/pkgs/tools/misc/cloc/default.nix index 6d567f6119ad..0e598d78a537 100644 --- a/nixpkgs/pkgs/tools/misc/cloc/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A program that counts lines of source code"; - homepage = https://github.com/AlDanial/cloc; + homepage = "https://github.com/AlDanial/cloc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ rycee ]; diff --git a/nixpkgs/pkgs/tools/misc/colord-kde/default.nix b/nixpkgs/pkgs/tools/misc/colord-kde/default.nix index 41c80146e68f..8897514783aa 100644 --- a/nixpkgs/pkgs/tools/misc/colord-kde/default.nix +++ b/nixpkgs/pkgs/tools/misc/colord-kde/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = https://projects.kde.org/projects/playground/graphics/colord-kde; + homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ttuegel ]; }; diff --git a/nixpkgs/pkgs/tools/misc/colord/default.nix b/nixpkgs/pkgs/tools/misc/colord/default.nix index c6dbcfdda02f..79d27129173a 100644 --- a/nixpkgs/pkgs/tools/misc/colord/default.nix +++ b/nixpkgs/pkgs/tools/misc/colord/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; - homepage = https://www.freedesktop.org/software/colord/; + homepage = "https://www.freedesktop.org/software/colord/"; license = licenses.lgpl2Plus; maintainers = [ maintainers.marcweber ] ++ teams.freedesktop.members; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/contacts/default.nix b/nixpkgs/pkgs/tools/misc/contacts/default.nix index f3d7fbd81273..b58e0c6e31e1 100644 --- a/nixpkgs/pkgs/tools/misc/contacts/default.nix +++ b/nixpkgs/pkgs/tools/misc/contacts/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Access contacts from the Mac address book from command-line"; - homepage = http://www.gnufoo.org/contacts/contacts.html; + homepage = "http://www.gnufoo.org/contacts/contacts.html"; license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.darwin; diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 1294c6758f48..49edc002bec7 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (rec { ''; meta = { - homepage = https://www.gnu.org/software/coreutils/; + homepage = "https://www.gnu.org/software/coreutils/"; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/misc/cowsay/default.nix b/nixpkgs/pkgs/tools/misc/cowsay/default.nix index fb44b051b7ee..d2a27fa9cb0b 100644 --- a/nixpkgs/pkgs/tools/misc/cowsay/default.nix +++ b/nixpkgs/pkgs/tools/misc/cowsay/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "A program which generates ASCII pictures of a cow with a message"; - homepage = https://en.wikipedia.org/wiki/Cowsay; + homepage = "https://en.wikipedia.org/wiki/Cowsay"; license = licenses.gpl1; platforms = platforms.all; maintainers = [ maintainers.rob ]; diff --git a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix index 1978476a12d6..13c29d6ab936 100644 --- a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://limitcpu.sourceforge.net/; + homepage = "http://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix b/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix index 5792fa4121b4..65482fabb117 100644 --- a/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchgit { inherit rev; - url = https://github.com/wolf9466/cpuminer-multi.git; + url = "https://github.com/wolf9466/cpuminer-multi.git"; sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Multi-algo CPUMiner"; - homepage = https://github.com/wolf9466/cpuminer-multi; + homepage = "https://github.com/wolf9466/cpuminer-multi"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 diff --git a/nixpkgs/pkgs/tools/misc/cpuminer/default.nix b/nixpkgs/pkgs/tools/misc/cpuminer/default.nix index db0ab75d9166..99eb6a52ca0b 100644 --- a/nixpkgs/pkgs/tools/misc/cpuminer/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpuminer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "CFLAGS=-O3" ]; meta = with stdenv.lib; { - homepage = https://github.com/pooler/cpuminer; + homepage = "https://github.com/pooler/cpuminer"; description = "CPU miner for Litecoin and Bitcoin"; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/crex/default.nix b/nixpkgs/pkgs/tools/misc/crex/default.nix index a00f8d6654f5..72e8521fec1a 100644 --- a/nixpkgs/pkgs/tools/misc/crex/default.nix +++ b/nixpkgs/pkgs/tools/misc/crex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Explore, test, and check regular expressions in the terminal"; - homepage = https://octobanana.com/software/crex; + homepage = "https://octobanana.com/software/crex"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/csv2latex/default.nix b/nixpkgs/pkgs/tools/misc/csv2latex/default.nix new file mode 100644 index 000000000000..da2225829677 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/csv2latex/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "csv2latex"; + version = "0.22"; + + src = fetchurl { + url = "http://brouits.free.fr/csv2latex/csv2latex-${version}.tar.gz"; + sha256 = "09qih2zx6cvlii1n5phiinvm9xw1l8f4i60b5hg56pymzjhn97vy"; + }; + + installPhase = '' + mkdir -p $out/bin + make PREFIX=$out install + ''; + + meta = with stdenv.lib; { + description = "Command-line CSV to LaTeX file converter"; + homepage = "http://brouits.free.fr/csv2latex/"; + license = licenses.gpl2; + maintainers = [ maintainers.catern ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/cunit/default.nix b/nixpkgs/pkgs/tools/misc/cunit/default.nix index f1930c925ff4..305084b900d1 100644 --- a/nixpkgs/pkgs/tools/misc/cunit/default.nix +++ b/nixpkgs/pkgs/tools/misc/cunit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { with a flexible variety of user interfaces. ''; - homepage = http://cunit.sourceforge.net/; + homepage = "http://cunit.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/dashing/default.nix b/nixpkgs/pkgs/tools/misc/dashing/default.nix index f45889e78d85..8d7f16b5beca 100644 --- a/nixpkgs/pkgs/tools/misc/dashing/default.nix +++ b/nixpkgs/pkgs/tools/misc/dashing/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A Dash Generator Script for Any HTML"; - homepage = https://github.com/technosophos/dashing; + homepage = "https://github.com/technosophos/dashing"; license = licenses.mit; maintainers = [ ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/dateutils/default.nix b/nixpkgs/pkgs/tools/misc/dateutils/default.nix index a441124189cb..f56cee49ecf5 100644 --- a/nixpkgs/pkgs/tools/misc/dateutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/dateutils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; - homepage = http://www.fresse.org/dateutils/; + homepage = "http://www.fresse.org/dateutils/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.paperdigits ]; diff --git a/nixpkgs/pkgs/tools/misc/dbacl/default.nix b/nixpkgs/pkgs/tools/misc/dbacl/default.nix index 9107debfd12c..a6bc0111ad4f 100644 --- a/nixpkgs/pkgs/tools/misc/dbacl/default.nix +++ b/nixpkgs/pkgs/tools/misc/dbacl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://dbacl.sourceforge.net/; + homepage = "http://dbacl.sourceforge.net/"; longDescription = "a digramic Bayesian classifier for text recognition."; maintainers = []; license = stdenv.lib.licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/misc/dbus-map/default.nix b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix index 72687f4bfa48..c311de3a7790 100644 --- a/nixpkgs/pkgs/tools/misc/dbus-map/default.nix +++ b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with lib; { description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus"; - homepage = https://github.com/taviso/dbusmap; + homepage = "https://github.com/taviso/dbusmap"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/nixpkgs/pkgs/tools/misc/ddate/default.nix b/nixpkgs/pkgs/tools/misc/ddate/default.nix index c602a4c9235e..0987fb6d286f 100644 --- a/nixpkgs/pkgs/tools/misc/ddate/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddate/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ cmake ]; meta = { - homepage = https://github.com/bo0ts/ddate; + homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [kovirobi]; diff --git a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix index 0d5efb2ca22b..cfc48af5be54 100644 --- a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; - homepage = https://github.com/ddccontrol/ddccontrol; + homepage = "https://github.com/ddccontrol/ddccontrol"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index e3ba0abb8bc3..c2eed30a70d1 100644 --- a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }: +, glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }: stdenv.mkDerivation rec { pname = "ddcutil"; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ i2c-tools udev libgudev - glib libusb libdrm xorg.libXrandr + glib libusb1 libdrm xorg.libXrandr ]; meta = with stdenv.lib; { - homepage = http://www.ddcutil.com/; + homepage = "http://www.ddcutil.com/"; description = "Query and change Linux monitor settings using DDC/CI and USB"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/debianutils/default.nix b/nixpkgs/pkgs/tools/misc/debianutils/default.nix index 74aec9bae6a0..f9643fbde79c 100644 --- a/nixpkgs/pkgs/tools/misc/debianutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/debianutils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which ''; - downloadPage = https://packages.debian.org/sid/debianutils; + downloadPage = "https://packages.debian.org/sid/debianutils"; license = with licenses; [ gpl2Plus publicDomain smail ]; maintainers = []; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/debootstrap/default.nix b/nixpkgs/pkgs/tools/misc/debootstrap/default.nix index 04b55a6a6b47..2940ff0a5738 100644 --- a/nixpkgs/pkgs/tools/misc/debootstrap/default.nix +++ b/nixpkgs/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.119"; + version = "1.0.123"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; - sha256 = "1q5kw5mm5cnm97j0iz8hfbmjrpdc3n3pcw7f9as1n6h0xp0bmgp6"; + sha256 = "0a53dhfwa74vdhqd6kbl7zlm7iic37c6wkdclppf0syxxi3q2njy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix b/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix index 6b47027a5b9e..045e199e3ae7 100644 --- a/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; + homepage = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/misc/detox/default.nix b/nixpkgs/pkgs/tools/misc/detox/default.nix index 9ad891fd9bd8..85bed63c7f9d 100644 --- a/nixpkgs/pkgs/tools/misc/detox/default.nix +++ b/nixpkgs/pkgs/tools/misc/detox/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "detox-1.2.0"; src = fetchurl { - url = mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz; + url = "mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz"; sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://detox.sourceforge.net/; + homepage = "http://detox.sourceforge.net/"; description = "Utility designed to clean up filenames"; longDescription = '' Detox is a utility designed to clean up filenames. It replaces diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 9273d82455de..0ce0e1be3256 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "137"; + version = "138"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1qa508nlqvz0s0cd6jk5c8m43kqfx1h2mgx50iphy4y0spnyv946"; + sha256 = "171nz5n4dayr7bj04h0x282vdk92kp7lgarnb3x0md91m2i9x997"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/ding-libs/default.nix b/nixpkgs/pkgs/tools/misc/ding-libs/default.nix index e99e9289b676..deb70d082d98 100644 --- a/nixpkgs/pkgs/tools/misc/ding-libs/default.nix +++ b/nixpkgs/pkgs/tools/misc/ding-libs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "'D is not GLib' utility libraries"; - homepage = https://fedorahosted.org/sssd/; + homepage = "https://fedorahosted.org/sssd/"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; diff --git a/nixpkgs/pkgs/tools/misc/direnv/default.nix b/nixpkgs/pkgs/tools/misc/direnv/default.nix index c358e24095a5..3c7e72f6d734 100644 --- a/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -41,7 +41,7 @@ buildGoPackage rec { In short, this little tool allows you to have project-specific environment variables. ''; - homepage = https://direnv.net; + homepage = "https://direnv.net"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/nixpkgs/pkgs/tools/misc/diskscan/default.nix b/nixpkgs/pkgs/tools/misc/diskscan/default.nix index 10406b8bf03b..204b7b4cf8dd 100644 --- a/nixpkgs/pkgs/tools/misc/diskscan/default.nix +++ b/nixpkgs/pkgs/tools/misc/diskscan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/baruch/diskscan; + homepage = "https://github.com/baruch/diskscan"; description = "Scan HDD/SSD for failed and near failed sectors"; platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/tools/misc/diskus/default.nix b/nixpkgs/pkgs/tools/misc/diskus/default.nix index e02811e03ebb..b3fbc6377ab5 100644 --- a/nixpkgs/pkgs/tools/misc/diskus/default.nix +++ b/nixpkgs/pkgs/tools/misc/diskus/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A minimal, fast alternative to 'du -sh'"; - homepage = https://github.com/sharkdp/diskus; + homepage = "https://github.com/sharkdp/diskus"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.fuerbringer ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/disper/default.nix b/nixpkgs/pkgs/tools/misc/disper/default.nix index 167b4a547f82..6ba446d7bc04 100644 --- a/nixpkgs/pkgs/tools/misc/disper/default.nix +++ b/nixpkgs/pkgs/tools/misc/disper/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "On-the-fly display switch utility"; - homepage = http://willem.engen.nl/projects/disper/; + homepage = "http://willem.engen.nl/projects/disper/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; }; diff --git a/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix b/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix index efe65683e07b..2237d009d43c 100644 --- a/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix +++ b/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = "http://mdocml.bsd.lv/"; description = "converter from DocBook V4.x and v5.x XML into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/docker-ls/default.nix b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix index c1baf8e82f5f..8522256c7d52 100644 --- a/nixpkgs/pkgs/tools/misc/docker-ls/default.nix +++ b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { with tags. ''; - homepage = https://github.com/mayflower/docker-ls; + homepage = "https://github.com/mayflower/docker-ls"; maintainers = with maintainers; [ ma27 ]; platforms = docker.meta.platforms; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/docker-sync/Gemfile.lock b/nixpkgs/pkgs/tools/misc/docker-sync/Gemfile.lock index ff7aa6b3f9fc..4f14b77d0ef0 100644 --- a/nixpkgs/pkgs/tools/misc/docker-sync/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/docker-sync/Gemfile.lock @@ -26,4 +26,4 @@ DEPENDENCIES docker-sync! BUNDLED WITH - 1.16.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/docker-sync/default.nix b/nixpkgs/pkgs/tools/misc/docker-sync/default.nix index e75b83475681..48fbaa1e9de0 100644 --- a/nixpkgs/pkgs/tools/misc/docker-sync/default.nix +++ b/nixpkgs/pkgs/tools/misc/docker-sync/default.nix @@ -12,7 +12,7 @@ bundlerApp { meta = with lib; { description = "Run your application at full speed while syncing your code for development"; - homepage = http://docker-sync.io; + homepage = "http://docker-sync.io"; license = licenses.gpl3; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/docui/default.nix b/nixpkgs/pkgs/tools/misc/docui/default.nix index c8f3dbf8009c..0329c1bc4a69 100644 --- a/nixpkgs/pkgs/tools/misc/docui/default.nix +++ b/nixpkgs/pkgs/tools/misc/docui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "docui"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "TUI Client for Docker"; homepage = "https://github.com/skanehira/docui"; diff --git a/nixpkgs/pkgs/tools/misc/doitlive/default.nix b/nixpkgs/pkgs/tools/misc/doitlive/default.nix index 6edcefb11d5e..3c0406a4ea0e 100644 --- a/nixpkgs/pkgs/tools/misc/doitlive/default.nix +++ b/nixpkgs/pkgs/tools/misc/doitlive/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Tool for live presentations in the terminal"; - homepage = https://pypi.python.org/pypi/doitlive; + homepage = "https://pypi.python.org/pypi/doitlive"; license = licenses.mit; maintainers = with maintainers; [ mbode ]; }; diff --git a/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix b/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix index 88359adc3185..69b689fb8244 100644 --- a/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - homepage = https://github.com/janten/dpt-rp1-py; + homepage = "https://github.com/janten/dpt-rp1-py"; description = "Python script to manage Sony DPT-RP1 without Digital Paper App"; license = licenses.mit; maintainers = with maintainers; [ mt-caret ]; diff --git a/nixpkgs/pkgs/tools/misc/dtach/default.nix b/nixpkgs/pkgs/tools/misc/dtach/default.nix index 7d85decbb84b..9973eddc7efa 100644 --- a/nixpkgs/pkgs/tools/misc/dtach/default.nix +++ b/nixpkgs/pkgs/tools/misc/dtach/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://dtach.sourceforge.net/; + homepage = "http://dtach.sourceforge.net/"; description = "A program that emulates the detach feature of screen"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 765c7777f0f3..2dea0f179a1e 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.3.8"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0ql74z24qp68m3ivzmxdijafrhpwjgs462chrxd021n9nl7mqhss"; + sha256 = "1r94fcygp9mmg457dkksx3mjdxfddzfzl6n0rmxasiinsz0hak4c"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0c0d9qi7v3s7vf1rzd467w56i9zdh8fqqrmkkk6xxyh5xhkqx0kd"; + cargoSha256 = "15a4hari3my59xvmkll2jlvb1jyf8gg8alp91nvh3bagpajpvdx6"; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/duc/default.nix b/nixpkgs/pkgs/tools/misc/duc/default.nix index c5ea2cd46a16..74dd2a34cc44 100644 --- a/nixpkgs/pkgs/tools/misc/duc/default.nix +++ b/nixpkgs/pkgs/tools/misc/duc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; meta = with stdenv.lib; { - homepage = http://duc.zevv.nl/; + homepage = "http://duc.zevv.nl/"; description = "Collection of tools for inspecting and visualizing disk usage"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix b/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix index 1b9a6c9bbea2..146ab54dd62f 100644 --- a/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix +++ b/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dump .torrent file information"; - homepage = https://sourceforge.net/projects/dumptorrent/; + homepage = "https://sourceforge.net/projects/dumptorrent/"; license = licenses.gpl2; maintainers = [ maintainers.zohl ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/dupd/default.nix b/nixpkgs/pkgs/tools/misc/dupd/default.nix index 06b9f3adac92..4c8f5e2e2b1e 100644 --- a/nixpkgs/pkgs/tools/misc/dupd/default.nix +++ b/nixpkgs/pkgs/tools/misc/dupd/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI utility to find duplicate files"; - homepage = http://www.virkki.com/dupd; + homepage = "http://www.virkki.com/dupd"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix index df2e25c7ea33..61af9fac1778 100644 --- a/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix +++ b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Dynamic virtual terminal manager"; - homepage = http://www.brain-dump.org/projects/dvtm; + homepage = "http://www.brain-dump.org/projects/dvtm"; license = licenses.mit; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix index 11a46f620c0a..c755f73b118b 100644 --- a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix +++ b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { meta = { description = "EDID decoder and conformance tester"; - homepage = https://cgit.freedesktop.org/xorg/app/edid-decode/; + homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.chiiruno ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/emv/default.nix b/nixpkgs/pkgs/tools/misc/emv/default.nix index 6a5fcfb12174..76ea8ceba0d9 100644 --- a/nixpkgs/pkgs/tools/misc/emv/default.nix +++ b/nixpkgs/pkgs/tools/misc/emv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.i0i0.de/toolchest/emv; + homepage = "http://www.i0i0.de/toolchest/emv"; description = "Editor Move: Rename files with your favourite text editor"; license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/ent/default.nix b/nixpkgs/pkgs/tools/misc/ent/default.nix index 7e8d04b42092..4ecb8fe488a2 100644 --- a/nixpkgs/pkgs/tools/misc/ent/default.nix +++ b/nixpkgs/pkgs/tools/misc/ent/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Pseudorandom Number Sequence Test Program"; - homepage = http://www.fourmilab.ch/random/; + homepage = "http://www.fourmilab.ch/random/"; platforms = platforms.all; license = licenses.publicDomain; }; diff --git a/nixpkgs/pkgs/tools/misc/entr/default.nix b/nixpkgs/pkgs/tools/misc/entr/default.nix index 247572a379f7..aeb88d0c68b1 100644 --- a/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://entrproject.org/; + homepage = "http://entrproject.org/"; description = "Run arbitrary commands when files change"; license = licenses.isc; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/envdir-go/default.nix b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix index db31df982cf8..957f5941cb6b 100644 --- a/nixpkgs/pkgs/tools/misc/envdir-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = { description = "A go rewrite of envdir"; - homepage = https://github.com/d10n/envdir; + homepage = "https://github.com/d10n/envdir"; maintainers = with stdenv.lib.maintainers; [ edude03 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/envsubst/default.nix b/nixpkgs/pkgs/tools/misc/envsubst/default.nix index 9b2153d17cb1..af0fa6a76ba9 100644 --- a/nixpkgs/pkgs/tools/misc/envsubst/default.nix +++ b/nixpkgs/pkgs/tools/misc/envsubst/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { meta = with lib; { description = "Environment variables substitution for Go"; - homepage = https://github.com/a8m/envsubst; + homepage = "https://github.com/a8m/envsubst"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ nicknovitski ]; diff --git a/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix b/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix index 8d65aee9e7a8..546ad8d3d7dd 100644 --- a/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix +++ b/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = { - homepage = http://www.w3.org/Tools/eot-utils/; + homepage = "http://www.w3.org/Tools/eot-utils/"; description = "Create Embedded Open Type from OpenType or TrueType font"; license = stdenv.lib.licenses.w3c; maintainers = with stdenv.lib.maintainers; [ leenaars ]; diff --git a/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix b/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix index 52b56f10ea97..a57a042a0c17 100644 --- a/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix +++ b/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ESP8266/ESP32 build helper tool"; - homepage = https://github.com/igrr/esptool-ck; + homepage = "https://github.com/igrr/esptool-ck"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/esptool/default.nix b/nixpkgs/pkgs/tools/misc/esptool/default.nix index 8793685069a0..465e30e76157 100644 --- a/nixpkgs/pkgs/tools/misc/esptool/default.nix +++ b/nixpkgs/pkgs/tools/misc/esptool/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; - homepage = https://github.com/espressif/esptool; + homepage = "https://github.com/espressif/esptool"; license = licenses.gpl2; maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/ethminer/default.nix b/nixpkgs/pkgs/tools/misc/ethminer/default.nix index 1ec99f12d821..d593d677cc32 100644 --- a/nixpkgs/pkgs/tools/misc/ethminer/default.nix +++ b/nixpkgs/pkgs/tools/misc/ethminer/default.nix @@ -67,10 +67,12 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ethereum miner with OpenCL, CUDA and stratum support"; - homepage = https://github.com/ethereum-mining/ethminer; + homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; + # Doesn't build with gcc9, and if overlayed to use gcc8 stdenv fails on CUDA issues. + broken = true; }; } diff --git a/nixpkgs/pkgs/tools/misc/ethtool/default.nix b/nixpkgs/pkgs/tools/misc/ethtool/default.nix index ec1e2c48e640..b1b9956404a9 100644 --- a/nixpkgs/pkgs/tools/misc/ethtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/ethtool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility for controlling network drivers and hardware"; - homepage = https://www.kernel.org/pub/software/network/ethtool/; + homepage = "https://www.kernel.org/pub/software/network/ethtool/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/misc/eva/default.nix b/nixpkgs/pkgs/tools/misc/eva/default.nix index dee181d95c23..06b7b0a5200f 100644 --- a/nixpkgs/pkgs/tools/misc/eva/default.nix +++ b/nixpkgs/pkgs/tools/misc/eva/default.nix @@ -18,14 +18,14 @@ rustPlatform.buildRustPackage rec { patches = [ # to fix the test suite (can be removed as soon as #33 is merged). (fetchpatch { - url = https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch; + url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; }) ]; meta = with stdenv.lib; { description = "A calculator REPL, similar to bc"; - homepage = https://github.com/NerdyPepper/eva; + homepage = "https://github.com/NerdyPepper/eva"; license = licenses.mit; maintainers = with maintainers; [ nrdxp ma27 ]; }; diff --git a/nixpkgs/pkgs/tools/misc/exa/default.nix b/nixpkgs/pkgs/tools/misc/exa/default.nix index acfbe6bb63c5..fd6baadb685c 100644 --- a/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -55,7 +55,7 @@ buildRustPackage rec { for a directory, or recursing into directories with a tree view. exa is written in Rust, so it’s small, fast, and portable. ''; - homepage = https://the.exa.website; + homepage = "https://the.exa.website"; license = licenses.mit; maintainers = with maintainers; [ ehegnes lilyball globin ]; }; diff --git a/nixpkgs/pkgs/tools/misc/execline/default.nix b/nixpkgs/pkgs/tools/misc/execline/default.nix index fb685e65a4f5..d3a6990a1f83 100644 --- a/nixpkgs/pkgs/tools/misc/execline/default.nix +++ b/nixpkgs/pkgs/tools/misc/execline/default.nix @@ -7,8 +7,8 @@ with skawarePackages; buildPackage { pname = "execline"; - version = "2.5.3.0"; - sha256 = "0czdrv9m8mnx94nf28dafij6z03k4mbhbs6hccfaardfd5l5q805"; + version = "2.6.0.0"; + sha256 = "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; @@ -35,15 +35,21 @@ buildPackage { mv examples $doc/share/doc/execline/examples mv $bin/bin/execlineb $bin/bin/.execlineb-wrapped - cc \ + + # A wrapper around execlineb, which provides all execline + # tools on `execlineb`’s PATH. + # It is implemented as a C script, because on non-Linux, + # nested shebang lines are not supported. + # The -lskarnet has to come at the end to support static builds. + $CC \ -O \ -Wall -Wpedantic \ -D "EXECLINEB_PATH()=\"$bin/bin/.execlineb-wrapped\"" \ -D "EXECLINE_BIN_PATH()=\"$bin/bin\"" \ -I "${skalibs.dev}/include" \ -L "${skalibs.lib}/lib" \ - -lskarnet \ -o "$bin/bin/execlineb" \ - ${./execlineb-wrapper.c} + ${./execlineb-wrapper.c} \ + -lskarnet ''; } diff --git a/nixpkgs/pkgs/tools/misc/expect/default.nix b/nixpkgs/pkgs/tools/misc/expect/default.nix index 9fcff332de6d..cbb8c337ff87 100644 --- a/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for automating interactive applications"; - homepage = http://expect.sourceforge.net/; + homepage = "http://expect.sourceforge.net/"; license = "Expect"; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/fd/default.nix b/nixpkgs/pkgs/tools/misc/fd/default.nix index 060e1c3fcdf6..5cc1c12f64c3 100644 --- a/nixpkgs/pkgs/tools/misc/fd/default.nix +++ b/nixpkgs/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "7.5.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "029xr7l751dy167hfzrd030llkaiy8j585h1d4l6391fgrsvnav7"; + sha256 = "0l18xavkj99cydp1dqrph00yq2px339zs6jcim59iq3zln1yn0n7"; }; - cargoSha256 = "0lq6da2f6xywyhzyyrpph96d8b9vpdzakzipci167g6hhh232b5b"; + cargoSha256 = "1sdwbnncs1d45x1iqk3jv3r69fpkzrsxm4kjn89jmvd5nk8blvs2"; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/fdupes/default.nix b/nixpkgs/pkgs/tools/misc/fdupes/default.nix index af9a7c9a1332..731ad86e622a 100644 --- a/nixpkgs/pkgs/tools/misc/fdupes/default.nix +++ b/nixpkgs/pkgs/tools/misc/fdupes/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Such files are found by comparing file sizes and MD5 signatures, followed by a byte-by-byte comparison. ''; - homepage = https://github.com/adrianlopezroche/fdupes; + homepage = "https://github.com/adrianlopezroche/fdupes"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.maggesi ]; diff --git a/nixpkgs/pkgs/tools/misc/fffuu/default.nix b/nixpkgs/pkgs/tools/misc/fffuu/default.nix index 5d79b26f2308..2463ee5a6e99 100644 --- a/nixpkgs/pkgs/tools/misc/fffuu/default.nix +++ b/nixpkgs/pkgs/tools/misc/fffuu/default.nix @@ -45,7 +45,7 @@ mkDerivation { ]; description = "Fancy Formal Firewall Universal Understander"; - homepage = https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool; + homepage = "https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.marsam ]; } diff --git a/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/nixpkgs/pkgs/tools/misc/ffsend/default.nix index 38619f537151..62c2aa36dc19 100644 --- a/nixpkgs/pkgs/tools/misc/ffsend/default.nix +++ b/nixpkgs/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.58"; + version = "0.2.59"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49"; + sha256 = "14a7mb1a1s74hi124v4jscc72m09zq2bd8xrhq5agz9z27plqm2c"; }; - cargoSha256 = "0m2931fmc8jczjpb08077cpz9klhhf3aq15j2h76sb254qndagzy"; + cargoSha256 = "1945s3ajpy55fzh5wbl7fchqck0fh69shl18lxni9hvg04smq39i"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] @@ -53,7 +53,7 @@ buildRustPackage rec { may be up to 2GB. Others are able to download these files with this tool, or through their web browser. ''; - homepage = https://gitlab.com/timvisee/ffsend; + homepage = "https://gitlab.com/timvisee/ffsend"; license = licenses.gpl3; maintainers = with maintainers; [ lilyball equirosa ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/figlet/default.nix b/nixpkgs/pkgs/tools/misc/figlet/default.nix index 86434847b4a2..7f7fc6f4e086 100644 --- a/nixpkgs/pkgs/tools/misc/figlet/default.nix +++ b/nixpkgs/pkgs/tools/misc/figlet/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz; + url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz"; sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; patches = [ (fetchpatch { - url = https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; name = "musl-fix-cplusplus-decls.patch"; sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; }) @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Program for making large letters out of ordinary text"; - homepage = http://www.figlet.org/; + homepage = "http://www.figlet.org/"; license = stdenv.lib.licenses.afl21; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/file/default.nix b/nixpkgs/pkgs/tools/misc/file/default.nix index 24a7143d8e11..71e547d84331 100644 --- a/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/nixpkgs/pkgs/tools/misc/file/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; meta = with stdenv.lib; { - homepage = https://darwinsys.com/file; + homepage = "https://darwinsys.com/file"; description = "A program that shows the type of files"; license = licenses.bsd2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/filebench/default.nix b/nixpkgs/pkgs/tools/misc/filebench/default.nix index a16695cf7c32..4cd572ac9920 100644 --- a/nixpkgs/pkgs/tools/misc/filebench/default.nix +++ b/nixpkgs/pkgs/tools/misc/filebench/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File system and storage benchmark that can generate both micro and macro workloads"; - homepage = https://sourceforge.net/projects/filebench/; + homepage = "https://sourceforge.net/projects/filebench/"; license = licenses.cddl; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/fileschanged/default.nix b/nixpkgs/pkgs/tools/misc/fileschanged/default.nix index 6818bb708bb6..056943e96d78 100644 --- a/nixpkgs/pkgs/tools/misc/fileschanged/default.nix +++ b/nixpkgs/pkgs/tools/misc/fileschanged/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://www.nongnu.org/fileschanged/; + homepage = "https://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/misc/findutils/default.nix b/nixpkgs/pkgs/tools/misc/findutils/default.nix index 2df8ee420fae..1b69b80be70f 100644 --- a/nixpkgs/pkgs/tools/misc/findutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/findutils/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.gnu.org/software/findutils/; + homepage = "https://www.gnu.org/software/findutils/"; description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/misc/flameshot/default.nix b/nixpkgs/pkgs/tools/misc/flameshot/default.nix index ad6ed6acb4cc..afca2e3007ed 100644 --- a/nixpkgs/pkgs/tools/misc/flameshot/default.nix +++ b/nixpkgs/pkgs/tools/misc/flameshot/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { meta = with lib; { description = "Powerful yet simple to use screenshot software"; - homepage = https://github.com/lupoDharkael/flameshot; + homepage = "https://github.com/lupoDharkael/flameshot"; maintainers = [ maintainers.scode ]; license = lib.licenses.gpl3; platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/nixpkgs/pkgs/tools/misc/flashrom/default.nix index 3b9e600dcdbe..6b190fcf842e 100644 --- a/nixpkgs/pkgs/tools/misc/flashrom/default.nix +++ b/nixpkgs/pkgs/tools/misc/flashrom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 libusb1 pciutils ]; meta = with lib; { - homepage = http://www.flashrom.org; + homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz ]; diff --git a/nixpkgs/pkgs/tools/misc/fltrdr/default.nix b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix index 8c2c5adfb5f4..8d585324d875 100644 --- a/nixpkgs/pkgs/tools/misc/fltrdr/default.nix +++ b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://octobanana.com/software/fltrdr; + homepage = "https://octobanana.com/software/fltrdr"; description = "A TUI text reader for the terminal"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index 57909debf79a..0933e6eae900 100644 --- a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "07p0cy4y2x45kgimg7rjjk9zknmnnsfxdy2vlz6dzaxrslv6c3x6"; + sha256 = "1xfbghaylzsh48ag4aw77nmzm1cds4nx53m4s1fiy0r31sm8vqwl"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock index e86371aed3ba..c3e3cb24e83a 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock @@ -129,4 +129,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/fluentd/default.nix b/nixpkgs/pkgs/tools/misc/fluentd/default.nix index 18d03982f37c..82ea02aae680 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/default.nix +++ b/nixpkgs/pkgs/tools/misc/fluentd/default.nix @@ -10,7 +10,7 @@ bundlerEnv { meta = with lib; { description = "A data collector"; - homepage = https://www.fluentd.org/; + homepage = "https://www.fluentd.org/"; license = licenses.asl20; maintainers = with maintainers; [ offline nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/fontforge/default.nix b/nixpkgs/pkgs/tools/misc/fontforge/default.nix index 635d786da53a..67ab7b2d6917 100644 --- a/nixpkgs/pkgs/tools/misc/fontforge/default.nix +++ b/nixpkgs/pkgs/tools/misc/fontforge/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "A font editor"; - homepage = http://fontforge.github.io; + homepage = "http://fontforge.github.io"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.erictapen ]; diff --git a/nixpkgs/pkgs/tools/misc/fpp/default.nix b/nixpkgs/pkgs/tools/misc/fpp/default.nix index 7f036cb1f908..7f68a14c5aa2 100644 --- a/nixpkgs/pkgs/tools/misc/fpp/default.nix +++ b/nixpkgs/pkgs/tools/misc/fpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program that accepts piped input and presents files for selection"; - homepage = https://facebook.github.io/PathPicker/; + homepage = "https://facebook.github.io/PathPicker/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/tools/misc/fsmark/default.nix b/nixpkgs/pkgs/tools/misc/fsmark/default.nix index ac56d948bdad..7bfa24e3a082 100644 --- a/nixpkgs/pkgs/tools/misc/fsmark/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsmark/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Synchronous write workload file system benchmark"; - homepage = https://sourceforge.net/projects/fsmark/; + homepage = "https://sourceforge.net/projects/fsmark/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/fsql/default.nix b/nixpkgs/pkgs/tools/misc/fsql/default.nix index 4e7db2dc4847..fa64d7428658 100644 --- a/nixpkgs/pkgs/tools/misc/fsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsql/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Search through your filesystem with SQL-esque queries"; - homepage = https://github.com/kshvmdn/fsql; + homepage = "https://github.com/kshvmdn/fsql"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/fwup/default.nix b/nixpkgs/pkgs/tools/misc/fwup/default.nix index 99dcc194d011..bf6c125ac759 100644 --- a/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "08gscwdq7fwfpk3mf7dfdf64n5ijm5kjb7f5wrzzvpnnqz24xnb0"; + sha256 = "05sjdlh450hk474a44yr6kz9dzx72jfxpi1krxbd0pdizlmfypsg"; }; doCheck = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configurable embedded Linux firmware update creator and runner"; - homepage = https://github.com/fhunleth/fwup; + homepage = "https://github.com/fhunleth/fwup"; license = licenses.asl20; maintainers = [ maintainers.georgewhewell ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/fx_cast/default.nix b/nixpkgs/pkgs/tools/misc/fx_cast/default.nix index 5181610a0391..ec977d48572d 100644 --- a/nixpkgs/pkgs/tools/misc/fx_cast/default.nix +++ b/nixpkgs/pkgs/tools/misc/fx_cast/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; - homepage = https://hensm.github.io/fx_cast/; + homepage = "https://hensm.github.io/fx_cast/"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix index 7965b591afbb..112f6a9f2328 100644 --- a/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix +++ b/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optional configuration tool for fxlinuxprint"; - homepage = https://onlinesupport.fujixerox.com; + homepage = "https://onlinesupport.fujixerox.com"; license = licenses.unfree; maintainers = with maintainers; [ delan ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/fzf/default.nix b/nixpkgs/pkgs/tools/misc/fzf/default.nix index d337731888fd..d5c75a1e8a7a 100644 --- a/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.21.0-1"; + version = "0.21.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "1d4bwcmjirwkkv0m01sx9rxp01iik57iy54zxhdkkz842pxlr2xv"; + sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw"; }; modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; diff --git a/nixpkgs/pkgs/tools/misc/fzy/default.nix b/nixpkgs/pkgs/tools/misc/fzy/default.nix index 24daa7fc81fa..90042d632b79 100644 --- a/nixpkgs/pkgs/tools/misc/fzy/default.nix +++ b/nixpkgs/pkgs/tools/misc/fzy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A better fuzzy finder"; - homepage = https://github.com/jhawthorn/fzy; + homepage = "https://github.com/jhawthorn/fzy"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/gams/default.nix b/nixpkgs/pkgs/tools/misc/gams/default.nix index ba0b76026a58..0723735228a4 100644 --- a/nixpkgs/pkgs/tools/misc/gams/default.nix +++ b/nixpkgs/pkgs/tools/misc/gams/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { The General Algebraic Modeling System is a high-level modeling system for mathematical optimization. GAMS is designed for modeling and solving linear, nonlinear, and mixed-integer optimization problems. ''; - homepage = https://www.gams.com/; + homepage = "https://www.gams.com/"; license = licenses.unfree; maintainers = [ maintainers.Scriptkiddi ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/gbdfed/default.nix b/nixpkgs/pkgs/tools/misc/gbdfed/default.nix index 9b41dba4e259..e5dc243ede11 100644 --- a/nixpkgs/pkgs/tools/misc/gbdfed/default.nix +++ b/nixpkgs/pkgs/tools/misc/gbdfed/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { it allows cut and paste operations between fonts and glyphs and editing font properties. The editor works natively with BDF fonts. ''; - homepage = http://sofia.nmsu.edu/~mleisher/Software/gbdfed/; + homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.linquize ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/nixpkgs/pkgs/tools/misc/geekbench/default.nix index b18ac1093829..153a74f94567 100644 --- a/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ b/nixpkgs/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1hqqwk5hbqgrxfqlcbgk6rv3a71k65psxcqa6hw41y9jymnm3dp3"; + sha256 = "1wjyn3fkc2zgj0xrd73kidrg1d1wqmil278ak36wf87685w4n0b1"; }; dontConfigure = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform benchmark"; - homepage = https://geekbench.com/; + homepage = "https://geekbench.com/"; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/misc/geteltorito/default.nix b/nixpkgs/pkgs/tools/misc/geteltorito/default.nix index d6fbb6233312..cee93ae29910 100644 --- a/nixpkgs/pkgs/tools/misc/geteltorito/default.nix +++ b/nixpkgs/pkgs/tools/misc/geteltorito/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract the initial/default boot image from a CD image if existent"; - homepage = https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/; + homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/"; maintainers = [ maintainers.Profpatsch ]; license = licenses.gpl2; }; diff --git a/nixpkgs/pkgs/tools/misc/getopt/default.nix b/nixpkgs/pkgs/tools/misc/getopt/default.nix index d168c8aaa14e..f94d6eeff4ed 100644 --- a/nixpkgs/pkgs/tools/misc/getopt/default.nix +++ b/nixpkgs/pkgs/tools/misc/getopt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; - homepage = http://frodo.looijaard.name/project/getopt; + homepage = "http://frodo.looijaard.name/project/getopt"; description = "Parses command-line arguments from shell scripts"; }; } diff --git a/nixpkgs/pkgs/tools/misc/gh-ost/default.nix b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix index e5c0997c8e3e..d78e7f9439fd 100644 --- a/nixpkgs/pkgs/tools/misc/gh-ost/default.nix +++ b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix @@ -20,7 +20,7 @@ buildGoPackage ({ meta = with stdenv.lib; { description = "Triggerless online schema migration solution for MySQL"; - homepage = https://github.com/github/gh-ost; + homepage = "https://github.com/github/gh-ost"; license = licenses.mit; }; }) diff --git a/nixpkgs/pkgs/tools/misc/gibo/default.nix b/nixpkgs/pkgs/tools/misc/gibo/default.nix index a8e957ce4840..abee4950d879 100644 --- a/nixpkgs/pkgs/tools/misc/gibo/default.nix +++ b/nixpkgs/pkgs/tools/misc/gibo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/simonwhitaker/gibo; + homepage = "https://github.com/simonwhitaker/gibo"; license = stdenv.lib.licenses.publicDomain; description = "A shell script for easily accessing gitignore boilerplates"; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix b/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix index 771fc354da42..993c20222d8e 100644 --- a/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Render gifs as ASCII art in your cli"; longDescription = "Takes in a GIF, short video, or a query to the Tenor GIF API and converts it to animated ASCII art."; - homepage = https://github.com/google/gif-for-cli; + homepage = "https://github.com/google/gif-for-cli"; license = licenses.asl20; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/nixpkgs/pkgs/tools/misc/git-town/default.nix b/nixpkgs/pkgs/tools/misc/git-town/default.nix index 5438f71930da..7a8b16c55e0d 100644 --- a/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -1,25 +1,25 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: - buildGoPackage rec { - pname = "git-town"; - version = "7.2.0"; +buildGoPackage rec { + pname = "git-town"; + version = "7.3.0"; - goPackagePath = "github.com/Originate/git-town"; + goPackagePath = "github.com/Originate/git-town"; - src = fetchFromGitHub { - owner = "Originate"; - repo = "git-town"; - rev = "v${version}"; - sha256 = "0hr0c6iya34lanfhsg9kj03l4ajalcfxkbn4bgwh0749smhi6mrj"; - }; + src = fetchFromGitHub { + owner = "Originate"; + repo = "git-town"; + rev = "v${version}"; + sha256 = "166g9i79hqga8k5wvs0b84q6rqniizzsd39v37s9w16axgdrm6nb"; + }; - buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; + buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; - meta = with stdenv.lib; { - description = "Generic, high-level git support for git-flow workflows"; - homepage = http://www.git-town.com/; - maintainers = [ maintainers.allonsy ]; - license = licenses.mit; - }; - } + meta = with stdenv.lib; { + description = "Generic, high-level git support for git-flow workflows"; + homepage = "http://www.git-town.com/"; + maintainers = [ maintainers.allonsy ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/gnokii/default.nix b/nixpkgs/pkgs/tools/misc/gnokii/default.nix index 581a1f84fc7f..c0e516a15ad3 100644 --- a/nixpkgs/pkgs/tools/misc/gnokii/default.nix +++ b/nixpkgs/pkgs/tools/misc/gnokii/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Cellphone tool"; - homepage = http://www.gnokii.org; + homepage = "http://www.gnokii.org"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; broken = true; # 2018-04-10 diff --git a/nixpkgs/pkgs/tools/misc/gnuvd/default.nix b/nixpkgs/pkgs/tools/misc/gnuvd/default.nix index 4da5ec2e5d5f..0c4929622704 100644 --- a/nixpkgs/pkgs/tools/misc/gnuvd/default.nix +++ b/nixpkgs/pkgs/tools/misc/gnuvd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "gnuvd-1.0.12"; src = fetchurl { - url = https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; + url = "https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz"; sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; }; meta = with stdenv.lib; { description = "Command-line dutch dictionary application"; - homepage = https://www.djcbsoftware.nl/code/gnuvd/; + homepage = "https://www.djcbsoftware.nl/code/gnuvd/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/nixpkgs/pkgs/tools/misc/goaccess/default.nix index 0fe9001fcdbe..b9fdac6cba3b 100644 --- a/nixpkgs/pkgs/tools/misc/goaccess/default.nix +++ b/nixpkgs/pkgs/tools/misc/goaccess/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; - homepage = https://goaccess.io; + homepage = "https://goaccess.io"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ ederoyd46 ]; diff --git a/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index 56462aa3d303..d4daa64facb3 100644 --- a/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "gotify-cli"; @@ -17,11 +17,9 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; - homepage = https://github.com/gotify/cli; + homepage = "https://github.com/gotify/cli"; description = "A command line interface for pushing messages to gotify/server."; maintainers = with maintainers; [ ma27 ]; }; diff --git a/nixpkgs/pkgs/tools/misc/gparted/default.nix b/nixpkgs/pkgs/tools/misc/gparted/default.nix index 1884cb3ce31a..6292fb4a7227 100644 --- a/nixpkgs/pkgs/tools/misc/gparted/default.nix +++ b/nixpkgs/pkgs/tools/misc/gparted/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { partitions. GParted enables you to change the partition organization while preserving the partition contents. ''; - homepage = https://gparted.org; + homepage = "https://gparted.org"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/graylog/default.nix b/nixpkgs/pkgs/tools/misc/graylog/default.nix index 6ded4f28e9d7..49ca39c7d060 100644 --- a/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1n9nwxq0aklihhp0v39klq4za63ks6v5z76dp5821jcv1cbk96g9"; + sha256 = "0m3g68ycb0yvdpiyd6qysgz0ygz9s0kb98g79cdx9rqpb7x0rmd0"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/graylog/plugins.nix b/nixpkgs/pkgs/tools/misc/graylog/plugins.nix index e7d32dd4b373..1f351b662038 100644 --- a/nixpkgs/pkgs/tools/misc/graylog/plugins.nix +++ b/nixpkgs/pkgs/tools/misc/graylog/plugins.nix @@ -31,7 +31,7 @@ in { sha256 = "1c48almnjr0b6nvzagnb9yddqbcjs7yhrd5yc5fx9q7w3vxi50zp"; }; meta = { - homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; + homepage = "https://github.com/cvtienhoven/graylog-plugin-aggregates"; description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; }; }; @@ -44,7 +44,7 @@ in { sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; + homepage = "https://github.com/Graylog2/graylog-plugin-auth-sso"; description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; }; }; @@ -57,7 +57,7 @@ in { sha256 = "0djlyd4w4mrrqfbrs20j1xw0fygqsb81snz437v9bf80avmcyzg1"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver; + homepage = "https://github.com/graylog-labs/graylog-plugin-dnsresolver"; description = "Message filter plugin can be used to do DNS lookups for the source field in Graylog messages"; }; }; @@ -70,7 +70,7 @@ in { sha256 = "1vx62yikd6d3lbwsfiyf9j6kx8drvn4xhffwv27fw5jzhfqr61ji"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-filter-messagesize; + homepage = "https://github.com/graylog-labs/graylog-plugin-filter-messagesize"; description = "Prints out all messages that have an estimated size crossing a configured threshold during processing"; }; }; @@ -83,7 +83,7 @@ in { sha256 = "1jyy0wkjapv3xv5q957xxv2pcnd4n1yivkvkvg6cx7kv1ip75xwc"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs; + homepage = "https://github.com/graylog-labs/graylog-plugin-internal-logs"; description = "Graylog plugin to record internal logs of Graylog efficiently instead of sending them over the network"; }; }; @@ -96,7 +96,7 @@ in { sha256 = "0hd66751hp97ddkn29s1cmjmc2h1nrp431bq7d2wq16iyxxlygri"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-ipanonymizer; + homepage = "https://github.com/graylog-labs/graylog-plugin-ipanonymizer"; description = "A graylog-server plugin that replaces the last octet of IP addresses in messages with xxx"; }; }; @@ -109,7 +109,7 @@ in { sha256 = "0zy27q8y0bv7i5nypsfxad4yiw121sbwzd194jsz2w08jhk3skl5"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-jabber; + homepage = "https://github.com/graylog-labs/graylog-plugin-jabber"; description = "Jabber Alarmcallback Plugin for Graylog"; }; }; @@ -122,7 +122,7 @@ in { sha256 = "1v1yzmqp43kxigh3fymdwki7pn21sk2ym3kk4nn4qv4zzkhz59vp"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-metrics; + homepage = "https://github.com/graylog-labs/graylog-plugin-metrics"; description = "An output plugin for integrating Graphite, Ganglia and StatsD with Graylog"; }; }; @@ -135,7 +135,7 @@ in { sha256 = "1hadxyawdz234lal3dq5cy3zppl7ixxviw96iallyav83xyi23i8"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-mongodb-profiler; + homepage = "https://github.com/graylog-labs/graylog-plugin-mongodb-profiler"; description = "Graylog input plugin that reads MongoDB profiler data"; }; }; @@ -148,7 +148,7 @@ in { sha256 = "1g63c6rm5pkz7f0d73wb2lmk4zm430jqnhihbyq112cm4i7ymglh"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-pagerduty; + homepage = "https://github.com/graylog-labs/graylog-plugin-pagerduty"; description = "An alarm callback plugin for integrating PagerDuty into Graylog"; }; }; @@ -161,7 +161,7 @@ in { sha256 = "0dfgh6w293ssagas5y0ixwn0vf54i5iv61r5p2q0rbv2da6xvhbw"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-redis; + homepage = "https://github.com/graylog-labs/graylog-plugin-redis"; description = "Redis plugin for Graylog"; }; }; @@ -174,7 +174,7 @@ in { sha256 = "067p8g94b007gypwyyi8vb6qhwdanpk8ah57abik54vv14jxg94k"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-slack; + homepage = "https://github.com/graylog-labs/graylog-plugin-slack"; description = "Can notify Slack or Mattermost channels about triggered alerts in Graylog (Alarm Callback)"; }; }; @@ -187,7 +187,7 @@ in { sha256 = "1mwqy3fhyy4zdwyrzvbr565xwf96xs9d3l70l0khmrm848xf8wz4"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-spaceweather; + homepage = "https://github.com/graylog-labs/graylog-plugin-spaceweather"; description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate."; }; }; @@ -200,7 +200,7 @@ in { sha256 = "0kwfv1zfj0fmxh9i6413bcsaxrn1vdwrzb6dphvg3dx27wxn1j1a"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-twiliosms; + homepage = "https://github.com/graylog-labs/graylog-plugin-twiliosms"; description = "An alarm callback plugin for integrating the Twilio SMS API into Graylog"; }; }; @@ -213,7 +213,7 @@ in { sha256 = "1pi34swy9nzq35a823zzvqrjhb6wsg302z31vk2y656sw6ljjxyh"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-twitter; + homepage = "https://github.com/graylog-labs/graylog-plugin-twitter"; description = "Graylog input plugin that reads Twitter messages based on keywords in realtime"; }; }; diff --git a/nixpkgs/pkgs/tools/misc/grc/default.nix b/nixpkgs/pkgs/tools/misc/grc/default.nix index 828d4e4dab78..1900764604b5 100644 --- a/nixpkgs/pkgs/tools/misc/grc/default.nix +++ b/nixpkgs/pkgs/tools/misc/grc/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Yet another colouriser for beautifying your logfiles or output of commands"; - homepage = http://korpus.juls.savba.sk/~garabik/software/grc.html; + homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/gringo/default.nix b/nixpkgs/pkgs/tools/misc/gringo/default.nix index 705c1a7e1d6a..92f1eb895855 100644 --- a/nixpkgs/pkgs/tools/misc/gringo/default.nix +++ b/nixpkgs/pkgs/tools/misc/gringo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; }; - buildInputs = [ bison re2c scons ]; + buildInputs = [ bison re2c scons.py2 ]; patches = [ ./gringo-4.5.4-cmath.patch @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Converts input programs with first-order variables to equivalent ground programs"; - homepage = http://potassco.sourceforge.net/; + homepage = "http://potassco.sourceforge.net/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index 3eec453824d7..a64df8669812 100644 --- a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { operating system (e.g., GNU). ''; - homepage = https://www.gnu.org/software/grub/; + homepage = "https://www.gnu.org/software/grub/"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/misc/grub/default.nix b/nixpkgs/pkgs/tools/misc/grub/default.nix index 87e9814d8993..e657431429cc 100644 --- a/nixpkgs/pkgs/tools/misc/grub/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "grub-0.97-73"; src = fetchurl { - url = https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; + url = "https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz"; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { passthru.grubTarget = ""; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/grub; + homepage = "https://www.gnu.org/software/grub"; description = "GRand Unified Bootloader"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/grub/trusted.nix b/nixpkgs/pkgs/tools/misc/grub/trusted.nix index 1033a489c767..27676c4745b6 100644 --- a/nixpkgs/pkgs/tools/misc/grub/trusted.nix +++ b/nixpkgs/pkgs/tools/misc/grub/trusted.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; - homepage = https://github.com/Sirrix-AG/TrustedGRUB2; + homepage = "https://github.com/Sirrix-AG/TrustedGRUB2"; license = licenses.gpl3Plus; platforms = platforms.gnu ++ platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/grub4dos/default.nix b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix index 2dd8688232f8..24548b4d209b 100644 --- a/nixpkgs/pkgs/tools/misc/grub4dos/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://grub4dos.chenall.net/; + homepage = "http://grub4dos.chenall.net/"; description = "GRUB for DOS is the dos extension of GRUB"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix b/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix index 78a678f0714d..2e85448bde82 100644 --- a/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { It allows you to inspect the drive's SMART data to determine its health, as well as run various tests on it. ''; - homepage = https://gsmartcontrol.sourceforge.io/; + homepage = "https://gsmartcontrol.sourceforge.io/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/misc/gti/default.nix b/nixpkgs/pkgs/tools/misc/gti/default.nix index cdb6be992539..9c2e65676c2d 100644 --- a/nixpkgs/pkgs/tools/misc/gti/default.nix +++ b/nixpkgs/pkgs/tools/misc/gti/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://r-wos.org/hacks/gti; + homepage = "http://r-wos.org/hacks/gti"; license = licenses.mit; description = "Humorous typo-based git runner; drives a car over the terminal"; maintainers = with maintainers; [ fadenb ]; diff --git a/nixpkgs/pkgs/tools/misc/h5utils/default.nix b/nixpkgs/pkgs/tools/misc/h5utils/default.nix index 9fe267771102..f5c01c83a48a 100644 --- a/nixpkgs/pkgs/tools/misc/h5utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/h5utils/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; - homepage = https://github.com/stevengj/h5utils; + homepage = "https://github.com/stevengj/h5utils"; license = with licenses; [ mit gpl2 ]; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/nixpkgs/pkgs/tools/misc/hashit/default.nix b/nixpkgs/pkgs/tools/misc/hashit/default.nix index 9a3ffe935102..5793382838b9 100644 --- a/nixpkgs/pkgs/tools/misc/hashit/default.nix +++ b/nixpkgs/pkgs/tools/misc/hashit/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple app for checking usual checksums - Designed for elementary OS"; - homepage = https://github.com/artemanufrij/hashit; + homepage = "https://github.com/artemanufrij/hashit"; license = licenses.gpl2Plus; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix index af4d4228c2c6..79f4d067b108 100644 --- a/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchzip, freeglut, libGL, libGLU }: +{ stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: -let version = "0.0.5"; in +let version = "0.0.7"; in stdenv.mkDerivation { pname = "hdaps-gl"; inherit version; - src = fetchzip { - url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz"; - sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4"; + src = fetchFromGitHub { + owner = "linux-thinkpad"; + repo = "hdaps-gl"; + rev = version; + sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ freeglut libGL libGLU ]; - # the Makefile has no install target - installPhase = '' - install -Dt $out/bin ./hdaps-gl - ''; - meta = with stdenv.lib; { description = "GL-based laptop model that rotates in real-time via hdaps"; - homepage = https://sourceforge.net/projects/hdaps/; + homepage = "https://github.com/linux-thinkpad/hdaps-gl"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.symphorien ]; diff --git a/nixpkgs/pkgs/tools/misc/hddtemp/default.nix b/nixpkgs/pkgs/tools/misc/hddtemp/default.nix index 13b69dad971f..1f3fbd2381ff 100644 --- a/nixpkgs/pkgs/tools/misc/hddtemp/default.nix +++ b/nixpkgs/pkgs/tools/misc/hddtemp/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "hddtemp-0.3_beta15"; db = fetchurl{ - url = mirror://savannah/hddtemp/hddtemp.db; + url = "mirror://savannah/hddtemp/hddtemp.db"; sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; }; src = fetchurl { - url = mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2; + url = "mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2"; sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool for displaying hard disk temperature"; - homepage = https://savannah.nongnu.org/projects/hddtemp/; + homepage = "https://savannah.nongnu.org/projects/hddtemp/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/nixpkgs/pkgs/tools/misc/hdf4/default.nix index e765e9234745..8d694aa88b75 100644 --- a/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = { description = "Data model, library, and file format for storing and managing data"; - homepage = https://support.hdfgroup.org/products/hdf4/; + homepage = "https://support.hdfgroup.org/products/hdf4/"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix b/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix index d27f6fc01bce..849fa6b9ac3b 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; license = stdenv.lib.licenses.free; # BSD-like - homepage = https://www.hdfgroup.org/HDF5/; + homepage = "https://www.hdfgroup.org/HDF5/"; platforms = stdenv.lib.platforms.unix; broken = (gfortran != null) && stdenv.isDarwin; }; diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index b0d69fb98b08..e56108767aba 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant - homepage = https://www.hdfgroup.org/HDF5/; + homepage = "https://www.hdfgroup.org/HDF5/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/hdfjava/default.nix b/nixpkgs/pkgs/tools/misc/hdfjava/default.nix index 6087a76e6bd1..7ee843998313 100644 --- a/nixpkgs/pkgs/tools/misc/hdfjava/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdfjava/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form"; license = stdenv.lib.licenses.free; # BSD-like - homepage = https://support.hdfgroup.org/products/java/index.html; + homepage = "https://support.hdfgroup.org/products/java/index.html"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/hdfview/default.nix b/nixpkgs/pkgs/tools/misc/hdfview/default.nix index fb6914c01d0a..0125bfa73696 100644 --- a/nixpkgs/pkgs/tools/misc/hdfview/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdfview/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A visual tool for browsing and editing HDF4 and HDF5 files"; license = stdenv.lib.licenses.free; # BSD-like - homepage = https://support.hdfgroup.org/products/java/index.html; + homepage = "https://support.hdfgroup.org/products/java/index.html"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/hebcal/default.nix b/nixpkgs/pkgs/tools/misc/hebcal/default.nix index 8b435fcef565..b953dd290fe8 100644 --- a/nixpkgs/pkgs/tools/misc/hebcal/default.nix +++ b/nixpkgs/pkgs/tools/misc/hebcal/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://hebcal.github.io; + homepage = "https://hebcal.github.io"; description = "A perpetual Jewish Calendar"; longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays."; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/misc/heimdall/default.nix b/nixpkgs/pkgs/tools/misc/heimdall/default.nix index 26396fee507e..bd99fa7024c3 100644 --- a/nixpkgs/pkgs/tools/misc/heimdall/default.nix +++ b/nixpkgs/pkgs/tools/misc/heimdall/default.nix @@ -42,7 +42,7 @@ mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.glassechidna.com.au/products/heimdall/; + homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/tools/misc/hexd/default.nix b/nixpkgs/pkgs/tools/misc/hexd/default.nix index eabb7838e8ac..0c0c56c52713 100644 --- a/nixpkgs/pkgs/tools/misc/hexd/default.nix +++ b/nixpkgs/pkgs/tools/misc/hexd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Colourful, human-friendly hexdump tool"; - homepage = https://github.com/FireyFly/hexd; + homepage = "https://github.com/FireyFly/hexd"; maintainers = [ maintainers.FireyFly ]; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/hid-listen/default.nix b/nixpkgs/pkgs/tools/misc/hid-listen/default.nix index 6bbe4888d1b8..afc7c5741fd4 100644 --- a/nixpkgs/pkgs/tools/misc/hid-listen/default.nix +++ b/nixpkgs/pkgs/tools/misc/hid-listen/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool thats prints debugging information from usb HID devices"; - homepage = https://www.pjrc.com/teensy/hid_listen.html; + homepage = "https://www.pjrc.com/teensy/hid_listen.html"; license = licenses.gpl3; maintainers = with maintainers; [ tomsmeets ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/homesick/Gemfile.lock b/nixpkgs/pkgs/tools/misc/homesick/Gemfile.lock index 42ab916db3e3..accc917e240f 100644 --- a/nixpkgs/pkgs/tools/misc/homesick/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/homesick/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES homesick BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/homesick/default.nix b/nixpkgs/pkgs/tools/misc/homesick/default.nix index 00a9bf85650c..5cd11bc48d1f 100644 --- a/nixpkgs/pkgs/tools/misc/homesick/default.nix +++ b/nixpkgs/pkgs/tools/misc/homesick/default.nix @@ -20,7 +20,7 @@ bundlerEnv { dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into place with a single command. ''; - homepage = https://github.com/technicalpickles/homesick; + homepage = "https://github.com/technicalpickles/homesick"; license = licenses.mit; maintainers = with maintainers; [ aaronschif nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/hostsblock/default.nix b/nixpkgs/pkgs/tools/misc/hostsblock/default.nix index a6ed7bf92ff9..0346c81c66db 100644 --- a/nixpkgs/pkgs/tools/misc/hostsblock/default.nix +++ b/nixpkgs/pkgs/tools/misc/hostsblock/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An ad- and malware-blocking script for Linux"; - homepage = http://gaenserich.github.io/hostsblock/; + homepage = "http://gaenserich.github.io/hostsblock/"; license = licenses.gpl3; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/hpl/default.nix b/nixpkgs/pkgs/tools/misc/hpl/default.nix index 16bc0393f23c..c131de021806 100644 --- a/nixpkgs/pkgs/tools/misc/hpl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hpl/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, openblasCompat, mpi } : +{ stdenv, fetchurl, blas, lapack, mpi } : + +assert (!blas.is64bit) && (!lapack.is64bit); stdenv.mkDerivation rec { pname = "hpl"; @@ -18,14 +20,13 @@ stdenv.mkDerivation rec { install -D testing/ptest/HPL.dat $out/share/hpl/HPL.dat ''; - buildInputs = [ openblasCompat mpi ]; + buildInputs = [ blas lapack mpi ]; meta = with stdenv.lib; { description = "Portable Implementation of the Linpack Benchmark for Distributed-Memory Computers"; - homepage = http://www.netlib.org/benchmark/hpl/; + homepage = "http://www.netlib.org/benchmark/hpl/"; platforms = platforms.unix; license = licenses.bsdOriginal; maintainers = [ maintainers.markuskowa ]; }; } - diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock index 615eea5a7831..0ba32818d21b 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.12.2) - html-proofer (3.15.2) + html-proofer (3.15.3) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -21,7 +21,7 @@ GEM nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) parallel (1.19.1) - public_suffix (4.0.3) + public_suffix (4.0.4) rainbow (3.0.0) typhoeus (1.3.1) ethon (>= 0.9.0) @@ -34,4 +34,4 @@ DEPENDENCIES html-proofer BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/default.nix b/nixpkgs/pkgs/tools/misc/html-proofer/default.nix index 49881f1b0b49..ba136b06b8a5 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/default.nix +++ b/nixpkgs/pkgs/tools/misc/html-proofer/default.nix @@ -10,7 +10,7 @@ bundlerEnv rec { meta = with lib; { description = "A tool to validate HTML files"; - homepage = https://github.com/gjtorikian/html-proofer; + homepage = "https://github.com/gjtorikian/html-proofer"; license = licenses.mit; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix index 2e3b3a10b3b8..c5836bc74ba0 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7wx2hnwnml3y10x6yxybl3hy973n2ifq3hbqh0jd72bqs615wp"; + sha256 = "18afz6rz72j8hnfgzhyr21wh1rfy1x41iyhbcgaq0r1bd7ng1vni"; type = "gem"; }; - version = "3.15.2"; + version = "3.15.3"; }; mercenary = { groups = ["default"]; @@ -99,10 +99,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; rainbow = { groups = ["default"]; diff --git a/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix b/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix index a66923b03f49..e782d793dab8 100644 --- a/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -28,7 +28,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An implementation of blockchain technology, leveraging familiar and proven technologies"; - homepage = https://wiki.hyperledger.org/projects/Fabric; + homepage = "https://wiki.hyperledger.org/projects/Fabric"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/nixpkgs/pkgs/tools/misc/i3minator/default.nix b/nixpkgs/pkgs/tools/misc/i3minator/default.nix index 372eebb59f61..ad9c41d47052 100644 --- a/nixpkgs/pkgs/tools/misc/i3minator/default.nix +++ b/nixpkgs/pkgs/tools/misc/i3minator/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { manage workspaces defining windows and their layout. The project is inspired by tmuxinator and uses i3-py. ''; - homepage = https://github.com/carlesso/i3minator; + homepage = "https://github.com/carlesso/i3minator"; license = stdenv.lib.licenses.wtfpl; maintainers = with maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/ical2org/default.nix b/nixpkgs/pkgs/tools/misc/ical2org/default.nix index 872de2c702b6..095336b7df54 100644 --- a/nixpkgs/pkgs/tools/misc/ical2org/default.nix +++ b/nixpkgs/pkgs/tools/misc/ical2org/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Convert an iCal file to org agenda format, optionally deduplicating entries."; - homepage = https://github.com/rjhorniii/ical2org; + homepage = "https://github.com/rjhorniii/ical2org"; license = licenses.gpl3; maintainers = with maintainers; [ swflint ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix b/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix index 98b039e3f8ae..4046d775a542 100644 --- a/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig usbmuxd libimobiledevice libzip ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/ideviceinstaller; + homepage = "https://github.com/libimobiledevice/ideviceinstaller"; description = "List/modify installed apps of iOS devices"; longDescription = '' ideviceinstaller is a tool to interact with the installation_proxy diff --git a/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix b/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix index ec9d1f528533..5a6064114419 100644 --- a/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix +++ b/nixpkgs/pkgs/tools/misc/idevicerestore/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/idevicerestore; + homepage = "https://github.com/libimobiledevice/idevicerestore"; description = "Restore/upgrade firmware of iOS devices"; longDescription = '' The idevicerestore tool allows to restore firmware files to iOS devices. diff --git a/nixpkgs/pkgs/tools/misc/idutils/default.nix b/nixpkgs/pkgs/tools/misc/idutils/default.nix index 01995c4939af..9afb92791340 100644 --- a/nixpkgs/pkgs/tools/misc/idutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/idutils/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { contents of certain character strings. ''; - homepage = https://www.gnu.org/software/idutils/; + homepage = "https://www.gnu.org/software/idutils/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; diff --git a/nixpkgs/pkgs/tools/misc/ipbt/default.nix b/nixpkgs/pkgs/tools/misc/ipbt/default.nix new file mode 100644 index 000000000000..e523dd198d42 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ipbt/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, perl, ncurses }: + +stdenv.mkDerivation rec { + version = "20190601.d1519e0"; + pname = "ipbt"; + + src = fetchurl { + url = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/ipbt-${version}.tar.gz"; + sha256 = "1aj8pajdd81vq2qw6vzfm27i0aj8vfz9m7k3sda30pnsrizm06d5"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ ncurses ]; + + meta = with stdenv.lib; { + description = "A high-tech ttyrec player for Unix"; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/"; + license = licenses.mit; + maintainers = [ maintainers.tckmn ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/nixpkgs/pkgs/tools/misc/ipxe/default.nix index 6946010b52a0..87b26f223bc8 100644 --- a/nixpkgs/pkgs/tools/misc/ipxe/default.nix +++ b/nixpkgs/pkgs/tools/misc/ipxe/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network boot firmware"; - homepage = https://ipxe.org/; + homepage = "https://ipxe.org/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix index 6b1c0d735eed..094c42b59dd2 100644 --- a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix +++ b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "jdiskreport-1.4.1"; src = fetchurl { - url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip; + url = "http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip"; sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.jgoodies.com/freeware/jdiskreport/; + homepage = "http://www.jgoodies.com/freeware/jdiskreport/"; description = "A graphical utility to visualize disk usage"; license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix index 4bcfd81f71de..3048b4c93960 100644 --- a/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix +++ b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Kakoune Language Server Protocol Client"; - homepage = https://github.com/ul/kak-lsp; + homepage = "https://github.com/ul/kak-lsp"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.spacekookie ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/kanshi/default.nix b/nixpkgs/pkgs/tools/misc/kanshi/default.nix index d3e0ba029f3f..0cb20315f66c 100644 --- a/nixpkgs/pkgs/tools/misc/kanshi/default.nix +++ b/nixpkgs/pkgs/tools/misc/kanshi/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc, wayland }: +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }: stdenv.mkDerivation rec { pname = "kanshi"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "emersion"; repo = "kanshi"; rev = "v${version}"; - sha256 = "0v50q1s105c2rar6mi1pijm8llsnsp62gv4swd3ddjn5rwallg46"; + sha256 = "0nbpgm8qnn7ljsg9vgs35kl8l4rrk542vdcbx8wrn9r909ld3x92"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/kargo/default.nix b/nixpkgs/pkgs/tools/misc/kargo/default.nix index 480c0abc728d..bcc19770155d 100644 --- a/nixpkgs/pkgs/tools/misc/kargo/default.nix +++ b/nixpkgs/pkgs/tools/misc/kargo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "0.4.6"; + version = "0.4.8"; pname = "kargo"; src = fetchurl { url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz"; - sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b"; + sha256 = "1iq3vrmglag9gpsir03yz7556m0bz99nwb2mf594378cqzbr6db3"; }; doCheck = false; @@ -25,7 +25,7 @@ python2Packages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/kubespray/kargo-cli; + homepage = "https://github.com/kubespray/kargo-cli"; description = "A tool helps to deploy a kubernetes cluster with Ansible."; platforms = platforms.linux; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix b/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix index 0fd1c7c5cd73..53b1763ad6a1 100644 --- a/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -20,7 +20,7 @@ mkDerivation { kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview. ''; - homepage = https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/; + homepage = "https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/"; license = licenses.gpl2; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/nixpkgs/pkgs/tools/misc/kepubify/default.nix index a7b7da451fb7..0a8f10fa85d5 100644 --- a/nixpkgs/pkgs/tools/misc/kepubify/default.nix +++ b/nixpkgs/pkgs/tools/misc/kepubify/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "kepubify"; - version = "3.1.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "geek1011"; repo = pname; rev = "v${version}"; - sha256 = "17zhfq1nfdas4k5yzyr82zs3r3mm4n8f907ih1ckx081hy4g7a2p"; + sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; }; - modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43"; + modSha256 = "0jz8v4rnwm5zbxxp49kv96wm4lack6prwyhcrqwsrm79dr9yjcxf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + excludedPackages = [ "kobotest" ]; - subPackages = [ "." "covergen" "seriesmeta" ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "EPUB to KEPUB converter"; homepage = "https://pgaskin.net/kepubify"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/kermit/default.nix b/nixpkgs/pkgs/tools/misc/kermit/default.nix index d320491756cf..f81d9b7266b6 100644 --- a/nixpkgs/pkgs/tools/misc/kermit/default.nix +++ b/nixpkgs/pkgs/tools/misc/kermit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "kermit-9.0.302"; src = fetchurl { - url = ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz; + url = "ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz"; sha256 = "0487mh6s99ijqf1pfmbm302pa5i4pzmm8s439hdl1ffs5g8jqpqd"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.kermitproject.org/ck90.html; + homepage = "http://www.kermitproject.org/ck90.html"; description = "Portable Scriptable Network and Serial Communication Software"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/misc/keychain/default.nix b/nixpkgs/pkgs/tools/misc/keychain/default.nix index e10b42273be8..a65d408fa6b2 100644 --- a/nixpkgs/pkgs/tools/misc/keychain/default.nix +++ b/nixpkgs/pkgs/tools/misc/keychain/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Keychain management tool"; - homepage = https://www.funtoo.org/Keychain; + homepage = "https://www.funtoo.org/Keychain"; license = stdenv.lib.licenses.gpl2; # other platforms are untested (AFAIK) platforms = diff --git a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix index 5e5a7174a149..c6ec5f3103fe 100644 --- a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Convert STL files into Gcode"; - homepage = http://www.kisslicer.com; + homepage = "http://www.kisslicer.com"; license = licenses.unfree; maintainers = [ maintainers.cransom ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix b/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix index d2fb32319bf7..37eed61008b4 100644 --- a/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/nawar/kodi-cli; + homepage = "https://github.com/nawar/kodi-cli"; description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/kt/default.nix b/nixpkgs/pkgs/tools/misc/kt/default.nix index c272584e2c05..9664759cf5a4 100644 --- a/nixpkgs/pkgs/tools/misc/kt/default.nix +++ b/nixpkgs/pkgs/tools/misc/kt/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Kafka command line tool"; - homepage = https://github.com/fgeller/kt; + homepage = "https://github.com/fgeller/kt"; maintainers = with maintainers; [ utdemir ]; platforms = with platforms; unix; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/latex2html/default.nix b/nixpkgs/pkgs/tools/misc/latex2html/default.nix index c379a0d1abc7..1d78210d298b 100644 --- a/nixpkgs/pkgs/tools/misc/latex2html/default.nix +++ b/nixpkgs/pkgs/tools/misc/latex2html/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { commands. ''; - homepage = https://www.ctan.org/pkg/latex2html; + homepage = "https://www.ctan.org/pkg/latex2html"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/nixpkgs/pkgs/tools/misc/lbdb/default.nix index 6624eb5102d3..7a6553461cb9 100644 --- a/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { + ":${perlldap}/${perl.libPrefix}"; meta = { - homepage = http://www.spinnaker.de/lbdb/; + homepage = "http://www.spinnaker.de/lbdb/"; license = licenses.gpl2; platforms = platforms.all; description = "The Little Brother's Database"; diff --git a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix index 3d2b7c5b214c..52e6b0c6a30a 100644 --- a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix +++ b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor. ''; - homepage = http://www.lichteblau.com/ldapvi/; + homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/ldmtool/default.nix b/nixpkgs/pkgs/tools/misc/ldmtool/default.nix index 2ec683484958..9c9751d35c32 100644 --- a/nixpkgs/pkgs/tools/misc/ldmtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/ldmtool/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool and library for managing Microsoft Windows Dynamic Disks"; - homepage = https://github.com/mdbooth/libldm; + homepage = "https://github.com/mdbooth/libldm"; maintainers = with maintainers; [ jensbin ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/less/default.nix b/nixpkgs/pkgs/tools/misc/less/default.nix index e98b085c78d5..9b1aa0dc5906 100644 --- a/nixpkgs/pkgs/tools/misc/less/default.nix +++ b/nixpkgs/pkgs/tools/misc/less/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = http://www.greenwoodsoftware.com/less/; + homepage = "http://www.greenwoodsoftware.com/less/"; description = "A more advanced file pager than ‘more’"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/misc/lesspipe/default.nix b/nixpkgs/pkgs/tools/misc/lesspipe/default.nix index bb99521cc27e..231e660f5826 100644 --- a/nixpkgs/pkgs/tools/misc/lesspipe/default.nix +++ b/nixpkgs/pkgs/tools/misc/lesspipe/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { plist and archive formats, perl storable data and gpg encrypted files. This does require additional helper programs being installed. ''; - homepage = https://github.com/wofr06/lesspipe; + homepage = "https://github.com/wofr06/lesspipe"; platforms = platforms.all; license = licenses.gpl2; maintainers = [ maintainers.martijnvermaat ]; diff --git a/nixpkgs/pkgs/tools/misc/lf/default.nix b/nixpkgs/pkgs/tools/misc/lf/default.nix index c2f281ecb17b..b1edabad6849 100644 --- a/nixpkgs/pkgs/tools/misc/lf/default.nix +++ b/nixpkgs/pkgs/tools/misc/lf/default.nix @@ -1,17 +1,19 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "lf"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1ld3q75v8rvp169w5p85z1vznqs9bhck6bm2f6fykxx16hmpb6ga"; + sha256 = "0kl9yrgph1i0jbxhlg3k0411436w80xw1s8dzd7v7h2raygkb4is"; }; - modSha256 = "14fvn8yjm9cnpsmzgxw2dypr3h8h36mxrbk7zma42w8rsp46jpz7"; + modSha256 = "1c6c6qg8yrhdhqsnqj3jw3x2hi8vrhfm47cp9xlkfnjfrz3nk6jp"; + + nativeBuildInputs = [ installShellFiles ]; # TODO: Setting buildFlags probably isn't working properly. I've tried a few # variants, e.g.: @@ -26,7 +28,9 @@ buildGoModule rec { ''; postInstall = '' - install -D --mode=444 lf.1 $out/share/man/man1/lf.1 + install -D --mode=444 lf.desktop $out/share/applications/lf.desktop + installManPage lf.1 + installShellCompletion etc/lf.{zsh,fish} ''; meta = with lib; { @@ -37,7 +41,8 @@ buildGoModule rec { the missing features are deliberately omitted since it is better if they are handled by external tools. ''; - homepage = https://godoc.org/github.com/gokcehan/lf; + homepage = "https://godoc.org/github.com/gokcehan/lf"; + changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index eb3b6aa11e6a..bad820c15069 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin client query library"; - homepage = https://github.com/libbitcoin/libbitcoin-client; + homepage = "https://github.com/libbitcoin/libbitcoin-client"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index d0395ecbd7f0..93d8ceed2b47 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin command line tool"; - homepage = https://github.com/libbitcoin/libbitcoin-explorer; + homepage = "https://github.com/libbitcoin/libbitcoin-explorer"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin asymmetric ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index cb9e2cbf1e84..fc660687ffc3 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin P2P Network Library"; - homepage = https://libbitcoin.org/; + homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ asymmetric ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 2c13927dfad8..a5467fdcbd7a 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin Blockchain Query Protocol"; - homepage = https://libbitcoin.org/; + homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ asymmetric ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 8009fe563ee1..e68635585d0f 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ library for building bitcoin applications"; - homepage = https://libbitcoin.org/; + homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin ]; diff --git a/nixpkgs/pkgs/tools/misc/libcpuid/default.nix b/nixpkgs/pkgs/tools/misc/libcpuid/default.nix index e31112a74d8a..b0fe00d44d9c 100644 --- a/nixpkgs/pkgs/tools/misc/libcpuid/default.nix +++ b/nixpkgs/pkgs/tools/misc/libcpuid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = http://libcpuid.sourceforge.net/; + homepage = "http://libcpuid.sourceforge.net/"; description = "A small C library for x86 CPU detection and feature extraction"; license = licenses.bsd2; maintainers = with maintainers; [ orivej artuuge ]; diff --git a/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix b/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix new file mode 100644 index 000000000000..c34e934fba48 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "libgen-cli"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "ciehanski"; + repo = pname; + rev = "v${version}"; + sha256 = "1lfsnyzin2dqhwhz6phms6yipli88sqiw55ls18dfv7bvx30sqlp"; + }; + + modSha256 = "1k16zjb7p65g72hr9vsk38jhpsy1yclm7fjgq47qy6jwjd44w1bi"; + + subPackages = [ "." ]; + + meta = with lib; { + homepage = "https://github.com/ciehanski/libgen-cli"; + description = + "A CLI tool used to access the Library Genesis dataset; written in Go"; + longDescription = '' + libgen-cli is a command line interface application which allows users to + quickly query the Library Genesis dataset and download any of its + contents. + ''; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ zaninime ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/lice/default.nix b/nixpkgs/pkgs/tools/misc/lice/default.nix index bb0f93ba3283..f4653f81f3a5 100644 --- a/nixpkgs/pkgs/tools/misc/lice/default.nix +++ b/nixpkgs/pkgs/tools/misc/lice/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "Print license based on selection and user options."; - homepage = https://github.com/licenses/lice; + homepage = "https://github.com/licenses/lice"; license = licenses.bsd3; maintainers = with maintainers; [ swflint ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix index 9bc7c372d93c..b6b722379da8 100644 --- a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix +++ b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to manage kernel-level quotas in Linux"; - homepage = https://sourceforge.net/projects/linuxquota/; + homepage = "https://sourceforge.net/projects/linuxquota/"; license = licenses.gpl2; # With some files being BSD as an exception platforms = platforms.linux; maintainers = [ maintainers.dezgeg ]; diff --git a/nixpkgs/pkgs/tools/misc/lnav/default.nix b/nixpkgs/pkgs/tools/misc/lnav/default.nix index 90560d321573..aab980d76e7e 100644 --- a/nixpkgs/pkgs/tools/misc/lnav/default.nix +++ b/nixpkgs/pkgs/tools/misc/lnav/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tstack/lnav; + homepage = "https://github.com/tstack/lnav"; description = "The Logfile Navigator"; longDescription = '' The log file navigator, lnav, is an enhanced log file viewer that takes diff --git a/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix b/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix index bc52598ff800..d33f6d8610af 100644 --- a/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix +++ b/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix @@ -22,7 +22,7 @@ stdenv_32bit.mkDerivation rec { ''; meta = with stdenv_32bit.lib; { - homepage = https://github.com/taviso/loadlibrary; + homepage = "https://github.com/taviso/loadlibrary"; description = "Porting Windows Dynamic Link Libraries to Linux"; platforms = platforms.linux; maintainers = [ maintainers.eleanor ]; diff --git a/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix b/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix index e851855834a4..e30b36919b77 100644 --- a/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix +++ b/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; - homepage = http://packages.debian.org/sid/lockfile-progs; + homepage = "http://packages.debian.org/sid/lockfile-progs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/nixpkgs/pkgs/tools/misc/logstash/6.x.nix b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix index c926d220b05d..ec8106e922ae 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/6.x.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; + homepage = "https://www.elastic.co/products/logstash"; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix index 1bd307337655..e7872b0c4061 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; + homepage = "https://www.elastic.co/products/logstash"; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/nixpkgs/pkgs/tools/misc/logstash/contrib.nix b/nixpkgs/pkgs/tools/misc/logstash/contrib.nix index b580d559868b..d03e031b7aee 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/contrib.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/contrib.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community-maintained logstash plugins"; - homepage = https://github.com/elasticsearch/logstash-contrib; + homepage = "https://github.com/elasticsearch/logstash-contrib"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ cstrahan ]; diff --git a/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock index ed48cc5921b0..e01cf81c61e8 100644 --- a/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES lolcat BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/lolcat/default.nix b/nixpkgs/pkgs/tools/misc/lolcat/default.nix index 25efcdf34611..f62be23108eb 100644 --- a/nixpkgs/pkgs/tools/misc/lolcat/default.nix +++ b/nixpkgs/pkgs/tools/misc/lolcat/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A rainbow version of cat"; - homepage = https://github.com/busyloop/lolcat; + homepage = "https://github.com/busyloop/lolcat"; license = licenses.bsd3; maintainers = with maintainers; [ StillerHarpo manveru nicknovitski ]; }; diff --git a/nixpkgs/pkgs/tools/misc/loop/default.nix b/nixpkgs/pkgs/tools/misc/loop/default.nix index 2b5bb1989f42..73907e233ab0 100644 --- a/nixpkgs/pkgs/tools/misc/loop/default.nix +++ b/nixpkgs/pkgs/tools/misc/loop/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; - homepage = https://github.com/Miserlou/Loop; + homepage = "https://github.com/Miserlou/Loop"; maintainers = with maintainers; [ koral ]; license = licenses.mit; }; diff --git a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix index 11351790becc..112a14f55f24 100644 --- a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix +++ b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--program-transform-name=s/^l//" ]; meta = with stdenv.lib; { - homepage = https://ohse.de/uwe/software/lrzsz.html; + homepage = "https://ohse.de/uwe/software/lrzsz.html"; description = "Communication package providing the XMODEM, YMODEM ZMODEM file transfer protocols"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/lsd/default.nix b/nixpkgs/pkgs/tools/misc/lsd/default.nix index 24006e5cbd95..6291ad013ea5 100644 --- a/nixpkgs/pkgs/tools/misc/lsd/default.nix +++ b/nixpkgs/pkgs/tools/misc/lsd/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym"; + sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai"; }; - cargoSha256 = "1z7sg9b7qsjw1hhc7dkvxz8xgf4k8jddr7gbnjr4d2569g97jf3f"; + cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr"; - preFixup = '' - install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd - install -Dm644 -t $out/share/fish/vendor_completions.d/ target/release/build/lsd-*/out/lsd.fish - install -Dm644 -t $out/share/bash-completion/completions/ target/release/build/lsd-*/out/lsd.bash + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion target/release/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; - # Some tests fail, but Travis ensures a proper build - doCheck = false; - meta = with stdenv.lib; { - homepage = https://github.com/Peltoche/lsd; + homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ filalex77 marsam ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/ltunify/default.nix b/nixpkgs/pkgs/tools/misc/ltunify/default.nix index 84a92ec77128..e345f86e0212 100644 --- a/nixpkgs/pkgs/tools/misc/ltunify/default.nix +++ b/nixpkgs/pkgs/tools/misc/ltunify/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool for working with Logitech Unifying receivers and devices"; - homepage = https://lekensteyn.nl/logitech-unifying.html; + homepage = "https://lekensteyn.nl/logitech-unifying.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/makebootfat/default.nix b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix index e23e12bcb307..dc66976720d0 100644 --- a/nixpkgs/pkgs/tools/misc/makebootfat/default.nix +++ b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create bootable USB disks using the FAT filesystem and syslinux"; - homepage = http://advancemame.sourceforge.net/boot-readme.html; + homepage = "http://advancemame.sourceforge.net/boot-readme.html"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/man-db/default.nix b/nixpkgs/pkgs/tools/misc/man-db/default.nix index 918e8372dcbb..f19e5fd5b9df 100644 --- a/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin; meta = with stdenv.lib; { - homepage = http://man-db.nongnu.org; + homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/mandoc/default.nix b/nixpkgs/pkgs/tools/misc/mandoc/default.nix index 828e23582363..82fc1dee00c3 100644 --- a/nixpkgs/pkgs/tools/misc/mandoc/default.nix +++ b/nixpkgs/pkgs/tools/misc/mandoc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mandoc.bsd.lv/; + homepage = "https://mandoc.bsd.lv/"; description = "suite of tools compiling mdoc and man"; downloadPage = "http://mandoc.bsd.lv/snapshots/"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/misc/massren/default.nix b/nixpkgs/pkgs/tools/misc/massren/default.nix index 6d198a35605d..4c9d5a6da8a2 100644 --- a/nixpkgs/pkgs/tools/misc/massren/default.nix +++ b/nixpkgs/pkgs/tools/misc/massren/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with lib; { description = "Easily rename multiple files using your text editor"; license = licenses.mit; - homepage = https://github.com/laurent22/massren; + homepage = "https://github.com/laurent22/massren"; maintainers = with maintainers; [ andrew-d ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/nixpkgs/pkgs/tools/misc/mcfly/default.nix index e9ba1c3b5d1f..f206c54a0037 100644 --- a/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv"; meta = with stdenv.lib; { - homepage = https://github.com/cantino/mcfly; + homepage = "https://github.com/cantino/mcfly"; description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; diff --git a/nixpkgs/pkgs/tools/misc/mcrypt/default.nix b/nixpkgs/pkgs/tools/misc/mcrypt/default.nix index bc520c57a338..9969148e2232 100644 --- a/nixpkgs/pkgs/tools/misc/mcrypt/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcrypt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { for the old Unix crypt, except that they are under the GPL and support an ever-wider range of algorithms and modes. ''; - homepage = http://mcrypt.sourceforge.net; + homepage = "http://mcrypt.sourceforge.net"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/nixpkgs/pkgs/tools/misc/mdbtools/default.nix b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix index b365086c46d3..0a887531fb86 100644 --- a/nixpkgs/pkgs/tools/misc/mdbtools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = ".mdb (MS Access) format tools"; - homepage = http://mdbtools.sourceforge.net; + homepage = "http://mdbtools.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; }; diff --git a/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix b/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix index 71409b1c3a8b..9f029ee5ded3 100644 --- a/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix +++ b/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "memtest86-efi"; - version = "8.2"; + version = "8.3"; src = fetchzip { - # TODO: The latest version of memtest86 is actually 8.2, but the + # TODO: We're using the previous version of memtest86 because the # company developing memtest86 has stopped providing a versioned download # link for the latest version: # @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # binaries that we make sure to version, then we could probably keep up # with the latest versions released by the company. url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; - sha256 = "1x1wjssr4nnbnfan0pi7ni2dfwnm3288kq584hkfqcyza8xdx03i"; + sha256 = "0aldz7rvnfnzb4h447q10k9c9p5ghwzdyn7f6g5lrxiv5vxf3x96"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/misc/mht2htm/default.nix b/nixpkgs/pkgs/tools/misc/mht2htm/default.nix index e382db0b92c3..31f645e48ceb 100644 --- a/nixpkgs/pkgs/tools/misc/mht2htm/default.nix +++ b/nixpkgs/pkgs/tools/misc/mht2htm/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert .mht files to .html"; - homepage = http://pgm.bpalanka.com/mht2htm.html; + homepage = "http://pgm.bpalanka.com/mht2htm.html"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/mimeo/default.nix b/nixpkgs/pkgs/tools/misc/mimeo/default.nix index ea596a942137..55cc9717688a 100644 --- a/nixpkgs/pkgs/tools/misc/mimeo/default.nix +++ b/nixpkgs/pkgs/tools/misc/mimeo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { - name = "mimeo-${version}"; + pname = "mimeo"; version = "2019.7"; src = fetchurl { - url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; + url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz"; sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r"; }; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Open files by MIME-type or file name using regular expressions"; - homepage = http://xyne.archlinux.ca/projects/mimeo/; + homepage = "http://xyne.archlinux.ca/projects/mimeo/"; license = [ licenses.gpl2 ]; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/minicom/default.nix b/nixpkgs/pkgs/tools/misc/minicom/default.nix index 168e1dac3a32..35c04faf4592 100644 --- a/nixpkgs/pkgs/tools/misc/minicom/default.nix +++ b/nixpkgs/pkgs/tools/misc/minicom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Modem control and terminal emulation program"; - homepage = https://salsa.debian.org/minicom-team/minicom; + homepage = "https://salsa.debian.org/minicom-team/minicom"; license = licenses.gpl2; longDescription = '' Minicom is a menu driven communications program. It emulates ANSI diff --git a/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 9add75acee20..ea3afdab0982 100644 --- a/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -1,13 +1,20 @@ -{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkg-config, zlib, openssl }: +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, zlib +, openssl +, Security +}: rustPlatform.buildRustPackage rec { pname = "miniserve"; version = "0.6.0"; src = fetchFromGitHub { - owner = "svenstaro"; - repo = "miniserve"; - rev = "v${version}"; + owner = "svenstaro"; + repo = "miniserve"; + rev = "v${version}"; sha256 = "0ybxnxjg0vqm4q60z4zjl3hfls0s2rvy44m6jgyhlj1p6cr3dbyw"; }; @@ -15,14 +22,14 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - nativeBuildInputs = [ cmake pkg-config zlib ]; - buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config zlib ]; + buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; meta = with stdenv.lib; { description = "For when you really just want to serve some files over HTTP right now!"; - homepage = "https://github.com/svenstaro/miniserve"; - license = with licenses; [ mit ]; + homepage = "https://github.com/svenstaro/miniserve"; + license = with licenses; [ mit ]; maintainers = with maintainers; [ nequissimus ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/ministat/default.nix b/nixpkgs/pkgs/tools/misc/ministat/default.nix index 7b8b8a82b727..dfc2e2c624ed 100644 --- a/nixpkgs/pkgs/tools/misc/ministat/default.nix +++ b/nixpkgs/pkgs/tools/misc/ministat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple tool for statistical comparison of data sets"; - homepage = https://git.decadent.org.uk/gitweb/?p=ministat.git; + homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git"; license = licenses.beerware; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/mktorrent/default.nix b/nixpkgs/pkgs/tools/misc/mktorrent/default.nix index c88f12c74d1a..485c3403cff7 100644 --- a/nixpkgs/pkgs/tools/misc/mktorrent/default.nix +++ b/nixpkgs/pkgs/tools/misc/mktorrent/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; meta = { - homepage = http://mktorrent.sourceforge.net/; + homepage = "http://mktorrent.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; maintainers = with stdenv.lib.maintainers; [Profpatsch]; diff --git a/nixpkgs/pkgs/tools/misc/mlocate/default.nix b/nixpkgs/pkgs/tools/misc/mlocate/default.nix index f8fb253af471..d3f406c53552 100644 --- a/nixpkgs/pkgs/tools/misc/mlocate/default.nix +++ b/nixpkgs/pkgs/tools/misc/mlocate/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Merging locate is an utility to index and quickly search for files"; - homepage = https://pagure.io/mlocate; + homepage = "https://pagure.io/mlocate"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/tools/misc/mmake/default.nix b/nixpkgs/pkgs/tools/misc/mmake/default.nix index a791cbe5d482..e272c56e0acd 100644 --- a/nixpkgs/pkgs/tools/misc/mmake/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmake/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/tj/mmake; + homepage = "https://github.com/tj/mmake"; description = "A small program which wraps make to provide additional functionality"; longDescription = '' Mmake is a small program which wraps make to provide additional diff --git a/nixpkgs/pkgs/tools/misc/mmv/default.nix b/nixpkgs/pkgs/tools/misc/mmv/default.nix index 6129f15c734f..48c3b3932628 100644 --- a/nixpkgs/pkgs/tools/misc/mmv/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmv/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://linux.maruhn.com/sec/mmv.html; + homepage = "http://linux.maruhn.com/sec/mmv.html"; description = "Utility for wildcard renaming, copying, etc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index 95c87cb35fc6..bdc3ac4ddebd 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "The GUI for MongoDB"; - homepage = https://www.mongodb.com/products/compass; + homepage = "https://www.mongodb.com/products/compass"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix index dbccbf9b2f64..f216e358d8ad 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix @@ -52,7 +52,7 @@ in buildGoPackage { ''; meta = { - homepage = https://github.com/mongodb/mongo-tools; + homepage = "https://github.com/mongodb/mongo-tools"; description = "Tools for the MongoDB"; license = lib.licenses.asl20; }; diff --git a/nixpkgs/pkgs/tools/misc/moreutils/default.nix b/nixpkgs/pkgs/tools/misc/moreutils/default.nix index 44f791e5b8aa..92402797d112 100644 --- a/nixpkgs/pkgs/tools/misc/moreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/moreutils/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; - homepage = https://joeyh.name/code/moreutils/; + homepage = "https://joeyh.name/code/moreutils/"; maintainers = with maintainers; [ koral pSub ]; platforms = platforms.all; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix index df84084fc9c1..49f9c6bc0313 100644 --- a/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix +++ b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; - homepage = https://www.musicpd.org/clients/mpdscribble/; + homepage = "https://www.musicpd.org/clients/mpdscribble/"; license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/mrtg/default.nix b/nixpkgs/pkgs/tools/misc/mrtg/default.nix index 922592a256d0..047cd87308f5 100644 --- a/nixpkgs/pkgs/tools/misc/mrtg/default.nix +++ b/nixpkgs/pkgs/tools/misc/mrtg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The Multi Router Traffic Grapher"; - homepage = https://oss.oetiker.ch/mrtg/; + homepage = "https://oss.oetiker.ch/mrtg/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.robberer ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/ms-sys/default.nix b/nixpkgs/pkgs/tools/misc/ms-sys/default.nix index 0a862834dfb7..315dbce74070 100644 --- a/nixpkgs/pkgs/tools/misc/ms-sys/default.nix +++ b/nixpkgs/pkgs/tools/misc/ms-sys/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program for writing Microsoft-compatible boot records"; - homepage = http://ms-sys.sourceforge.net/; + homepage = "http://ms-sys.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/misc/mstflint/default.nix b/nixpkgs/pkgs/tools/misc/mstflint/default.nix index f3cd1c6e5277..c44934ef45c3 100644 --- a/nixpkgs/pkgs/tools/misc/mstflint/default.nix +++ b/nixpkgs/pkgs/tools/misc/mstflint/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libibmad ]; meta = with stdenv.lib; { - homepage = https://www.openfabrics.org/; + homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; broken = true; # 2018-04-11 diff --git a/nixpkgs/pkgs/tools/misc/multitail/default.nix b/nixpkgs/pkgs/tools/misc/multitail/default.nix index 6ca0c6e8e08f..e0ac18a76b2d 100644 --- a/nixpkgs/pkgs/tools/misc/multitail/default.nix +++ b/nixpkgs/pkgs/tools/misc/multitail/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.vanheusden.com/multitail/; + homepage = "http://www.vanheusden.com/multitail/"; description = "tail on Steroids"; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/mutagen/default.nix b/nixpkgs/pkgs/tools/misc/mutagen/default.nix index c029f38acb2c..8940fef2a0dd 100644 --- a/nixpkgs/pkgs/tools/misc/mutagen/default.nix +++ b/nixpkgs/pkgs/tools/misc/mutagen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mutagen"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Make remote development work with your local tools"; homepage = "https://mutagen.io/"; changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix index 83e6ee5b5ca4..829bb7f5be79 100644 --- a/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "mysql2pgsql-0.0.1a"; src = fetchurl { - url = http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz; + url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz"; sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Convert MySQL dump files to PostgreSQL-loadable files"; - homepage = http://pgfoundry.org/projects/mysql2pgsql/; + homepage = "http://pgfoundry.org/projects/mysql2pgsql/"; license = stdenv.lib.licenses.bsdOriginal; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix index 9b7453ad1cc7..2f7889111b0e 100644 --- a/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix +++ b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; - homepage = http://mysqltuner.com; + homepage = "http://mysqltuner.com"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix index 525c16b6024b..9b063947a449 100644 --- a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix +++ b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A status monitor for the desktop"; - homepage = https://nagstamon.ifw-dresden.de/; + homepage = "https://nagstamon.ifw-dresden.de/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; inherit version; diff --git a/nixpkgs/pkgs/tools/misc/nbench/default.nix b/nixpkgs/pkgs/tools/misc/nbench/default.nix index a1a6347642b6..950f3883f8f4 100644 --- a/nixpkgs/pkgs/tools/misc/nbench/default.nix +++ b/nixpkgs/pkgs/tools/misc/nbench/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.math.utah.edu/~mayer/linux/bmark.html; + homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html"; description = "A synthetic computing benchmark program"; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ bennofs ]; diff --git a/nixpkgs/pkgs/tools/misc/ncdu/default.nix b/nixpkgs/pkgs/tools/misc/ncdu/default.nix index f47a43ab5d24..7eddca8ca6de 100644 --- a/nixpkgs/pkgs/tools/misc/ncdu/default.nix +++ b/nixpkgs/pkgs/tools/misc/ncdu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Disk usage analyzer with an ncurses interface"; - homepage = https://dev.yorhel.nl/ncdu; + homepage = "https://dev.yorhel.nl/ncdu"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix index db60010490e5..c9726d7e0403 100644 --- a/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "nginx config file formatter"; maintainers = with maintainers; [ Baughn ]; license = licenses.asl20; - homepage = https://github.com/1connect/nginx-config-formatter; + homepage = "https://github.com/1connect/nginx-config-formatter"; }; } diff --git a/nixpkgs/pkgs/tools/misc/noteshrink/default.nix b/nixpkgs/pkgs/tools/misc/noteshrink/default.nix index b197e9bc5d2e..b934b1288703 100644 --- a/nixpkgs/pkgs/tools/misc/noteshrink/default.nix +++ b/nixpkgs/pkgs/tools/misc/noteshrink/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Convert scans of handwritten notes to beautiful, compact PDFs"; - homepage = https://mzucker.github.io/2016/09/20/noteshrink.html; + homepage = "https://mzucker.github.io/2016/09/20/noteshrink.html"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/nixpkgs/pkgs/tools/misc/noti/default.nix b/nixpkgs/pkgs/tools/misc/noti/default.nix index a6288b322957..ac06b44055c1 100644 --- a/nixpkgs/pkgs/tools/misc/noti/default.nix +++ b/nixpkgs/pkgs/tools/misc/noti/default.nix @@ -32,7 +32,7 @@ buildGoPackage rec { Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone. ''; - homepage = https://github.com/variadico/noti; + homepage = "https://github.com/variadico/noti"; license = licenses.mit; maintainers = with maintainers; [ stites marsam ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/ntfy/default.nix b/nixpkgs/pkgs/tools/misc/ntfy/default.nix index 26517361ae2d..a3cf6ad07d5b 100644 --- a/nixpkgs/pkgs/tools/misc/ntfy/default.nix +++ b/nixpkgs/pkgs/tools/misc/ntfy/default.nix @@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A utility for sending notifications, on demand and when commands finish"; - homepage = http://ntfy.rtfd.org/; + homepage = "http://ntfy.rtfd.org/"; license = licenses.gpl3; maintainers = with maintainers; [ jfrankenau kamilchm ]; }; diff --git a/nixpkgs/pkgs/tools/misc/nyancat/default.nix b/nixpkgs/pkgs/tools/misc/nyancat/default.nix index 47a91915c431..a7b066147850 100644 --- a/nixpkgs/pkgs/tools/misc/nyancat/default.nix +++ b/nixpkgs/pkgs/tools/misc/nyancat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Nyancat in your terminal, rendered through ANSI escape sequences."; - homepage = https://nyancat.dakko.us; + homepage = "https://nyancat.dakko.us"; license = licenses.ncsa; maintainers = with maintainers; [ midchildan ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix b/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix index 3b45b7b06442..8cac6d1c3f5a 100644 --- a/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "A collection of tools for working with the OCI image format specification"; - homepage = https://github.com/opencontainers/image-tools; + homepage = "https://github.com/opencontainers/image-tools"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nzhang-zh ]; }; diff --git a/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix b/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix index d54302b31d1d..00926663a6c0 100644 --- a/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = { - homepage = http://ocz.com/ssd-guru; + homepage = "http://ocz.com/ssd-guru"; description = "SSD Management Tool for OCZ disks"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/odyssey/default.nix b/nixpkgs/pkgs/tools/misc/odyssey/default.nix index 160474f81523..f736184ea50e 100644 --- a/nixpkgs/pkgs/tools/misc/odyssey/default.nix +++ b/nixpkgs/pkgs/tools/misc/odyssey/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scalable PostgreSQL connection pooler"; - homepage = https://github.com/yandex/odyssey; + homepage = "https://github.com/yandex/odyssey"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix b/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix index 8cc5cd7f6f2b..4d65a406e53a 100644 --- a/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool to create and verify OpenTimestamps proofs"; - homepage = https://github.com/opentimestamps/opentimestamps-client; + homepage = "https://github.com/opentimestamps/opentimestamps-client"; license = lib.licenses.lgpl3; }; } diff --git a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index 2888b2a11861..3b9623d5ad0a 100644 --- a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Time series database with millisecond precision"; - homepage = http://opentsdb.net; + homepage = "http://opentsdb.net"; license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ maintainers.ocharles ]; diff --git a/nixpkgs/pkgs/tools/misc/os-prober/default.nix b/nixpkgs/pkgs/tools/misc/os-prober/default.nix index c776144a40d0..9b2afed0a9a1 100644 --- a/nixpkgs/pkgs/tools/misc/os-prober/default.nix +++ b/nixpkgs/pkgs/tools/misc/os-prober/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { description = "Utility to detect other OSs on a set of drives"; - homepage = http://packages.debian.org/source/sid/os-prober; + homepage = "http://packages.debian.org/source/sid/os-prober"; license = licenses.gpl2Plus; maintainers = with maintainers; [ symphorien ]; }; diff --git a/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix index 0b7a7826a972..3e678b1d378a 100644 --- a/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for managing the osinfo database"; - homepage = https://libosinfo.org/; + homepage = "https://libosinfo.org/"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/misc/otfcc/default.nix b/nixpkgs/pkgs/tools/misc/otfcc/default.nix index 4b28a7c45e5d..c3ca53616f78 100644 --- a/nixpkgs/pkgs/tools/misc/otfcc/default.nix +++ b/nixpkgs/pkgs/tools/misc/otfcc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "otfcc"; - version = "0.9.6"; + version = "0.10.4"; src = fetchFromGitHub { owner = "caryll"; repo = "otfcc"; rev = "v${version}"; - sha256 = "1rnjfqqyc6d9nhlh8if9k37wk94mcwz4wf3k239v6idg48nrk10b"; + sha256 = "1nrkzpqklfpqsccji4ans40rj88l80cv7dpxwx4g577xrvk13a0f"; }; nativeBuildInputs = [ premake5 ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimized OpenType builder and inspector"; - homepage = https://github.com/caryll/otfcc; + homepage = "https://github.com/caryll/otfcc"; license = licenses.asl20; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ jfrankenau ttuegel ]; diff --git a/nixpkgs/pkgs/tools/misc/page/default.nix b/nixpkgs/pkgs/tools/misc/page/default.nix new file mode 100644 index 000000000000..07109515c5c3 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/page/default.nix @@ -0,0 +1,32 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "page"; + version = "2.3.4"; + + src = fetchFromGitHub { + owner = "I60R"; + repo = pname; + rev = "v${version}"; + sha256 = "0xcbnl8fbdfdmcbv5d7v830aa3vfhg7nlf768rbrfd5a0970pllh"; + }; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + completions_dir=$(find "target" -name "shell_completions" -type d -printf "%T+\t%p\n" | sort | awk 'NR==1{print $2}') + + installShellCompletion --bash $completions_dir/page.bash + installShellCompletion --fish $completions_dir/page.fish + installShellCompletion --zsh $completions_dir/_page + ''; + + cargoSha256 = "0ckfmqi6jvbvj99vbdp798mmy6gc54254n32br0ri842b04i26qf"; + + meta = with lib; { + description = "Use neovim as pager"; + homepage = "https://github.com/I60R/page"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.s1341 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/pal/default.nix b/nixpkgs/pkgs/tools/misc/pal/default.nix index 85bad70edc9c..c285dc2463bb 100644 --- a/nixpkgs/pkgs/tools/misc/pal/default.nix +++ b/nixpkgs/pkgs/tools/misc/pal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://palcal.sourceforge.net/; + homepage = "http://palcal.sourceforge.net/"; description = "Command-line calendar program that can keep track of events"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/misc/parallel-rust/default.nix b/nixpkgs/pkgs/tools/misc/parallel-rust/default.nix deleted file mode 100644 index 213e8c8e378a..000000000000 --- a/nixpkgs/pkgs/tools/misc/parallel-rust/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "parallel-rust"; - version = "0.11.3"; - - src = fetchFromGitHub { - owner = "mmstick"; - repo = "parallel"; - rev = version; - sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c"; - }; - - cargoSha256 = "1r5chjhmy6ivhsvgqf75ph1qxa4x7n20f7rb3b6maqpbsc64km9n"; - - patches = [ ./fix_cargo_lock_version.patch ]; - - meta = with stdenv.lib; { - description = "A command-line CPU load balancer written in Rust"; - homepage = https://github.com/mmstick/parallel; - license = licenses.mit; - maintainers = []; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch b/nixpkgs/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch deleted file mode 100644 index 75a1ba35e129..000000000000 --- a/nixpkgs/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index c01308d..dba3927 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,6 +1,6 @@ - [root] - name = "parallel" --version = "0.11.2" -+version = "0.11.3" - dependencies = [ - "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index 77fdbcf8ac34..d55b2cd6f248 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/parallel/"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ pSub vrthra ]; + maintainers = with maintainers; [ pSub vrthra tomberek ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix b/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix new file mode 100644 index 000000000000..b85dfc56f3d6 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix @@ -0,0 +1,13 @@ +{ parallel, makeWrapper , runCommand +, perlPackages +, extraPerlPackages ? + with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] +}: + +runCommand "parallel-full" { + nativeBuildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ + --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" + '' diff --git a/nixpkgs/pkgs/tools/misc/parcellite/default.nix b/nixpkgs/pkgs/tools/misc/parcellite/default.nix index 46606e3b43be..97c67f59b084 100644 --- a/nixpkgs/pkgs/tools/misc/parcellite/default.nix +++ b/nixpkgs/pkgs/tools/misc/parcellite/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight GTK clipboard manager"; - homepage = https://github.com/rickyrockrat/parcellite; + homepage = "https://github.com/rickyrockrat/parcellite"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/parted/default.nix b/nixpkgs/pkgs/tools/misc/parted/default.nix index 0eed491e8a90..808b0382f321 100644 --- a/nixpkgs/pkgs/tools/misc/parted/default.nix +++ b/nixpkgs/pkgs/tools/misc/parted/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { which also serves as a sample implementation and script backend. ''; - homepage = https://www.gnu.org/software/parted/; + homepage = "https://www.gnu.org/software/parted/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ diff --git a/nixpkgs/pkgs/tools/misc/partition-manager/default.nix b/nixpkgs/pkgs/tools/misc/partition-manager/default.nix index ab3c4b5a6c46..1b5f7dbdbece 100644 --- a/nixpkgs/pkgs/tools/misc/partition-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/partition-manager/default.nix @@ -26,7 +26,7 @@ in mkDerivation rec { meta = with lib; { description = "KDE Partition Manager"; license = licenses.gpl2; - homepage = https://www.kde.org/applications/system/kdepartitionmanager/; + homepage = "https://www.kde.org/applications/system/kdepartitionmanager/"; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/pastebinit/default.nix b/nixpkgs/pkgs/tools/misc/pastebinit/default.nix index c2c8e2b85733..a3134f57397c 100644 --- a/nixpkgs/pkgs/tools/misc/pastebinit/default.nix +++ b/nixpkgs/pkgs/tools/misc/pastebinit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://launchpad.net/pastebinit; + homepage = "https://launchpad.net/pastebinit"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/misc/patdiff/default.nix b/nixpkgs/pkgs/tools/misc/patdiff/default.nix index 1c5e5b044741..e0b54e56081d 100644 --- a/nixpkgs/pkgs/tools/misc/patdiff/default.nix +++ b/nixpkgs/pkgs/tools/misc/patdiff/default.nix @@ -4,7 +4,7 @@ with ocamlPackages; janePackage { pname = "patdiff"; - hash = "04krzn6rj2r81z55pms5ayk6bxhlxrm006cbhy0m6rc69a0h00lh"; + hash = "1yqvxdmkgcwgx3npgncpdqwkpdxiqr1q41wci7589s8z7xi5nwyz"; buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre shell ]; meta = { description = "File Diff using the Patience Diff algorithm"; diff --git a/nixpkgs/pkgs/tools/misc/pazi/default.nix b/nixpkgs/pkgs/tools/misc/pazi/default.nix index dd64200e1301..cc7e7b043e0e 100644 --- a/nixpkgs/pkgs/tools/misc/pazi/default.nix +++ b/nixpkgs/pkgs/tools/misc/pazi/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "An autojump \"zap to directory\" helper"; - homepage = https://github.com/euank/pazi; + homepage = "https://github.com/euank/pazi"; license = licenses.gpl3; maintainers = with maintainers; [ bbigras ]; }; diff --git a/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix b/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix new file mode 100644 index 000000000000..3fee457f6f54 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix @@ -0,0 +1,34 @@ +{ stdenv, python3Packages, fetchzip }: + +python3Packages.buildPythonApplication { + pname = "pdf-parser"; + version = "0.7.4"; + + src = fetchzip { + url = "https://didierstevens.com/files/software/pdf-parser_V0_7_4.zip"; + sha256 = "1j39yww2yl4cav8xgd4zfl5jchbbkvffnrynkamkzvz9dd5np2mh"; + }; + + format = "other"; + + installPhase = '' + install -Dm555 pdf-parser.py $out/bin/pdf-parser.py + ''; + + preFixup = '' + substituteInPlace $out/bin/pdf-parser.py \ + --replace '/usr/bin/python' '${python3Packages.python}/bin/python' + ''; + + meta = with stdenv.lib; { + description = "Parse a PDF document"; + longDescription = '' + This tool will parse a PDF document to identify the fundamental elements used in the analyzed file. + It will not render a PDF document. + ''; + homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; + license = licenses.publicDomain; + maintainers = [ maintainers.lightdiscord ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/pfetch/default.nix b/nixpkgs/pkgs/tools/misc/pfetch/default.nix index 49867331780f..bbecf4656e74 100644 --- a/nixpkgs/pkgs/tools/misc/pfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/pfetch/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "pfetch"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "pfetch"; rev = version; - sha256 = "0yg9nlrjnm2404ysm2qp1klpq1wlmyih302kzfqchn6l2sibsm4j"; + sha256 = "06z0k1naw3k052p2z7241lx92rp5m07zlr0alx8pdm6mkc3c4v8f"; }; dontBuild = true; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A pretty system information tool written in POSIX sh"; - homepage = https://github.com/dylanaraps/pfetch; + homepage = "https://github.com/dylanaraps/pfetch"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ equirosa ]; diff --git a/nixpkgs/pkgs/tools/misc/pg_top/default.nix b/nixpkgs/pkgs/tools/misc/pg_top/default.nix index 4f4bd7e754c4..ca3318d45c67 100644 --- a/nixpkgs/pkgs/tools/misc/pg_top/default.nix +++ b/nixpkgs/pkgs/tools/misc/pg_top/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { * View user index statistics. ''; - homepage = http://ptop.projects.postgresql.org/; + homepage = "http://ptop.projects.postgresql.org/"; platforms = platforms.linux; license = licenses.free; # see commands.c }; diff --git a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index 9eed1aaffd8e..fbd32cf876da 100644 --- a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgcenter"; @@ -13,10 +13,8 @@ buildGoModule rec { modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { - homepage = https://pgcenter.org/; + homepage = "https://pgcenter.org/"; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; diff --git a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index 04e106ca5522..632ba452ff97 100644 --- a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgmetrics"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "06w2kqjq2yq9yypg6biywrybnmi4jlnnigd7az72hp7lzf2nhl62"; + sha256 = "0f7pjagr3zcqmbhmk446j6n7nanyhvyq4rn68f5wljl9g68ni7sj"; }; - modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "13a969yki47gw4b3mwhsgl0x53xylmflsykcs63f8pmigckw7jac"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix b/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix index dd07fee34054..a66a6688ad41 100644 --- a/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix +++ b/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = http://docs.phraseapp.com; + homepage = "http://docs.phraseapp.com"; description = "PhraseApp API v2 Command Line Client"; platforms = platforms.all; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/picocom/default.nix b/nixpkgs/pkgs/tools/misc/picocom/default.nix index 1ad219403687..5dd83c4887b1 100644 --- a/nixpkgs/pkgs/tools/misc/picocom/default.nix +++ b/nixpkgs/pkgs/tools/misc/picocom/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Minimal dumb-terminal emulation program"; - homepage = https://github.com/npat-efault/picocom/; + homepage = "https://github.com/npat-efault/picocom/"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/pipelight/default.nix b/nixpkgs/pkgs/tools/misc/pipelight/default.nix index 4c7e9d0892ca..fe16406256f8 100644 --- a/nixpkgs/pkgs/tools/misc/pipelight/default.nix +++ b/nixpkgs/pkgs/tools/misc/pipelight/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://pipelight.net/; + homepage = "http://pipelight.net/"; license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/nixpkgs/pkgs/tools/misc/pipreqs/default.nix b/nixpkgs/pkgs/tools/misc/pipreqs/default.nix index 9925021b3f64..bbd4125c4b0e 100644 --- a/nixpkgs/pkgs/tools/misc/pipreqs/default.nix +++ b/nixpkgs/pkgs/tools/misc/pipreqs/default.nix @@ -17,7 +17,7 @@ python2Packages.buildPythonApplication rec { meta = with lib; { description = "Generate requirements.txt file for any project based on imports"; - homepage = https://github.com/bndr/pipreqs; + homepage = "https://github.com/bndr/pipreqs"; license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/nixpkgs/pkgs/tools/misc/pistol/default.nix b/nixpkgs/pkgs/tools/misc/pistol/default.nix new file mode 100644 index 000000000000..17e9dcbc33a1 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/pistol/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +, file +}: + +buildGoModule rec { + pname = "pistol"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "doronbehar"; + repo = pname; + rev = "v${version}"; + sha256 = "1zxvpmy6c26dhg5wpk5cgaqipw5372crkhm1vaghm8jkiw7sjwvw"; + }; + + modSha256 = "13yxcfd29ziprjsjl2ji7w5i2506hwwl3y0ycaphj2wlcd75rdxs"; + + subPackages = [ "cmd/pistol" ]; + + buildInputs = [ + file + ]; + + meta = with stdenv.lib; { + description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant"; + homepage = "https://github.com/doronbehar/pistol"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/pixd/default.nix b/nixpkgs/pkgs/tools/misc/pixd/default.nix index a16333f6e440..a2dc84ed6a93 100644 --- a/nixpkgs/pkgs/tools/misc/pixd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pixd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Colourful visualization tool for binary files"; - homepage = https://github.com/FireyFly/pixd; + homepage = "https://github.com/FireyFly/pixd"; maintainers = [ maintainers.FireyFly ]; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix index c1db4f9d5978..97628da67f76 100644 --- a/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "pk2cmd-1.20"; src = fetchurl { - url = https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz; + url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz"; sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ libusb makeWrapper ]; meta = { - homepage = https://www.microchip.com/pickit2; + homepage = "https://www.microchip.com/pickit2"; license = stdenv.lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; diff --git a/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix b/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix index 3c9c0f9bfaff..04d0c95b81a4 100644 --- a/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix +++ b/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for visualizing changes in Linux software packages"; - homepage = https://lvc.github.io/pkgdiff/; + homepage = "https://lvc.github.io/pkgdiff/"; license = licenses.gpl2; maintainers = with maintainers; [ sweber ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 0e9df5350f90..fec1bee160f9 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.2"; + version = "1.2020.5"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1wvlhy76h1bxwjj8r48ixypch1bj9m9721rbawayj8v0hpyr1an4"; + sha256 = "1cn1bjah9qvhh3hixa92v804crkgz69mg30k8229a551x3alykhd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/plotinus/default.nix b/nixpkgs/pkgs/tools/misc/plotinus/default.nix index 58a6c7c4071d..6440ed533f60 100644 --- a/nixpkgs/pkgs/tools/misc/plotinus/default.nix +++ b/nixpkgs/pkgs/tools/misc/plotinus/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A searchable command palette in every modern GTK application"; - homepage = https://github.com/p-e-w/plotinus; + homepage = "https://github.com/p-e-w/plotinus"; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; # No COPYING file, but headers in the source code diff --git a/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix b/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix index 5712e02e8ea0..757100251260 100644 --- a/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix +++ b/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = "http://mdocml.bsd.lv/"; description = "converter from POD into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix index 0c9d3a0ea799..b00f30991540 100644 --- a/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix +++ b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { term "browser" is used loosely since profile-cleaner happily works on some email clients and newsreaders too. ''; - homepage = https://github.com/graysky2/profile-cleaner; + homepage = "https://github.com/graysky2/profile-cleaner"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix b/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix index 9c07254e5873..ae70a82de4fe 100644 --- a/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { transparent user experience. ''; homepage = "https://github.com/graysky2/profile-sync-daemon"; - downloadPage = https://github.com/graysky2/profile-sync-daemon/releases; + downloadPage = "https://github.com/graysky2/profile-sync-daemon/releases"; license = licenses.mit; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/progress/default.nix b/nixpkgs/pkgs/tools/misc/progress/default.nix index 3edca413f3aa..bbde732aadf5 100644 --- a/nixpkgs/pkgs/tools/misc/progress/default.nix +++ b/nixpkgs/pkgs/tools/misc/progress/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/Xfennec/progress; + homepage = "https://github.com/Xfennec/progress"; description = "Tool that shows the progress of coreutils programs"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix b/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix index 335bddd6730e..74c049059941 100644 --- a/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix +++ b/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "proxytunnel-1.9.0"; src = fetchurl { - url = mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz; + url = "mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz"; sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; - homepage = http://proxytunnel.sourceforge.net/download.php; + homepage = "http://proxytunnel.sourceforge.net/download.php"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix index 4cf98ef8b485..1bd2fc259eea 100644 --- a/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "2.6.6"; + version = "2.7.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "0l20ysr61y99zxvm8cqsgj7arv4m7h7gqq8lrq65bmh9fxncfpsd"; + sha256 = "1fq8n5naicfv0lsyzfb52c84w40zrsks0x9rrvyyzih4vkhic4vm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/misc/pubs/default.nix b/nixpkgs/pkgs/tools/misc/pubs/default.nix index 4e840957ce32..96d1a5fc6a06 100644 --- a/nixpkgs/pkgs/tools/misc/pubs/default.nix +++ b/nixpkgs/pkgs/tools/misc/pubs/default.nix @@ -14,12 +14,12 @@ python3Packages.buildPythonApplication rec { patches = [ # Fix for bibtexparser 1.1.0 (fetchpatch { - url = https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch; + url = "https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch"; sha256 = "1n7zrk119v395jj8wqg8wlymc9l9pq3v752yy3kam9kflc0aashp"; }) # Fix test broken by PyYAML 5.1 (fetchpatch { - url = https://github.com/pubs/pubs/pull/194/commits/c3cb713ae76528eeeaaeb948fe319a76ab3934d8.patch; + url = "https://github.com/pubs/pubs/pull/194/commits/c3cb713ae76528eeeaaeb948fe319a76ab3934d8.patch"; sha256 = "05as418m7wzs65839bb91b2jrs8l68z8ldcjcd9cn4b9fcgsf3rk"; }) ]; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Command-line bibliography manager"; - homepage = https://github.com/pubs/pubs; + homepage = "https://github.com/pubs/pubs"; license = licenses.lgpl3; maintainers = with maintainers; [ gebner ]; }; diff --git a/nixpkgs/pkgs/tools/misc/pv/default.nix b/nixpkgs/pkgs/tools/misc/pv/default.nix index 3642653944b3..dd64366679c6 100644 --- a/nixpkgs/pkgs/tools/misc/pv/default.nix +++ b/nixpkgs/pkgs/tools/misc/pv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://www.ivarch.com/programs/pv; + homepage = "http://www.ivarch.com/programs/pv"; description = "Tool for monitoring the progress of data through a pipeline"; license = stdenv.lib.licenses.artistic2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/nixpkgs/pkgs/tools/misc/pws/Gemfile.lock b/nixpkgs/pkgs/tools/misc/pws/Gemfile.lock index c9cf6a3157c1..cad7909e406d 100644 --- a/nixpkgs/pkgs/tools/misc/pws/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/pws/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES pws BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/pws/default.nix b/nixpkgs/pkgs/tools/misc/pws/default.nix index 50952435dd76..0edec63c8c92 100644 --- a/nixpkgs/pkgs/tools/misc/pws/default.nix +++ b/nixpkgs/pkgs/tools/misc/pws/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line password safe"; - homepage = https://github.com/janlelis/pws; + homepage = "https://github.com/janlelis/pws"; license = licenses.mit; maintainers = with maintainers; [ swistak35 nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/qjoypad/default.nix b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix index 3e7e3870959b..2b8a2fb02be5 100644 --- a/nixpkgs/pkgs/tools/misc/qjoypad/default.nix +++ b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { of gaming devices in Linux, and makes the Linux gaming experience just a little bit nicer. ''; - homepage = http://qjoypad.sourceforge.net; + homepage = "http://qjoypad.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix index d7598b0c6dd5..97793b025577 100644 --- a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix +++ b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Qt5 Configuration Tool"; - homepage = https://www.opendesktop.org/content/show.php?content=168066; + homepage = "https://www.opendesktop.org/content/show.php?content=168066"; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ ralith ]; diff --git a/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix b/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix index 90498767c995..852c46b6d005 100644 --- a/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix +++ b/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Application to read current clocks of AMD Radeon cards"; - homepage = https://github.com/marazmista/radeon-profile; + homepage = "https://github.com/marazmista/radeon-profile"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/rcm/default.nix b/nixpkgs/pkgs/tools/misc/rcm/default.nix index 3d97874df7de..570b55c9acf3 100644 --- a/nixpkgs/pkgs/tools/misc/rcm/default.nix +++ b/nixpkgs/pkgs/tools/misc/rcm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Management Suite for Dotfiles"; - homepage = https://github.com/thoughtbot/rcm; + homepage = "https://github.com/thoughtbot/rcm"; license = licenses.bsd3; maintainers = with maintainers; [ malyn ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix b/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix index 88aff4f3c084..bf75213acdf6 100644 --- a/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix +++ b/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://rfc1149.net/devel/recoverjpeg.html; + homepage = "https://rfc1149.net/devel/recoverjpeg.html"; description = "Recover lost JPEGs and MOV files on a bogus memory card or disk"; license = licenses.gpl2; maintainers = with maintainers; [ dotlambda ]; diff --git a/nixpkgs/pkgs/tools/misc/recutils/default.nix b/nixpkgs/pkgs/tools/misc/recutils/default.nix index 8d648e293c5a..416fa23f4534 100644 --- a/nixpkgs/pkgs/tools/misc/recutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/recutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { number of named fields. ''; - homepage = https://www.gnu.org/software/recutils/; + homepage = "https://www.gnu.org/software/recutils/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/misc/remind/default.nix b/nixpkgs/pkgs/tools/misc/remind/default.nix index 91d8e4721307..46f78ddb093f 100644 --- a/nixpkgs/pkgs/tools/misc/remind/default.nix +++ b/nixpkgs/pkgs/tools/misc/remind/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation { name = "remind-3.1.16"; src = fetchurl { - url = https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz; + url = "https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz"; sha256 = "14yavwqmimba8rdpwx3wlav9sfb0v5rcd1iyzqrs08wx07a9pdzf"; }; @@ -38,7 +38,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://dianne.skoll.ca/projects/remind/; + homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; diff --git a/nixpkgs/pkgs/tools/misc/renameutils/default.nix b/nixpkgs/pkgs/tools/misc/renameutils/default.nix index b5e5d64dda68..73146f09792b 100644 --- a/nixpkgs/pkgs/tools/misc/renameutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/renameutils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "renameutils-0.12.0"; src = fetchurl { - url = mirror://savannah/renameutils/renameutils-0.12.0.tar.gz; + url = "mirror://savannah/renameutils/renameutils-0.12.0.tar.gz"; sha256 = "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ readline ]; meta = { - homepage = https://www.nongnu.org/renameutils/; + homepage = "https://www.nongnu.org/renameutils/"; description = "A set of programs to make renaming of files faster"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix index d52910b5a848..48e0f7757aeb 100644 --- a/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix +++ b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/algernon/riemann-c-client; + homepage = "https://github.com/algernon/riemann-c-client"; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock index 881b8aefcdf8..a3e1ea62a8c5 100644 --- a/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/riemann-tools/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES riemann-tools BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/rig/default.nix b/nixpkgs/pkgs/tools/misc/rig/default.nix index 627758e9c5e7..7e1d9307a167 100644 --- a/nixpkgs/pkgs/tools/misc/rig/default.nix +++ b/nixpkgs/pkgs/tools/misc/rig/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./rig_1.11-1.diff ]; meta = { - homepage = http://rig.sourceforge.net/; + homepage = "http://rig.sourceforge.net/"; description = "Random identity generator"; longDescription = '' RIG (Random Identity Generator) is a free replacement for a shareware diff --git a/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix b/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix index fb55b15bbd55..94d6ca95748f 100644 --- a/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/rkflashtool/; + homepage = "https://sourceforge.net/projects/rkflashtool/"; description = "Tools for flashing Rockchip devices"; platforms = platforms.linux; maintainers = [ maintainers.viric ]; diff --git a/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix index 96df0707153f..c19b0f1f9acd 100644 --- a/nixpkgs/pkgs/tools/misc/rlwrap/default.nix +++ b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Readline wrapper for console programs"; - homepage = https://github.com/hanslub42/rlwrap; + homepage = "https://github.com/hanslub42/rlwrap"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/nixpkgs/pkgs/tools/misc/rmlint/default.nix b/nixpkgs/pkgs/tools/misc/rmlint/default.nix index 408660bf3d9a..cbe1f7d407ce 100644 --- a/nixpkgs/pkgs/tools/misc/rmlint/default.nix +++ b/nixpkgs/pkgs/tools/misc/rmlint/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; - homepage = https://rmlint.readthedocs.org; + homepage = "https://rmlint.readthedocs.org"; platforms = platforms.linux; license = licenses.gpl3; maintainers = [ maintainers.koral ]; diff --git a/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix b/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix index 232949b7dace..995a8b5eb156 100644 --- a/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix +++ b/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libusb1 , qtbase, qttools, makeWrapper, qmake -, withEspeak ? false, espeak ? null }: +, withEspeak ? false, espeak ? null, qt5 }: let inherit (stdenv.lib) getDev; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 qtbase qttools ] ++ stdenv.lib.optional withEspeak espeak; - nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; + nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; postPatch = '' sed -i rbutil/rbutilqt/rbutilqt.pro \ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source firmware for mp3 players"; - homepage = https://www.rockbox.org; + homepage = "https://www.rockbox.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu ]; diff --git a/nixpkgs/pkgs/tools/misc/roundup/default.nix b/nixpkgs/pkgs/tools/misc/roundup/default.nix index 7eebc1943009..8d0c62889f99 100644 --- a/nixpkgs/pkgs/tools/misc/roundup/default.nix +++ b/nixpkgs/pkgs/tools/misc/roundup/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A unit testing tool for running test plans which are written in any POSIX shell"; - homepage = http://bmizerany.github.io/roundup/; + homepage = "http://bmizerany.github.io/roundup/"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/routino/default.nix b/nixpkgs/pkgs/tools/misc/routino/default.nix index d946ed91c726..aad63b66ec47 100644 --- a/nixpkgs/pkgs/tools/misc/routino/default.nix +++ b/nixpkgs/pkgs/tools/misc/routino/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.routino.org/; + homepage = "http://www.routino.org/"; description = "OpenStreetMap Routing Software"; license = licenses.agpl3; maintainers = with maintainers; [ dotlambda ]; diff --git a/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index 79003ff1ecfe..41e59162905a 100644 --- a/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { pcre check python - # libdnf + + # libdnf # vendored unstable branch + # required by vendored libdnf json_c zchunk libmodulemd_1 - utillinux + utillinux # for smartcols.pc sqlite cppunit ]; diff --git a/nixpkgs/pkgs/tools/misc/rrdtool/default.nix b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix index 8365a47830ad..10ff6db63f15 100644 --- a/nixpkgs/pkgs/tools/misc/rrdtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://oss.oetiker.ch/rrdtool/; + homepage = "https://oss.oetiker.ch/rrdtool/"; description = "High performance logging in Round Robin Databases"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/misc/rw/default.nix b/nixpkgs/pkgs/tools/misc/rw/default.nix index b6e53e465360..b36eff12a2fc 100644 --- a/nixpkgs/pkgs/tools/misc/rw/default.nix +++ b/nixpkgs/pkgs/tools/misc/rw/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://sortix.org/rw; + homepage = "https://sortix.org/rw"; description = "Block device and byte copying program similar to dd"; longDescription = '' rw is a command line program which copies information between files diff --git a/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix b/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix index 18813531033f..bc32489c588e 100644 --- a/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix @@ -7,8 +7,8 @@ let in buildPackage { pname = pname; - version = "2.2.2.1"; - sha256 = "074kizkxjwvmxspxg69fr8r0lbiy61l2n5nzgbfvwvhc6lj34iqy"; + version = "2.2.2.2"; + sha256 = "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3"; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/nixpkgs/pkgs/tools/misc/sam-ba/default.nix b/nixpkgs/pkgs/tools/misc/sam-ba/default.nix index acab41e8ff54..67c751a57791 100644 --- a/nixpkgs/pkgs/tools/misc/sam-ba/default.nix +++ b/nixpkgs/pkgs/tools/misc/sam-ba/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Atmel SAM-BA software provides an open set of tools for programming the Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers. ''; - homepage = http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools; + homepage = "http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools"; # License in <source>/doc/readme.txt license = "BSD-like (partly binary-only)"; # according to Buildroot platforms = [ "x86_64-linux" ]; # patchelf fails on i686-linux diff --git a/nixpkgs/pkgs/tools/misc/scanmem/default.nix b/nixpkgs/pkgs/tools/misc/scanmem/default.nix index 65b7b47256a8..58350f7a638d 100644 --- a/nixpkgs/pkgs/tools/misc/scanmem/default.nix +++ b/nixpkgs/pkgs/tools/misc/scanmem/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; meta = with stdenv.lib; { - homepage = https://github.com/scanmem/scanmem; + homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; maintainers = [ maintainers.chattered ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix index 7fbe13fd44e3..d604f1a68fe2 100644 --- a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix +++ b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix @@ -33,7 +33,7 @@ buildPythonApplication { meta = with lib; { description = "SVGinOT color font builder"; - homepage = https://github.com/13rac1/scfbuild; + homepage = "https://github.com/13rac1/scfbuild"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/nixpkgs/pkgs/tools/misc/screen/default.nix b/nixpkgs/pkgs/tools/misc/screen/default.nix index 136ab4fe3413..9bc219289c44 100644 --- a/nixpkgs/pkgs/tools/misc/screen/default.nix +++ b/nixpkgs/pkgs/tools/misc/screen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - url = https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff; + url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; stripLen = 1; }); @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/screen/; + homepage = "https://www.gnu.org/software/screen/"; description = "A window manager that multiplexes a physical terminal"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/misc/screenfetch/default.nix b/nixpkgs/pkgs/tools/misc/screenfetch/default.nix index d01a3a877f2b..3d42ab9374a0 100644 --- a/nixpkgs/pkgs/tools/misc/screenfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/screenfetch/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { command! This script is very easy to add to and can easily be extended. ''; license = licenses.gpl3; - homepage = https://github.com/KittyKatt/screenFetch; + homepage = "https://github.com/KittyKatt/screenFetch"; maintainers = with maintainers; [ relrod ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/misc/sdate/default.nix b/nixpkgs/pkgs/tools/misc/sdate/default.nix index 742b25601c08..d9439863dc36 100644 --- a/nixpkgs/pkgs/tools/misc/sdate/default.nix +++ b/nixpkgs/pkgs/tools/misc/sdate/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook ]; meta = { - homepage = https://www.df7cb.de/projects/sdate; + homepage = "https://www.df7cb.de/projects/sdate"; description = "Eternal september version of the date program"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ edef ]; diff --git a/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix index 0be5b8d13796..bb1bf6b0a377 100644 --- a/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix +++ b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig docbook_xsl git ]; meta = with stdenv.lib; { - homepage = https://github.com/Grumbel/sdl-jstest; + homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/shadowenv/default.nix b/nixpkgs/pkgs/tools/misc/shadowenv/default.nix index 71cb3d23bebc..a464ea638bda 100644 --- a/nixpkgs/pkgs/tools/misc/shadowenv/default.nix +++ b/nixpkgs/pkgs/tools/misc/shadowenv/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "1.3.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "1s59ra99wcyyqz8gzly4qmcq5rh22c50c75cdi2kyajm7ghgryy9"; + sha256 = "1fjqm4qr85wb0i3vazp0w74izfzvkycdii7dlpdp5zs8jgb35pdh"; }; - cargoSha256 = "1nqzg5jnwvf6wiihi3wwrym3d6g0hsfaxcadhl95r3v4k35fn5qb"; + cargoSha256 = "1n8qh730nhdmpm08mm2ppcl3nkcgm50cyz9q5h6dlzq4bv4rijp4"; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' + installManPage man/man1/shadowenv.1 + installManPage man/man5/shadowlisp.5 + ''; + meta = with stdenv.lib; { homepage = "https://shopify.github.io/shadowenv/"; description = "reversible directory-local environment variable manipulations"; diff --git a/nixpkgs/pkgs/tools/misc/shallot/default.nix b/nixpkgs/pkgs/tools/misc/shallot/default.nix index ced15038b0c1..e8ab6168541c 100644 --- a/nixpkgs/pkgs/tools/misc/shallot/default.nix +++ b/nixpkgs/pkgs/tools/misc/shallot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Shallot allows you to create customized .onion addresses for your hidden service"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/katmagic/Shallot; + homepage = "https://github.com/katmagic/Shallot"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/shelldap/default.nix b/nixpkgs/pkgs/tools/misc/shelldap/default.nix index 89257c8ffc46..bfa8ea16ed36 100644 --- a/nixpkgs/pkgs/tools/misc/shelldap/default.nix +++ b/nixpkgs/pkgs/tools/misc/shelldap/default.nix @@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec { ''; outputs = [ "out" ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/mahlon/shelldap/; + homepage = "https://bitbucket.org/mahlon/shelldap/"; description = "A handy shell-like interface for browsing LDAP servers and editing their content"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ tobiasBora ]; diff --git a/nixpkgs/pkgs/tools/misc/shunit2/default.nix b/nixpkgs/pkgs/tools/misc/shunit2/default.nix index acfbd48c606f..186235be4428 100644 --- a/nixpkgs/pkgs/tools/misc/shunit2/default.nix +++ b/nixpkgs/pkgs/tools/misc/shunit2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/kward/shunit2; + homepage = "https://github.com/kward/shunit2"; description = "A xUnit based unit test framework for Bourne based shell scripts."; maintainers = with maintainers; [ cdepillabout utdemir ]; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/misc/sixpair/default.nix b/nixpkgs/pkgs/tools/misc/sixpair/default.nix index 055fa9418a9a..fafee99db5af 100644 --- a/nixpkgs/pkgs/tools/misc/sixpair/default.nix +++ b/nixpkgs/pkgs/tools/misc/sixpair/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "sixpair-2007-04-18"; src = fetchurl { - url = http://www.pabr.org/sixlinux/sixpair.c; + url = "http://www.pabr.org/sixlinux/sixpair.c"; sha256 = "1b0a3k7gs544cbji7n29jxlrsscwfx6s1r2sgwdl6hmkc1l9gagr"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { longDescription = '' This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master. ''; - homepage = http://www.pabr.org/sixlinux/; + homepage = "http://www.pabr.org/sixlinux/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.tomsmeets ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/skim/default.nix b/nixpkgs/pkgs/tools/misc/skim/default.nix index 1472b4ae72f6..fca2d35e37cc 100644 --- a/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lotabout"; repo = pname; rev = "v${version}"; - sha256 = "0b0x389khdqyzdb6mwbf31wdfn8xila756hb11l555iwipl271ci"; + sha256 = "0xjb8slrlkrzdqvzmf63lq6rgggrjw3hf9an6h8xf6vizz1vfni0"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "0xcsj8wprp9r6s7r2d2fnbicrc5pfnnx1gxyrq2qkj3rwr1q8ndg"; + cargoSha256 = "14p4ppbl2mak21jvxpbd1b28jaw2629bc8kv7875cdzy3ksxyji3"; - patchPhase = '' + patches = [ + # Fix bash completion. Remove with the next release + (fetchpatch { + url = "https://github.com/lotabout/skim/commit/60ca3484090c2e73a1de396500c73a6ad6e0bde9.patch"; + sha256 = "07nibr13vmxscbwavrckhcbsvxwkpan4a6ml0qfr1ny36xbc6y3p"; + }) + ]; + + postPatch = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim ''; diff --git a/nixpkgs/pkgs/tools/misc/sl/default.nix b/nixpkgs/pkgs/tools/misc/sl/default.nix index 4ef91f6c55a3..902617665d88 100644 --- a/nixpkgs/pkgs/tools/misc/sl/default.nix +++ b/nixpkgs/pkgs/tools/misc/sl/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Steam Locomotive runs across your terminal when you type 'sl'"; - homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; + homepage = "http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html"; license = rec { shortName = "Toyoda Masashi's free software license"; fullName = shortName; - url = https://github.com/eyJhb/sl/blob/master/LICENSE; + url = "https://github.com/eyJhb/sl/blob/master/LICENSE"; }; maintainers = with maintainers; [ eyjhb ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/slop/default.nix b/nixpkgs/pkgs/tools/misc/slop/default.nix index 335a687dbc28..36f40dca6cb1 100644 --- a/nixpkgs/pkgs/tools/misc/slop/default.nix +++ b/nixpkgs/pkgs/tools/misc/slop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "slop"; - version = "7.4"; + version = "7.5"; src = fetchFromGitHub { owner = "naelstrof"; repo = "slop"; rev = "v${version}"; - sha256 = "0fgd8a2dqkg64all0f96sca92sdss9r3pzmv5kck46b99z2325z6"; + sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/misc/slsnif/default.nix b/nixpkgs/pkgs/tools/misc/slsnif/default.nix index 72363de7653e..8078ee51eb2d 100644 --- a/nixpkgs/pkgs/tools/misc/slsnif/default.nix +++ b/nixpkgs/pkgs/tools/misc/slsnif/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "slsnif-0.4.4"; src = fetchurl { - url = mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz; + url = "mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz"; sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; meta = { description = "Serial line sniffer"; - homepage = http://slsnif.sourceforge.net/; + homepage = "http://slsnif.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/slurp/default.nix b/nixpkgs/pkgs/tools/misc/slurp/default.nix index bc0e86f1b518..dbec2324674b 100644 --- a/nixpkgs/pkgs/tools/misc/slurp/default.nix +++ b/nixpkgs/pkgs/tools/misc/slurp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Select a region in a Wayland compositor"; - homepage = https://github.com/emersion/slurp; + homepage = "https://github.com/emersion/slurp"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ buffet ]; diff --git a/nixpkgs/pkgs/tools/misc/smc/default.nix b/nixpkgs/pkgs/tools/misc/smc/default.nix index f442df399d90..87bda5d78b43 100644 --- a/nixpkgs/pkgs/tools/misc/smc/default.nix +++ b/nixpkgs/pkgs/tools/misc/smc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { SMC can also generate GraphViz state diagrams from the input file. ''; - homepage = http://smc.sourceforge.net/; + homepage = "http://smc.sourceforge.net/"; license = licenses.mpl11; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/misc/smenu/default.nix b/nixpkgs/pkgs/tools/misc/smenu/default.nix index c6661ee62e46..4d24a1542fa3 100644 --- a/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = https://github.com/p-gen/smenu; + homepage = "https://github.com/p-gen/smenu"; description = "Terminal selection utility"; longDescription = '' Terminal utility that allows you to use words coming from the standard diff --git a/nixpkgs/pkgs/tools/misc/snapper/default.nix b/nixpkgs/pkgs/tools/misc/snapper/default.nix index 8b0167917dd3..eed9516d0960 100644 --- a/nixpkgs/pkgs/tools/misc/snapper/default.nix +++ b/nixpkgs/pkgs/tools/misc/snapper/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for Linux filesystem snapshot management"; - homepage = http://snapper.io; + homepage = "http://snapper.io"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ tstrobel markuskowa ]; diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index 152db99660c8..5503c8ecc563 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.38.1"; + version = "0.40.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0qp3y2wcpj1r07v1r2y42zrzkl13j0vlinjx05gfmrmapcls41gi"; + sha256 = "0jnm586wx5by1b6v78v78a84qzg05n1ha1hlmnjfyzhgjkbkayp1"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "11492fv2isw2prfcgxq0wrbln1n6xdi9209cifjf25nnw2aq2csn"; + cargoSha256 = "1jrlzihcq543z6hb1gq8zq6hqvgralzsknj3xnb6gia1n49b3zxz"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/staruml/default.nix b/nixpkgs/pkgs/tools/misc/staruml/default.nix index e4e1adf20016..a1e6f57ce3d8 100644 --- a/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A sophisticated software modeler"; - homepage = http://staruml.io/; + homepage = "http://staruml.io/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/nixpkgs/pkgs/tools/misc/statserial/default.nix b/nixpkgs/pkgs/tools/misc/statserial/default.nix new file mode 100644 index 000000000000..66ae899b9c5a --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/statserial/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, ncurses, glibc }: + +stdenv.mkDerivation rec { + pname = "statserial"; + version = "1.1"; + + src = fetchurl { + url = "http://www.ibiblio.org/pub/Linux/system/serial/${pname}-${version}.tar.gz"; + sha256 = "0rrrmxfba5yn836zlgmr8g9xnrpash7cjs7lk2m44ac50vakpks0"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-lcurses' '-lncurses' + + substituteInPlace Makefile \ + --replace 'LDFLAGS = -s -N' '#LDFLAGS = -s -N' + ''; + + buildInputs = [ ncurses glibc stdenv ]; + + installPhase = '' + mkdir -p $out/bin + cp statserial $out/bin + + mkdir -p $out/share/man/man1 + cp statserial.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + homepage = "https://sites.google.com/site/tranter/software"; + description = "Display serial port modem status lines."; + license = licenses.gpl2; + + longDescription = + '' Statserial displays a table of the signals on a standard 9-pin or + 25-pin serial port, and indicates the status of the handshaking lines. It + can be useful for debugging problems with serial ports or modems. + ''; + + platforms = platforms.unix; + maintainers = with maintainers; [ rps ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/stow/default.nix b/nixpkgs/pkgs/tools/misc/stow/default.nix index d5eecff72781..d5cd4ef32ef4 100644 --- a/nixpkgs/pkgs/tools/misc/stow/default.nix +++ b/nixpkgs/pkgs/tools/misc/stow/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/stow/; + homepage = "https://www.gnu.org/software/stow/"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/subberthehut/default.nix b/nixpkgs/pkgs/tools/misc/subberthehut/default.nix index e54dc3b3f2b6..e4fa57e30ac5 100644 --- a/nixpkgs/pkgs/tools/misc/subberthehut/default.nix +++ b/nixpkgs/pkgs/tools/misc/subberthehut/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mus65/subberthehut; + homepage = "https://github.com/mus65/subberthehut"; description = "An OpenSubtitles.org downloader"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/sutils/default.nix b/nixpkgs/pkgs/tools/misc/sutils/default.nix index 8d42d2d823f3..c94b8f646a96 100644 --- a/nixpkgs/pkgs/tools/misc/sutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/sutils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Small command-line utilities"; - homepage = https://github.com/baskerville/sutils; + homepage = "https://github.com/baskerville/sutils"; maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 66ed0a11fd92..8490771ad8d2 100644 --- a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/spaam/svtplay-dl; + homepage = "https://github.com/spaam/svtplay-dl"; description = "Command-line tool to download videos from svtplay.se and other sites"; license = licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix b/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix index 0d1ebd70041f..21e6f49df1f5 100644 --- a/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix @@ -50,7 +50,7 @@ ''; meta = with stdenv.lib; { - homepage = https://support.scanse.io/hc/en-us/articles/115006008948-Visualizer-Overview; + homepage = "https://support.scanse.io/hc/en-us/articles/115006008948-Visualizer-Overview"; description = "A minimal desktop application for interfacing with the Sweep device"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/misc/t/Gemfile.lock b/nixpkgs/pkgs/tools/misc/t/Gemfile.lock index 0aa9ef4e6da8..9555e08f9715 100644 --- a/nixpkgs/pkgs/tools/misc/t/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/t/Gemfile.lock @@ -62,4 +62,4 @@ DEPENDENCIES twitter (~> 6.1.0) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/t/default.nix b/nixpkgs/pkgs/tools/misc/t/default.nix index aa34b98bbe29..dd0eda67ce55 100644 --- a/nixpkgs/pkgs/tools/misc/t/default.nix +++ b/nixpkgs/pkgs/tools/misc/t/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A command-line power tool for Twitter"; - homepage = http://sferik.github.io/t/; + homepage = "http://sferik.github.io/t/"; license = licenses.asl20; maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/t1utils/default.nix b/nixpkgs/pkgs/tools/misc/t1utils/default.nix index 03926b955383..fd4ca5f92d53 100644 --- a/nixpkgs/pkgs/tools/misc/t1utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/t1utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { resources from a Macintosh font file or create a Macintosh Type 1 font file from a PFA or PFB font. ''; - homepage = http://www.lcdf.org/type/; + homepage = "http://www.lcdf.org/type/"; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE diff --git a/nixpkgs/pkgs/tools/misc/td/Gemfile.lock b/nixpkgs/pkgs/tools/misc/td/Gemfile.lock index 5726611b9af7..b777a8b411aa 100644 --- a/nixpkgs/pkgs/tools/misc/td/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/td/Gemfile.lock @@ -37,4 +37,4 @@ DEPENDENCIES td BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/td/default.nix b/nixpkgs/pkgs/tools/misc/td/default.nix index 437bdb0373f8..f4b120d1bc12 100644 --- a/nixpkgs/pkgs/tools/misc/td/default.nix +++ b/nixpkgs/pkgs/tools/misc/td/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing."; - homepage = https://github.com/treasure-data/td; + homepage = "https://github.com/treasure-data/td"; license = licenses.asl20; maintainers = with maintainers; [ groodt nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/teamocil/Gemfile.lock b/nixpkgs/pkgs/tools/misc/teamocil/Gemfile.lock index 419c2ae49d31..aeca8cadf869 100644 --- a/nixpkgs/pkgs/tools/misc/teamocil/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/teamocil/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES teamocil BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/misc/teamocil/default.nix b/nixpkgs/pkgs/tools/misc/teamocil/default.nix index a5e356edbf48..b1f6c7cdcab5 100644 --- a/nixpkgs/pkgs/tools/misc/teamocil/default.nix +++ b/nixpkgs/pkgs/tools/misc/teamocil/default.nix @@ -9,7 +9,7 @@ bundlerEnv { meta = with lib; { description = "A simple tool used to automatically create windows and panes in tmux with YAML files"; - homepage = https://github.com/remiprev/teamocil; + homepage = "https://github.com/remiprev/teamocil"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ diff --git a/nixpkgs/pkgs/tools/misc/tensorman/default.nix b/nixpkgs/pkgs/tools/misc/tensorman/default.nix index eca80cbcadf3..85091a41b126 100644 --- a/nixpkgs/pkgs/tools/misc/tensorman/default.nix +++ b/nixpkgs/pkgs/tools/misc/tensorman/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0ywb53snvymmwh10hm6whckz7dwmpqa4rxiggd24y178jdfrm2ns"; }; - buildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/termplay/default.nix b/nixpkgs/pkgs/tools/misc/termplay/default.nix index a17994706bb3..d60a65214b74 100644 --- a/nixpkgs/pkgs/tools/misc/termplay/default.nix +++ b/nixpkgs/pkgs/tools/misc/termplay/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Play an image/video in your terminal"; - homepage = https://jd91mzm2.github.io/termplay/; + homepage = "https://jd91mzm2.github.io/termplay/"; license = licenses.mit; maintainers = with maintainers; [ jD91mZM2 ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/termtosvg/default.nix b/nixpkgs/pkgs/tools/misc/termtosvg/default.nix index 93b52ad175e9..a89ed808c8b1 100644 --- a/nixpkgs/pkgs/tools/misc/termtosvg/default.nix +++ b/nixpkgs/pkgs/tools/misc/termtosvg/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ]; meta = with lib; { - homepage = https://nbedos.github.io/termtosvg/; + homepage = "https://nbedos.github.io/termtosvg/"; description = "Record terminal sessions as SVG animations"; license = licenses.bsd3; maintainers = with maintainers; [ ma27 ]; diff --git a/nixpkgs/pkgs/tools/misc/tewisay/default.nix b/nixpkgs/pkgs/tools/misc/tewisay/default.nix index d875b098ab56..d2a8a1d0e876 100644 --- a/nixpkgs/pkgs/tools/misc/tewisay/default.nix +++ b/nixpkgs/pkgs/tools/misc/tewisay/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { ''; meta = { - homepage = https://github.com/lucy/tewisay; + homepage = "https://github.com/lucy/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; license = stdenv.lib.licenses.cc0; maintainers = [ stdenv.lib.maintainers.chiiruno ]; diff --git a/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix b/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix index abc25db2fa7e..6c090c0b4b36 100644 --- a/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix +++ b/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = "http://mdocml.bsd.lv/"; description = "converter from Texinfo into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/nixpkgs/pkgs/tools/misc/thefuck/default.nix index d67da78a3004..b2d31a629116 100644 --- a/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { doCheck = false; # The above is only enough for tests to pass outside the sandbox. meta = with stdenv.lib; { - homepage = https://github.com/nvbn/thefuck; + homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command."; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; diff --git a/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix index 0739435084d2..0aba67647e0b 100644 --- a/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/jthornber/thin-provisioning-tools/; + homepage = "https://github.com/jthornber/thin-provisioning-tools/"; description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/thinkpad-scripts/default.nix b/nixpkgs/pkgs/tools/misc/thinkpad-scripts/default.nix new file mode 100644 index 000000000000..5b9b9eae7ad5 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/thinkpad-scripts/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchFromGitHub, python3Packages }: + +buildPythonPackage rec { + pname = "thinkpad-scripts"; + version = "4.12.0"; + + src = fetchFromGitHub { + owner = "martin-ueding"; + repo = "thinkpad-scripts"; + rev = "v${version}"; + sha256 = "08adx8r5pwwazbnfahay42l5f203mmvcn2ipz5hg8myqc9jxm2ky"; + }; + + propagatedBuildInputs = with python3Packages; [ setuptools ]; + + meta = { + description = "Screen rotation, docking and other scripts for ThinkPad® X220 and X230 Tablet"; + homepage = "https://github.com/martin-ueding/thinkpad-scripts"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ dawidsowa ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/time/default.nix b/nixpkgs/pkgs/tools/misc/time/default.nix index bb6276f70655..89af4f693d3f 100644 --- a/nixpkgs/pkgs/tools/misc/time/default.nix +++ b/nixpkgs/pkgs/tools/misc/time/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/time/; + homepage = "https://www.gnu.org/software/time/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/timidity/default.nix b/nixpkgs/pkgs/tools/misc/timidity/default.nix index 88c3c7cb4252..f33520aee0a8 100644 --- a/nixpkgs/pkgs/tools/misc/timidity/default.nix +++ b/nixpkgs/pkgs/tools/misc/timidity/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "timidity-2.15.0"; src = fetchurl { - url = mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2; + url = "mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2"; sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-ljack -L${libjack2}/lib"; instruments = fetchurl { - url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; + url = "http://www.csee.umbc.edu/pub/midia/instruments.tar.gz"; sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/timidity/; + homepage = "https://sourceforge.net/projects/timidity/"; license = licenses.gpl2; description = "A software MIDI renderer"; maintainers = [ maintainers.marcweber ]; diff --git a/nixpkgs/pkgs/tools/misc/tio/default.nix b/nixpkgs/pkgs/tools/misc/tio/default.nix index 9ee9b977ab29..bab0098ecaa4 100644 --- a/nixpkgs/pkgs/tools/misc/tio/default.nix +++ b/nixpkgs/pkgs/tools/misc/tio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Serial console TTY"; - homepage = https://tio.github.io/; + homepage = "https://tio.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/tldr/default.nix b/nixpkgs/pkgs/tools/misc/tldr/default.nix index d4ff9d8c8442..66d763fd304e 100644 --- a/nixpkgs/pkgs/tools/misc/tldr/default.nix +++ b/nixpkgs/pkgs/tools/misc/tldr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags. ''; - homepage = http://tldr-pages.github.io; + homepage = "http://tldr-pages.github.io"; license = licenses.mit; maintainers = with maintainers; [ taeer carlosdagos ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/tmate/default.nix b/nixpkgs/pkgs/tools/misc/tmate/default.nix index 86ab24928777..3a125fcdbf7c 100644 --- a/nixpkgs/pkgs/tools/misc/tmate/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://tmate.io/; + homepage = "https://tmate.io/"; description = "Instant Terminal Sharing"; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix index 006cef6f1027..ac20cab2842e 100644 --- a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-fuser=${psmisc}/bin/fuser" ]; meta = with stdenv.lib; { - homepage = https://fedorahosted.org/tmpwatch/; + homepage = "https://fedorahosted.org/tmpwatch/"; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; license = licenses.gpl2; maintainers = with maintainers; [ vlstill ]; diff --git a/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix index f54cd2756eb1..c38769f448f1 100644 --- a/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/dennishafemann/tmux-cssh; + homepage = "https://github.com/dennishafemann/tmux-cssh"; description = "SSH to multiple hosts at the same time using tmux"; longDescription = diff --git a/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix b/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix index b7c9150e12d7..d19b9cd5dbf7 100644 --- a/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix @@ -39,7 +39,7 @@ buildRubyGem rec { meta = with lib; { description = "Manage complex tmux sessions easily"; - homepage = https://github.com/tmuxinator/tmuxinator; + homepage = "https://github.com/tmuxinator/tmuxinator"; license = licenses.mit; maintainers = with maintainers; [ auntie ericsagnes ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index 9ffa89f59196..94cdcf568936 100644 --- a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Manage tmux workspaces from JSON and YAML"; - homepage = https://tmuxp.git-pull.com/; + homepage = "https://tmuxp.git-pull.com/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix index e2d263817ee7..4afa1781ac0e 100644 --- a/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix +++ b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://github.com/0x776b7364/toggle.sg-download; + homepage = "https://github.com/0x776b7364/toggle.sg-download"; description = "Command-line tool to download videos from toggle.sg written in Python"; longDescription = '' toggle.sg requires SilverLight in order to view videos. This tool will diff --git a/nixpkgs/pkgs/tools/misc/toilet/default.nix b/nixpkgs/pkgs/tools/misc/toilet/default.nix index abc6933a777e..c598b37897c7 100644 --- a/nixpkgs/pkgs/tools/misc/toilet/default.nix +++ b/nixpkgs/pkgs/tools/misc/toilet/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display large colourful characters in text mode"; - homepage = http://caca.zoy.org/wiki/toilet; + homepage = "http://caca.zoy.org/wiki/toilet"; license = licenses.wtfpl; maintainers = with maintainers; [ pSub ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/nixpkgs/pkgs/tools/misc/topgrade/default.nix index db1938160b3d..39882b4e6e6d 100644 --- a/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.2.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "02rcgz1sklll0gpxjwb7y3jc6flzr4492qp72blra6a26qpb7vxp"; + sha256 = "0r42hrhd33kkkvii9h4896cmr319q728pdnhhamkhzgilvzxrwrz"; }; - cargoSha256 = "1kd4q2ddm5byf62xj923n140k9x89yf9yswwgsnvkbpvrnpl4mwj"; + cargoSha256 = "041djz3w7qmr19xq4cxgpw0m4qz2368q2wijw5aidvrxqlcz7xg2"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/nixpkgs/pkgs/tools/misc/toybox/default.nix b/nixpkgs/pkgs/tools/misc/toybox/default.nix index b863786145c6..ea2c07ec97bb 100644 --- a/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight implementation of some Unix command line utilities"; - homepage = https://landley.net/toybox/; + homepage = "https://landley.net/toybox/"; license = licenses.bsd0; platforms = with platforms; linux ++ darwin ++ freebsd; maintainers = with maintainers; [ hhm ]; diff --git a/nixpkgs/pkgs/tools/misc/trash-cli/default.nix b/nixpkgs/pkgs/tools/misc/trash-cli/default.nix index ac8feaef2758..141cceff24d3 100644 --- a/nixpkgs/pkgs/tools/misc/trash-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/trash-cli/default.nix @@ -2,9 +2,8 @@ , python3Packages, substituteAll }: python3Packages.buildPythonApplication rec { - name = "trash-cli-${version}"; + pname = "trash-cli"; version = "0.17.1.14"; - namePrefix = ""; src = fetchFromGitHub { owner = "andreafrancia"; @@ -41,7 +40,7 @@ python3Packages.buildPythonApplication rec { checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = https://github.com/andreafrancia/trash-cli; + homepage = "https://github.com/andreafrancia/trash-cli"; description = "Command line tool for the desktop trash can"; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix b/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix index 7142d346336a..b7888f0884bd 100644 --- a/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf2pt1-3.4.4"; src = fetchurl { - url = mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz; + url = "mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz"; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "True Type to Postscript Type 3 converter, fpdf"; - homepage = http://ttf2pt1.sourceforge.net/index.html; + homepage = "http://ttf2pt1.sourceforge.net/index.html"; license = "ttf2pt1"; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix index f82917239e64..502b829afcec 100644 --- a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { new font where all glyphs are bytecode hinted using the information given by FreeType’s auto-hinting module. ''; - homepage = https://www.freetype.org/ttfautohint; + homepage = "https://www.freetype.org/ttfautohint"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix b/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix index 4a2ab0d3475c..d75011ea6f40 100644 --- a/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf-mkfontdir-3.0.9-6"; src = fetchurl { - url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; + url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz"; sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { # who knows more about C/C++ .. patches = [ (fetchurl { - url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz; + url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz"; sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633"; }) diff --git a/nixpkgs/pkgs/tools/misc/ttwatch/default.nix b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix index 5a2d1aaa4279..afd5139565c8 100644 --- a/nixpkgs/pkgs/tools/misc/ttwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ryanbinns/ttwatch; + homepage = "https://github.com/ryanbinns/ttwatch"; description = "Linux TomTom GPS Watch Utilities"; maintainers = with maintainers; [ dotlambda ]; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/tty-clock/default.nix b/nixpkgs/pkgs/tools/misc/tty-clock/default.nix index b261f0ef8411..f6a312f04608 100644 --- a/nixpkgs/pkgs/tools/misc/tty-clock/default.nix +++ b/nixpkgs/pkgs/tools/misc/tty-clock/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/xorg62/tty-clock; + homepage = "https://github.com/xorg62/tty-clock"; license = licenses.free; description = "Digital clock in ncurses"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/ttylog/default.nix b/nixpkgs/pkgs/tools/misc/ttylog/default.nix index 70856fba7319..55785c7a211c 100644 --- a/nixpkgs/pkgs/tools/misc/ttylog/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttylog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://ttylog.sourceforge.net; + homepage = "http://ttylog.sourceforge.net"; description = "Simple serial port logger"; longDescription = '' A serial port logger which can be used to print everything to stdout diff --git a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix index 45aa9ea5c0b2..afa4cb3e1555 100644 --- a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple general purpose plotting utility for tty with data input from stdin"; - homepage = https://github.com/tenox7/ttyplot; + homepage = "https://github.com/tenox7/ttyplot"; license = licenses.unlicense; maintainers = with maintainers; [ lassulus ]; }; diff --git a/nixpkgs/pkgs/tools/misc/ttyrec/default.nix b/nixpkgs/pkgs/tools/misc/ttyrec/default.nix index 799e397daceb..97049276a32d 100644 --- a/nixpkgs/pkgs/tools/misc/ttyrec/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttyrec/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://0xcc.net/ttyrec/; + homepage = "http://0xcc.net/ttyrec/"; description = "Terminal interaction recorder and player"; license = licenses.bsd3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/txr/default.nix b/nixpkgs/pkgs/tools/misc/txr/default.nix index a6b851e18aef..ce928f0a3781 100644 --- a/nixpkgs/pkgs/tools/misc/txr/default.nix +++ b/nixpkgs/pkgs/tools/misc/txr/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming language for convenient data munging"; license = licenses.bsd2; - homepage = http://nongnu.org/txr; + homepage = "http://nongnu.org/txr"; maintainers = with stdenv.lib.maintainers; [ dtzWill ]; platforms = platforms.linux; # Darwin fails although it should work AFAIK }; diff --git a/nixpkgs/pkgs/tools/misc/txt2man/default.nix b/nixpkgs/pkgs/tools/misc/txt2man/default.nix index 90f9559e6b7c..c7d8837f8235 100644 --- a/nixpkgs/pkgs/tools/misc/txt2man/default.nix +++ b/nixpkgs/pkgs/tools/misc/txt2man/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Convert flat ASCII text to man page format"; - homepage = http://mvertes.free.fr/; + homepage = "http://mvertes.free.fr/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ bjornfor ]; diff --git a/nixpkgs/pkgs/tools/misc/txtw/default.nix b/nixpkgs/pkgs/tools/misc/txtw/default.nix index ab8256842aed..1cf80007901e 100644 --- a/nixpkgs/pkgs/tools/misc/txtw/default.nix +++ b/nixpkgs/pkgs/tools/misc/txtw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compute text widths"; - homepage = https://github.com/baskerville/txtw; + homepage = "https://github.com/baskerville/txtw"; maintainers = with maintainers; [ lihop ]; license = licenses.unlicense; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/tydra/default.nix b/nixpkgs/pkgs/tools/misc/tydra/default.nix new file mode 100644 index 000000000000..c6d7c86c7efd --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/tydra/default.nix @@ -0,0 +1,34 @@ +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "tydra"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "Mange"; + repo = pname; + rev = "v${version}"; + sha256 = "1kvyski3qy2lwlpipynq894i0g9x2j4a1iy2mgdwfibfyfkv2jnm"; + }; + + cargoSha256 = "11l3fvym16wrrpm9vy4asmqdh8qynwjy0w4gx2bbcnc6300ag43a"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage doc/{tydra.1,tydra-actions.5} + + $out/bin/tydra --generate-completions bash > tydra.bash + $out/bin/tydra --generate-completions fish > tydra.fish + $out/bin/tydra --generate-completions zsh > _tydra + + installShellCompletion tydra.{bash,fish} _tydra + ''; + + meta = with stdenv.lib; { + description = "Shortcut menu-based task runner, inspired by Emacs Hydra"; + homepage = "https://github.com/Mange/tydra"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix index a6fe1853ae55..0ed5d97ad7b5 100644 --- a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, libusb +, libusb1 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb1 ]; installFlags = [ "prefix=${placeholder "out"}" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix index dd9742293ac7..923f6e7a3a45 100644 --- a/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix @@ -38,7 +38,7 @@ mkDerivation { meta = with lib; { description = "Ultrastar karaoke song creation tool"; - homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator; + homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Creator"; license = licenses.gpl2; maintainers = with maintainers; [ Profpatsch ]; }; diff --git a/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix index 19d126d98f64..64221a921396 100644 --- a/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix @@ -114,7 +114,7 @@ in mkDerivation { meta = with lib; { description = "Ultrastar karaoke song manager"; - homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager; + homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Manager"; license = licenses.gpl2; maintainers = with maintainers; [ Profpatsch ]; }; diff --git a/nixpkgs/pkgs/tools/misc/umlet/default.nix b/nixpkgs/pkgs/tools/misc/umlet/default.nix index 2b70848cbb81..25d92905bd85 100644 --- a/nixpkgs/pkgs/tools/misc/umlet/default.nix +++ b/nixpkgs/pkgs/tools/misc/umlet/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { UMLet runs stand-alone or as Eclipse plug-in on Windows, macOS and Linux. ''; - homepage = http://www.umlet.com; + homepage = "http://www.umlet.com"; license = licenses.gpl3; maintainers = with maintainers; [ geistesk ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/unclutter/default.nix b/nixpkgs/pkgs/tools/misc/unclutter/default.nix index 978a3d541ab0..ef8e865e91f3 100644 --- a/nixpkgs/pkgs/tools/misc/unclutter/default.nix +++ b/nixpkgs/pkgs/tools/misc/unclutter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "unclutter-8"; src = fetchurl { - url = https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; + url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz"; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; diff --git a/nixpkgs/pkgs/tools/misc/unicode/default.nix b/nixpkgs/pkgs/tools/misc/unicode/default.nix index 9ace1f137b82..c4ae9cc5e36d 100644 --- a/nixpkgs/pkgs/tools/misc/unicode/default.nix +++ b/nixpkgs/pkgs/tools/misc/unicode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, python3Packages }: python3Packages.buildPythonApplication rec { - name = "unicode-${version}"; + pname = "unicode"; version = "2.6"; src = fetchFromGitHub { @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; ucdtxt = fetchurl { - url = http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt; + url = "http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt"; sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Display unicode character properties"; - homepage = https://github.com/garabik/unicode; + homepage = "https://github.com/garabik/unicode"; license = licenses.gpl3; maintainers = [ maintainers.woffs ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/units/default.nix b/nixpkgs/pkgs/tools/misc/units/default.nix index 8bea94770ba6..d62f10daeea6 100644 --- a/nixpkgs/pkgs/tools/misc/units/default.nix +++ b/nixpkgs/pkgs/tools/misc/units/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unit conversion tool"; - homepage = https://www.gnu.org/software/units/; + homepage = "https://www.gnu.org/software/units/"; license = [ licenses.gpl3Plus ]; platforms = platforms.all; maintainers = [ maintainers.vrthra ]; diff --git a/nixpkgs/pkgs/tools/misc/up/default.nix b/nixpkgs/pkgs/tools/misc/up/default.nix index b3937175604d..1e3378305d99 100644 --- a/nixpkgs/pkgs/tools/misc/up/default.nix +++ b/nixpkgs/pkgs/tools/misc/up/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; - homepage = https://github.com/akavel/up; + homepage = "https://github.com/akavel/up"; maintainers = with maintainers; [ ma27 ]; license = licenses.asl20; }; diff --git a/nixpkgs/pkgs/tools/misc/urjtag/default.nix b/nixpkgs/pkgs/tools/misc/urjtag/default.nix index 865fd4f44f84..67b25eaca82f 100644 --- a/nixpkgs/pkgs/tools/misc/urjtag/default.nix +++ b/nixpkgs/pkgs/tools/misc/urjtag/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; - homepage = http://urjtag.org/; + homepage = "http://urjtag.org/"; license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; diff --git a/nixpkgs/pkgs/tools/misc/usbmuxd/default.nix b/nixpkgs/pkgs/tools/misc/usbmuxd/default.nix index 5935710164c4..1c1da7597e7d 100644 --- a/nixpkgs/pkgs/tools/misc/usbmuxd/default.nix +++ b/nixpkgs/pkgs/tools/misc/usbmuxd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/usbmuxd; + homepage = "https://github.com/libimobiledevice/usbmuxd"; description = "A socket daemon to multiplex connections from and to iOS devices"; longDescription = '' usbmuxd stands for "USB multiplexing daemon". This daemon is in charge of diff --git a/nixpkgs/pkgs/tools/misc/uucp/default.nix b/nixpkgs/pkgs/tools/misc/uucp/default.nix index 0fae40a5c964..1516e9dba33a 100644 --- a/nixpkgs/pkgs/tools/misc/uucp/default.nix +++ b/nixpkgs/pkgs/tools/misc/uucp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { just found one of the finest UUCP implementations available. ''; - homepage = https://www.gnu.org/software/uucp/uucp.html; + homepage = "https://www.gnu.org/software/uucp/uucp.html"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/misc/uudeview/default.nix b/nixpkgs/pkgs/tools/misc/uudeview/default.nix index 3e8b7d494deb..a8495d7767c4 100644 --- a/nixpkgs/pkgs/tools/misc/uudeview/default.nix +++ b/nixpkgs/pkgs/tools/misc/uudeview/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nice and Friendly Decoder"; - homepage = http://www.fpx.de/fp/Software/UUDeview/; + homepage = "http://www.fpx.de/fp/Software/UUDeview/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ woffs ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index 9c58785e84ea..f18deb0c83de 100644 --- a/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage { [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ cargo sphinx ] ++ lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ cmake cargo sphinx ]; + buildInputs = lib.optional stdenv.isDarwin Security; # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults buildPhase = ""; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { uutils is an attempt at writing universal (as in cross-platform) CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; - homepage = https://github.com/uutils/coreutils; + homepage = "https://github.com/uutils/coreutils"; maintainers = with maintainers; [ ]; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/vcs_query/default.nix b/nixpkgs/pkgs/tools/misc/vcs_query/default.nix index a39619f354bd..da42b35391b7 100644 --- a/nixpkgs/pkgs/tools/misc/vcs_query/default.nix +++ b/nixpkgs/pkgs/tools/misc/vcs_query/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mageta/vcs_query; + homepage = "https://github.com/mageta/vcs_query"; description = "eMail query-command to use vCards in mutt and Vim"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; diff --git a/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix b/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix index 52eec555b165..ecf87b7c0a55 100644 --- a/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix +++ b/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix @@ -20,7 +20,8 @@ python3Packages.buildPythonApplication rec { inherit src; sourceRoot = "source/rust"; cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; - buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; propagatedBuildInputs = with python3Packages; [ @@ -65,7 +66,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pimutils/vdirsyncer; + homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; maintainers = with maintainers; [ matthiasbeyer gebner ]; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix b/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix index ac950894035b..d3fe47001d16 100644 --- a/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix +++ b/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { patches = [ # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 (fetchpatch { - url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch; + url = "https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch"; sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; }) ]; @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/pimutils/vdirsyncer; + homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; license = licenses.mit; maintainers = with maintainers; [ loewenheim ]; diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index 17e764698d52..c441242885e6 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w"; - buildInputs = [ openssl pkg-config protobuf rdkafka ] + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl protobuf rdkafka ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; # needed for internal protobuf c wrapper library diff --git a/nixpkgs/pkgs/tools/misc/venus/default.nix b/nixpkgs/pkgs/tools/misc/venus/default.nix index 534a500c7bcc..944b6e4ef644 100644 --- a/nixpkgs/pkgs/tools/misc/venus/default.nix +++ b/nixpkgs/pkgs/tools/misc/venus/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { feeds published by web sites and aggregates their content together into a single combined feed, latest news first. ''; - homepage = http://intertwingly.net/code/venus/docs/index.html; + homepage = "http://intertwingly.net/code/venus/docs/index.html"; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; maintainers = []; diff --git a/nixpkgs/pkgs/tools/misc/vimer/default.nix b/nixpkgs/pkgs/tools/misc/vimer/default.nix index 7f81774aebee..5bef80adcaf8 100644 --- a/nixpkgs/pkgs/tools/misc/vimer/default.nix +++ b/nixpkgs/pkgs/tools/misc/vimer/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/susam/vimer; + homepage = "https://github.com/susam/vimer"; description = '' A convenience wrapper for gvim/mvim --remote(-tab)-silent to open files in an existing instance of GVim or MacVim. diff --git a/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix b/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix index 241da2acbb44..b85bb0876605 100644 --- a/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -6,12 +6,12 @@ }: buildPythonApplication rec { - version = "0.2.0"; + version = "0.3.0"; pname = "vimwiki-markdown"; src = fetchPypi { inherit version pname; - sha256 = "0k7srlglhq4bm85kgd5ismslrk1fk8v16mm41a8k0kmcr9k4vi4a"; + sha256 = "1icfnc623f9pyn59wgb76g0fnsx41s87q69x354qy17gw23bxabx"; }; propagatedBuildInputs= [ @@ -21,7 +21,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Vimwiki markdown plugin"; - homepage = https://github.com/WnP/vimwiki_markdown; + homepage = "https://github.com/WnP/vimwiki_markdown"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; }; diff --git a/nixpkgs/pkgs/tools/misc/vivid/default.nix b/nixpkgs/pkgs/tools/misc/vivid/default.nix index 1696a54d0aa4..c8831a6fca5b 100644 --- a/nixpkgs/pkgs/tools/misc/vivid/default.nix +++ b/nixpkgs/pkgs/tools/misc/vivid/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A generator for LS_COLORS with support for multiple color themes"; - homepage = https://github.com/sharkdp/vivid; + homepage = "https://github.com/sharkdp/vivid"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.dtzWill ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/vmtouch/default.nix b/nixpkgs/pkgs/tools/misc/vmtouch/default.nix index 6397a0933476..0f46d8141f1c 100644 --- a/nixpkgs/pkgs/tools/misc/vmtouch/default.nix +++ b/nixpkgs/pkgs/tools/misc/vmtouch/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Portable file system cache diagnostics and control"; longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; - homepage = https://hoytech.com/vmtouch/; + homepage = "https://hoytech.com/vmtouch/"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/void/default.nix b/nixpkgs/pkgs/tools/misc/void/default.nix index f71151259c88..f9805531f86c 100644 --- a/nixpkgs/pkgs/tools/misc/void/default.nix +++ b/nixpkgs/pkgs/tools/misc/void/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Terminal-based personal organizer"; - homepage = https://github.com/spacejam/void; + homepage = "https://github.com/spacejam/void"; license = licenses.gpl3; maintainers = with maintainers; [ spacekookie ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix index 90b721ad58ae..fdb283d4dce9 100644 --- a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix +++ b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sjeng.org/vorbisgain.html; + homepage = "https://sjeng.org/vorbisgain.html"; description = "A utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix b/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix index d0fbcecf0270..aa631d441148 100644 --- a/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix +++ b/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { This module implements a GUI for the Wacom Linux Drivers and extends it with profile support to handle different button / pen layouts per profile. ''; - homepage = https://cgit.kde.org/wacomtablet.git/about/; + homepage = "https://cgit.kde.org/wacomtablet.git/about/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.Thra11 ]; platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/wagyu/default.nix b/nixpkgs/pkgs/tools/misc/wagyu/default.nix index f21db2c4b4fc..8ed952a82ceb 100644 --- a/nixpkgs/pkgs/tools/misc/wagyu/default.nix +++ b/nixpkgs/pkgs/tools/misc/wagyu/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Rust library for generating cryptocurrency wallets"; - homepage = https://github.com/ArgusHQ/wagyu; + homepage = "https://github.com/ArgusHQ/wagyu"; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.offline ]; }; diff --git a/nixpkgs/pkgs/tools/misc/watchexec/default.nix b/nixpkgs/pkgs/tools/misc/watchexec/default.nix index eede909ddceb..1c626785483c 100644 --- a/nixpkgs/pkgs/tools/misc/watchexec/default.nix +++ b/nixpkgs/pkgs/tools/misc/watchexec/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Executes commands in response to file modifications"; - homepage = https://github.com/watchexec/watchexec; + homepage = "https://github.com/watchexec/watchexec"; license = with licenses; [ asl20 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix b/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix index 349d910dafc3..66a613785575 100644 --- a/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix +++ b/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line copy/paste utilities for Wayland"; - homepage = https://github.com/bugaevc/wl-clipboard; + homepage = "https://github.com/bugaevc/wl-clipboard"; license = licenses.gpl3; maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/woeusb/default.nix b/nixpkgs/pkgs/tools/misc/woeusb/default.nix index a61434d21020..4c235b4866f2 100644 --- a/nixpkgs/pkgs/tools/misc/woeusb/default.nix +++ b/nixpkgs/pkgs/tools/misc/woeusb/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create bootable USB disks from Windows ISO images"; - homepage = https://github.com/slacka/WoeUSB; + homepage = "https://github.com/slacka/WoeUSB"; license = licenses.gpl3; maintainers = with maintainers; [ bjornfor gnidorah ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/woof/default.nix b/nixpkgs/pkgs/tools/misc/woof/default.nix index fa3ab747f64f..e00634dd53e1 100644 --- a/nixpkgs/pkgs/tools/misc/woof/default.nix +++ b/nixpkgs/pkgs/tools/misc/woof/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.home.unix-ag.org/simon/woof.html; + homepage = "http://www.home.unix-ag.org/simon/woof.html"; description = "Web Offer One File - Command-line utility to easily exchange files over a local network"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/wootility/default.nix b/nixpkgs/pkgs/tools/misc/wootility/default.nix index e88322f7f756..00cfd27d2e89 100644 --- a/nixpkgs/pkgs/tools/misc/wootility/default.nix +++ b/nixpkgs/pkgs/tools/misc/wootility/default.nix @@ -2,14 +2,14 @@ let pname = "wootility"; - version = "3.3.3"; + version = "3.4.6"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage"; - sha256 = "1qdiacwnvqahqkrhwnblz0jjywn63c6ndl3z450myhx5x55fdcja"; + sha256 = "02ivbgnzr657iqb9hviaylmsym2kki2c84xmqfix3b0awsphn05q"; }; profile = '' @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = "mv $out/bin/{${name},${pname}}"; meta = with lib; { - homepage = https://wooting.io/wootility; + homepage = "https://wooting.io/wootility"; description = "Wootility is customization and management software for Wooting keyboards."; platforms = [ "x86_64-linux" ]; license = "unknown"; diff --git a/nixpkgs/pkgs/tools/misc/wv2/default.nix b/nixpkgs/pkgs/tools/misc/wv2/default.nix index b9a8f70ff71a..abac98d855f3 100644 --- a/nixpkgs/pkgs/tools/misc/wv2/default.nix +++ b/nixpkgs/pkgs/tools/misc/wv2/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; license = stdenv.lib.licenses.lgpl2; - homepage = http://wvware.sourceforge.net; + homepage = "http://wvware.sourceforge.net"; }; } diff --git a/nixpkgs/pkgs/tools/misc/wyrd/default.nix b/nixpkgs/pkgs/tools/misc/wyrd/default.nix index 6a5ec8672224..e1c4e4fd2fca 100644 --- a/nixpkgs/pkgs/tools/misc/wyrd/default.nix +++ b/nixpkgs/pkgs/tools/misc/wyrd/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { flashy GUI dialogs. Rather, Wyrd is designed to make you more efficient at editing your reminder files directly. ''; - homepage = http://pessimization.com/software/wyrd/; - downloadPage = http://pessimization.com/software/wyrd/; + homepage = "http://pessimization.com/software/wyrd/"; + downloadPage = "http://pessimization.com/software/wyrd/"; license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/x11idle/default.nix b/nixpkgs/pkgs/tools/misc/x11idle/default.nix index ac13f41ef9f5..5e64137cbf6e 100644 --- a/nixpkgs/pkgs/tools/misc/x11idle/default.nix +++ b/nixpkgs/pkgs/tools/misc/x11idle/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { longDescription = '' Idle time passes when the user does not act, i.e. when the user doesn't move the mouse or use the keyboard. ''; - homepage = https://orgmode.org/; + homepage = "https://orgmode.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.swflint ]; diff --git a/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix b/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix index 62e2b31fa153..48045999329a 100644 --- a/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { inherit version; src = fetchgit { - url = git://projects.qi-hardware.com/xburst-tools.git; + url = "git://projects.qi-hardware.com/xburst-tools.git"; rev = "c71ce8e15db25fe49ce8702917cb17720882e341"; sha256 = "1hzdngs1l5ivvwnxjwzc246am6w1mj1aidcf0awh9yw0crzcjnjr"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; license = stdenv.lib.licenses.gpl3; - homepage = http://www.linux-mtd.infradead.org/; + homepage = "http://www.linux-mtd.infradead.org/"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.x86_64; }; diff --git a/nixpkgs/pkgs/tools/misc/xclip/default.nix b/nixpkgs/pkgs/tools/misc/xclip/default.nix index 69009b86af8c..c1a015d3c09a 100644 --- a/nixpkgs/pkgs/tools/misc/xclip/default.nix +++ b/nixpkgs/pkgs/tools/misc/xclip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; - homepage = https://github.com/astrand/xclip; + homepage = "https://github.com/astrand/xclip"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix index 28268052826c..3950e6bee28a 100644 --- a/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin rycee ]; platforms = with platforms; linux ++ freebsd; license = licenses.free; #TODO BSD on Gentoo, looks like MIT - downloadPage = http://www.jwz.org/xdaliclock/; + downloadPage = "http://www.jwz.org/xdaliclock/"; }; } diff --git a/nixpkgs/pkgs/tools/misc/xdo/default.nix b/nixpkgs/pkgs/tools/misc/xdo/default.nix index 77a2ef763a97..f9928b6f140f 100644 --- a/nixpkgs/pkgs/tools/misc/xdo/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small X utility to perform elementary actions on windows"; - homepage = https://github.com/baskerville/xdo; + homepage = "https://github.com/baskerville/xdo"; maintainers = with maintainers; [ meisternu ]; license = licenses.bsd2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix index b6801130a45d..00f1899f97af 100644 --- a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Tool to convert XDXF dictionary files to slob format"; - homepage = https://github.com/itkach/xdxf2slob/; + homepage = "https://github.com/itkach/xdxf2slob/"; license = licenses.gpl3; maintainers = [ maintainers.rycee ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/xflux/default.nix b/nixpkgs/pkgs/tools/misc/xflux/default.nix index d0f358446952..adc3b87ffa72 100644 --- a/nixpkgs/pkgs/tools/misc/xflux/default.nix +++ b/nixpkgs/pkgs/tools/misc/xflux/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "xflux-2013-09-01"; src = fetchurl { - url = https://justgetflux.com/linux/xflux64.tgz; + url = "https://justgetflux.com/linux/xflux64.tgz"; sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { when the sun sets, and then changes it back its colder temperature when the sun rises. ''; - homepage = https://justgetflux.com/; + homepage = "https://justgetflux.com/"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.paholg ]; diff --git a/nixpkgs/pkgs/tools/misc/xflux/gui.nix b/nixpkgs/pkgs/tools/misc/xflux/gui.nix index 6a629af61ba2..03a458e818d2 100644 --- a/nixpkgs/pkgs/tools/misc/xflux/gui.nix +++ b/nixpkgs/pkgs/tools/misc/xflux/gui.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { meta = { description = "Better lighting for Linux. Open source GUI for xflux"; - homepage = https://justgetflux.com/linux.html; + homepage = "https://justgetflux.com/linux.html"; license = stdenv.lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary maintainers = [ stdenv.lib.maintainers.sheenobu ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/xfstests/default.nix b/nixpkgs/pkgs/tools/misc/xfstests/default.nix index 204059913318..5f6d2bb1278d 100644 --- a/nixpkgs/pkgs/tools/misc/xfstests/default.nix +++ b/nixpkgs/pkgs/tools/misc/xfstests/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Torture test suite for filesystems"; - homepage = https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/; + homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/xiccd/default.nix b/nixpkgs/pkgs/tools/misc/xiccd/default.nix index 43a674069706..82759441a46b 100644 --- a/nixpkgs/pkgs/tools/misc/xiccd/default.nix +++ b/nixpkgs/pkgs/tools/misc/xiccd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "X color profile daemon"; - homepage = https://github.com/agalakhov/xiccd; + homepage = "https://github.com/agalakhov/xiccd"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix b/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix index ad5086f2f595..5dfbcdfad740 100644 --- a/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix +++ b/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "xmonad DBus monitoring solution"; - homepage = https://github.com/xintron/xmonad-log; + homepage = "https://github.com/xintron/xmonad-log"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ joko ]; diff --git a/nixpkgs/pkgs/tools/misc/xsel/default.nix b/nixpkgs/pkgs/tools/misc/xsel/default.nix index 4c39babc3176..aea86eda9cb7 100644 --- a/nixpkgs/pkgs/tools/misc/xsel/default.nix +++ b/nixpkgs/pkgs/tools/misc/xsel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Command-line program for getting and setting the contents of the X selection"; - homepage = http://www.kfish.org/software/xsel; + homepage = "http://www.kfish.org/software/xsel"; license = licenses.mit; maintainers = [ maintainers.cstrahan ]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/xtitle/default.nix b/nixpkgs/pkgs/tools/misc/xtitle/default.nix index 84cf506fb631..2c24e627b634 100644 --- a/nixpkgs/pkgs/tools/misc/xtitle/default.nix +++ b/nixpkgs/pkgs/tools/misc/xtitle/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Outputs X window titles"; - homepage = https://github.com/baskerville/xtitle; + homepage = "https://github.com/baskerville/xtitle"; maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix index d6adbde5ea9e..889ab823a9c0 100644 --- a/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix +++ b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix @@ -4,7 +4,7 @@ let xvfb_run = fetchurl { name = "xvfb-run"; # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff"; sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; }; in diff --git a/nixpkgs/pkgs/tools/misc/yad/default.nix b/nixpkgs/pkgs/tools/misc/yad/default.nix index d6b1b423ae2f..d00d737c17ce 100644 --- a/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "5.0"; + version = "6.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "07rd61hvilsxxrj7lf8c9k0a8glj07s48m7ya8d45030r90g3lvc"; + sha256 = "07myjv0g0iwgclc6q9wkj25myhlc86ahy2lqma8vgv9i3rgy03p7"; }; configureFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/yad-dialog/; + homepage = "https://sourceforge.net/projects/yad-dialog/"; description = "GUI dialog tool for shell scripts"; longDescription = '' Yad (yet another dialog) is a GUI dialog tool for shell scripts. It is a diff --git a/nixpkgs/pkgs/tools/misc/yank/default.nix b/nixpkgs/pkgs/tools/misc/yank/default.nix index 9fb5399fd724..6111a0f98708 100644 --- a/nixpkgs/pkgs/tools/misc/yank/default.nix +++ b/nixpkgs/pkgs/tools/misc/yank/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "YANKCMD=${xsel}/bin/xsel" ]; meta = with stdenv.lib; { - homepage = https://github.com/mptre/yank; + homepage = "https://github.com/mptre/yank"; description = "Yank terminal output to clipboard"; longDescription = '' Read input from stdin and display a selection interface that allows a diff --git a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index e106c3b8595a..d33743025464 100644 --- a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; - homepage = https://aajanki.github.io/yle-dl/; + homepage = "https://aajanki.github.io/yle-dl/"; license = licenses.gpl3; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/you-get/default.nix b/nixpkgs/pkgs/tools/misc/you-get/default.nix index ab1a3e66825c..74599dc7d1e5 100644 --- a/nixpkgs/pkgs/tools/misc/you-get/default.nix +++ b/nixpkgs/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1410"; + version = "0.4.1432"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0isjmx1z5w3m2v25sb7fpi7lyd4h8bl9n9691ylvl5w3bxf6ynm9"; + sha256 = "0i3gsl7wk1cn8jw79gnyv58mrrn0hmkvymrd3ic67z2ackp726s2"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix index 39150cfed7e1..07f186e33226 100644 --- a/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubico-piv-tool/; + homepage = "https://developers.yubico.com/yubico-piv-tool/"; description = '' Used for interacting with the Privilege and Identification Card (PIV) application on a YubiKey diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 7fa0e70cd2ef..8ebbe75d686a 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Cross-platform application for configuring any YubiKey over all USB interfaces."; - homepage = https://developers.yubico.com/yubikey-manager-qt/; + homepage = "https://developers.yubico.com/yubikey-manager-qt/"; license = licenses.bsd2; maintainers = [ maintainers.cbley ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index ee5556374742..4740b3ac55f5 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://developers.yubico.com/yubikey-manager; + homepage = "https://developers.yubico.com/yubikey-manager"; description = "Command line tool for configuring any YubiKey over all USB transports."; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix index acc0bac04ff6..cb37ae249289 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -19,7 +19,7 @@ python27Packages.buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubikey-neo-manager; + homepage = "https://developers.yubico.com/yubikey-neo-manager"; description = "Cross platform personalization tool for the YubiKey NEO"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 59685aa721a9..96e7024f7a7a 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubikey-personalization-gui; + homepage = "https://developers.yubico.com/yubikey-personalization-gui"; description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix index c20fe68b7b22..41cb53d9d3ba 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubikey-personalization; + homepage = "https://developers.yubico.com/yubikey-personalization"; description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/nixpkgs/pkgs/tools/misc/zoxide/default.nix index 9502af65201e..a43d41637b10 100644 --- a/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, fzf }: +{ lib +, fetchFromGitHub +, rustPlatform +, fzf +}: rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "0s6aax6bln9jmmv7kw630mj0l6qpvdx8mdk3a5d9akr9d23zxmr5"; + sha256 = "1sad18d0pxfdy9gvjmixzgdskg1l7djvzp0aipx7pz0lyi6gs23z"; }; buildInputs = [ fzf ]; - cargoSha256 = "1gzpkf7phl5xd666l7pc25917x4qq0kkxk4i9dkz3lvxz3v8ylrz"; + cargoSha256 = "1sx3s1jnfxylbjr3x6v6j8a6zkl7hfyj4alzlyrsw36b1b64pwqm"; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; diff --git a/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix index 4b19331f3925..c44837b877d1 100644 --- a/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { It handles "enter" and "leave" events, nesting, and stashing of variables (overwriting and restoring). ''; - homepage = https://github.com/Tarrasch/zsh-autoenv; + homepage = "https://github.com/Tarrasch/zsh-autoenv"; platforms = stdenv.lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix b/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix index be64ff47e6be..86dd990cd746 100644 --- a/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Curses-based tools for ZSH"; - homepage = https://github.com/psprint/zsh-navigation-tools; + homepage = "https://github.com/psprint/zsh-navigation-tools"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/networking/ahcpd/default.nix b/nixpkgs/pkgs/tools/networking/ahcpd/default.nix index 4b03c3cf2787..0789b37c65a0 100644 --- a/nixpkgs/pkgs/tools/networking/ahcpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/ahcpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/; + homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix b/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix index e1b5f9827272..fe07d203607a 100644 --- a/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix +++ b/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless encryption cracking tools"; - homepage = http://www.aircrack-ng.org/; + homepage = "http://www.aircrack-ng.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/airfield/default.nix b/nixpkgs/pkgs/tools/networking/airfield/default.nix index a31bc57904d5..d08996eb13f6 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/default.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A web-interface for hipache-proxy"; license = licenses.mit; - homepage = https://github.com/emblica/airfield; + homepage = "https://github.com/emblica/airfield"; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix index fe93f449b037..9a246fa319be 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix @@ -694,7 +694,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Template engine consolidation library"; - homepage = https://github.com/visionmedia/consolidate.js; + homepage = "https://github.com/visionmedia/consolidate.js"; }; production = true; bypassCache = true; @@ -717,7 +717,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A high performance Redis client."; - homepage = https://github.com/NodeRedis/node-redis; + homepage = "https://github.com/NodeRedis/node-redis"; license = "MIT"; }; production = true; @@ -753,7 +753,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Higher-order functions and common patterns for asynchronous code"; - homepage = https://caolan.github.io/async/; + homepage = "https://caolan.github.io/async/"; license = "MIT"; }; production = true; @@ -826,4 +826,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/tools/networking/amass/default.nix b/nixpkgs/pkgs/tools/networking/amass/default.nix index 348104e95913..6398c4b91f13 100644 --- a/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -1,33 +1,30 @@ { buildGoModule , fetchFromGitHub -, stdenv -, Security +, lib }: buildGoModule rec { pname = "amass"; - version = "3.5.1"; + version = "3.5.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1lir0j6av5zl1jb3513cf7mlrydgnsvy0chn5ihg1fvbdiv5lww9"; + sha256 = "0sxcyrlgqajmlsicr4j2b8hq2fzw8ai1xsq176bz0f33q9m9wvhf"; }; - modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl"; + modSha256 = "1yjvwkm2zaf017lai5xl088x1z1ifwsbw56dagyf8z9jk9lhkcj7"; outputs = [ "out" "wordlists" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - postInstall = '' mkdir -p $wordlists cp -R $src/examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' The OWASP Amass tool suite obtains subdomain names by scraping data diff --git a/nixpkgs/pkgs/tools/networking/argus-clients/default.nix b/nixpkgs/pkgs/tools/networking/argus-clients/default.nix index 08db7b4f58d8..a1ff30faff3f 100644 --- a/nixpkgs/pkgs/tools/networking/argus-clients/default.nix +++ b/nixpkgs/pkgs/tools/networking/argus-clients/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Operations, Performance and Security Management. If you need to know what is going on in your network, right now or historically, you will find Argus a useful tool. ''; - homepage = http://qosient.com/argus; + homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/argus/default.nix b/nixpkgs/pkgs/tools/networking/argus/default.nix index bb9abccc933a..32c6c785fa5d 100644 --- a/nixpkgs/pkgs/tools/networking/argus/default.nix +++ b/nixpkgs/pkgs/tools/networking/argus/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Operations, Performance and Security Management. If you need to know what is going on in your network, right now or historically, you will find Argus a useful tool. ''; - homepage = http://qosient.com/argus; + homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/aria2/default.nix b/nixpkgs/pkgs/tools/networking/aria2/default.nix index 0b4d77881b4d..6c596e77af88 100644 --- a/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://aria2.github.io; + homepage = "https://aria2.github.io"; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/arpoison/default.nix b/nixpkgs/pkgs/tools/networking/arpoison/default.nix index cedd8597870b..eac2f380d15b 100644 --- a/nixpkgs/pkgs/tools/networking/arpoison/default.nix +++ b/nixpkgs/pkgs/tools/networking/arpoison/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UNIX arp cache update utility"; - homepage = http://www.arpoison.net/; + homepage = "http://www.arpoison.net/"; license = with licenses; [ gpl2 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/assh/default.nix b/nixpkgs/pkgs/tools/networking/assh/default.nix index bfb1abaeaf23..9d4230524bed 100644 --- a/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Advanced SSH config - Regex, aliases, gateways, includes and dynamic hosts"; - homepage = https://github.com/moul/advanced-ssh-config; + homepage = "https://github.com/moul/advanced-ssh-config"; license = licenses.mit; maintainers = with maintainers; [ zzamboni ]; platforms = with platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/tools/networking/asynk/default.nix b/nixpkgs/pkgs/tools/networking/asynk/default.nix index 4d069a7e6d7d..b37f21335016 100644 --- a/nixpkgs/pkgs/tools/networking/asynk/default.nix +++ b/nixpkgs/pkgs/tools/networking/asynk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://asynk.io/; + homepage = "http://asynk.io/"; description = "Flexible contacts synchronization program"; license = licenses.agpl3; maintainers = [ ]; diff --git a/nixpkgs/pkgs/tools/networking/atinout/default.nix b/nixpkgs/pkgs/tools/networking/atinout/default.nix index 16b3ee668da6..fcd48564da0f 100644 --- a/nixpkgs/pkgs/tools/networking/atinout/default.nix +++ b/nixpkgs/pkgs/tools/networking/atinout/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://atinout.sourceforge.net; + homepage = "http://atinout.sourceforge.net"; description = "Tool for talking to modems"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/networking/autossh/default.nix b/nixpkgs/pkgs/tools/networking/autossh/default.nix index 55b464607b11..f89302c4295f 100644 --- a/nixpkgs/pkgs/tools/networking/autossh/default.nix +++ b/nixpkgs/pkgs/tools/networking/autossh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.harding.motd.ca/autossh/; + homepage = "https://www.harding.motd.ca/autossh/"; description = "Automatically restart SSH sessions and tunnels"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/networking/axel/default.nix b/nixpkgs/pkgs/tools/networking/axel/default.nix index 161148f46270..3f5a7612d16b 100644 --- a/nixpkgs/pkgs/tools/networking/axel/default.nix +++ b/nixpkgs/pkgs/tools/networking/axel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.7"; + version = "2.17.8"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "0z20d2fkf69v35d4pkba95vnk7yq7393kwikmb64y7cjyz4m2ngk"; + sha256 = "05hispf152ywlf7i29cc7alxal8lc7lfzx82r42zncdb9v78pdc8"; }; nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; diff --git a/nixpkgs/pkgs/tools/networking/babeld/default.nix b/nixpkgs/pkgs/tools/networking/babeld/default.nix index 5fccd9c0ebcb..a2f486717da7 100644 --- a/nixpkgs/pkgs/tools/networking/babeld/default.nix +++ b/nixpkgs/pkgs/tools/networking/babeld/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru.tests.babeld = nixosTests.babeld; meta = { - homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/babel/; + homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ fpletz ]; diff --git a/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 1cee7ecdc218..7522b1629cc4 100644 --- a/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0vg2fkjksjysm5ckdlfswg8w7f52wkh417l7k96hghg9ni4yz575"; + sha256 = "0xcn65j2q2pmbvrd5dkjg8anw1r12vizazr1wz4cinhrpsxx8p1p"; }; - cargoSha256 = "1cyra3mqxpi3m1gqrc5dmjykpsw6swq695dsqirhgb6qxcclxw7p"; + cargoSha256 = "16nkmmkla3dlz40qhy04sknm3p2f5qik0ijczcw5ibg5w1jsydfr"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/tools/networking/bgpdump/default.nix b/nixpkgs/pkgs/tools/networking/bgpdump/default.nix index 3c84de29bf1f..a6f66ea10fc5 100644 --- a/nixpkgs/pkgs/tools/networking/bgpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/bgpdump/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 ]; meta = { - homepage = https://bitbucket.org/ripencc/bgpdump/; + homepage = "https://bitbucket.org/ripencc/bgpdump/"; description = ''Analyze dump files produced by Zebra/Quagga or MRT''; license = stdenv.lib.licenses.hpnd; maintainers = with stdenv.lib.maintainers; [ lewo ]; diff --git a/nixpkgs/pkgs/tools/networking/bgpq3/default.nix b/nixpkgs/pkgs/tools/networking/bgpq3/default.nix new file mode 100644 index 000000000000..e3d2218b0c97 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/bgpq3/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "bgpq3"; + version = "0.1.35"; + + src = fetchFromGitHub { + owner = "snar"; + repo = pname; + rev = "v${version}"; + sha256 = "0fd5a3krq0i906m0iivgphiqq88cw6c0w1q4n7lmzyq9201mb8wj"; + }; + + # Fix binary install location. Remove with next upstream release. + preInstall = "mkdir -p $out/bin"; + + meta = with stdenv.lib; { + description = "bgp filtering automation tool"; + homepage = "https://github.com/snar/bgpq3"; + license = licenses.bsd2; + maintainers = with maintainers; [ b4dm4n ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/boringtun/default.nix b/nixpkgs/pkgs/tools/networking/boringtun/default.nix index 59654501a396..7c322638712c 100644 --- a/nixpkgs/pkgs/tools/networking/boringtun/default.nix +++ b/nixpkgs/pkgs/tools/networking/boringtun/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "boringtun"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "1mijy51hd8c4as9g4ivpfxismc9m5m3nhibfvclh3wrlcmp1ha9c"; + sha256 = "0b57c7z87xwrirmq9aa9jswqyj5bavkifmq7a9hgfphcmwcskmdb"; }; - cargoSha256 = "1kbbkbrfjff4yicwanydmcjr2av6s6wrsgafpvbh255vvkd7mr6x"; + cargoSha256 = "0bms93xg75b23ls2hb8dv26y4al4nr67pqcm57rp9d4rbsfafg8c"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Userspace WireGuard® implementation in Rust"; - homepage = https://github.com/cloudflare/boringtun; + homepage = "https://github.com/cloudflare/boringtun"; license = licenses.bsd3; maintainers = with maintainers; [ xrelkd marsam ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/networking/brook/default.nix b/nixpkgs/pkgs/tools/networking/brook/default.nix index 48da63ae8559..b70eb080a7af 100644 --- a/nixpkgs/pkgs/tools/networking/brook/default.nix +++ b/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/txthinking/brook; + homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/bukubrow/default.nix b/nixpkgs/pkgs/tools/networking/bukubrow/default.nix index 2c97e1a17dc0..944fccb0ec52 100644 --- a/nixpkgs/pkgs/tools/networking/bukubrow/default.nix +++ b/nixpkgs/pkgs/tools/networking/bukubrow/default.nix @@ -40,7 +40,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager"; - homepage = https://github.com/SamHH/bukubrow-host; + homepage = "https://github.com/SamHH/bukubrow-host"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; diff --git a/nixpkgs/pkgs/tools/networking/bully/default.nix b/nixpkgs/pkgs/tools/networking/bully/default.nix index 46bac3d5b5b2..c9512392347e 100644 --- a/nixpkgs/pkgs/tools/networking/bully/default.nix +++ b/nixpkgs/pkgs/tools/networking/bully/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; - homepage = https://github.com/aanarchyy/bully; + homepage = "https://github.com/aanarchyy/bully"; maintainers = with maintainers; [ edwtjo ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index ebb46dfed7e1..e8caddcbe29a 100644 --- a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { initial mapping and analysis of an application's attack surface, through to finding and exploiting security vulnerabilities. ''; - homepage = https://portswigger.net/burp/; + homepage = "https://portswigger.net/burp/"; downloadPage = "https://portswigger.net/burp/freedownload"; license = [ stdenv.lib.licenses.unfree ]; platforms = jre.meta.platforms; diff --git a/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix index 8e766cdeeb5c..ae3edf7dcea7 100644 --- a/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix +++ b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; - homepage = http://www.gropp.org/?id=projects&sub=bwm-ng; + homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/cadaver/default.nix b/nixpkgs/pkgs/tools/networking/cadaver/default.nix index 95012208129a..46ebb234fb18 100644 --- a/nixpkgs/pkgs/tools/networking/cadaver/default.nix +++ b/nixpkgs/pkgs/tools/networking/cadaver/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver; + url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver"; name = "disable-sslv2.patch"; sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr"; }) @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command-line WebDAV client"; - homepage = http://www.webdav.org/cadaver; + homepage = "http://www.webdav.org/cadaver"; maintainers = with maintainers; [ ianwookim ]; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; diff --git a/nixpkgs/pkgs/tools/networking/carddav-util/default.nix b/nixpkgs/pkgs/tools/networking/carddav-util/default.nix index 08014ed12269..c28048a56c07 100644 --- a/nixpkgs/pkgs/tools/networking/carddav-util/default.nix +++ b/nixpkgs/pkgs/tools/networking/carddav-util/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "carddav-0.1-2014-02-26"; src = fetchgit { - url = git://github.com/ljanyst/carddav-util; + url = "git://github.com/ljanyst/carddav-util"; rev = "53b181faff5f154bcd180467dd04c0ce69405564"; sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ljanyst/carddav-util; + homepage = "https://github.com/ljanyst/carddav-util"; description = "A CardDAV import/export utility"; platforms = platforms.unix; license = licenses.isc; diff --git a/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/nixpkgs/pkgs/tools/networking/cassowary/default.nix index 5b9ba71f8c9b..6156f43b04b8 100644 --- a/nixpkgs/pkgs/tools/networking/cassowary/default.nix +++ b/nixpkgs/pkgs/tools/networking/cassowary/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cassowary"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rogerwelin/cassowary"; description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/networking/ccnet/default.nix b/nixpkgs/pkgs/tools/networking/ccnet/default.nix index 2c78b20138aa..48d675ea09b3 100644 --- a/nixpkgs/pkgs/tools/networking/ccnet/default.nix +++ b/nixpkgs/pkgs/tools/networking/ccnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-server" ]; meta = with stdenv.lib; { - homepage = https://github.com/haiwen/ccnet; + homepage = "https://github.com/haiwen/ccnet"; description = "A framework for writing networked applications in C"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/chrony/default.nix b/nixpkgs/pkgs/tools/networking/chrony/default.nix index 2ec16aa430a3..0a8ae10eb134 100644 --- a/nixpkgs/pkgs/tools/networking/chrony/default.nix +++ b/nixpkgs/pkgs/tools/networking/chrony/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; - homepage = https://chrony.tuxfamily.org/; - repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; + homepage = "https://chrony.tuxfamily.org/"; + repositories.git = "git://git.tuxfamily.org/gitroot/chrony/chrony.git"; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; maintainers = with maintainers; [ fpletz thoughtpolice ]; diff --git a/nixpkgs/pkgs/tools/networking/circus/default.nix b/nixpkgs/pkgs/tools/networking/circus/default.nix index 10edc92a9951..82c9db90432e 100644 --- a/nixpkgs/pkgs/tools/networking/circus/default.nix +++ b/nixpkgs/pkgs/tools/networking/circus/default.nix @@ -6,11 +6,11 @@ in buildPythonApplication rec { pname = "circus"; - version = "0.15.0"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b"; + sha256 = "0paccmqwgard2l0z7swcc3nwc418l9b4mfaddb4s31bpnqg02z6x"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/networking/cjdns/default.nix b/nixpkgs/pkgs/tools/networking/cjdns/default.nix index 7dce5dc10443..452181754b17 100644 --- a/nixpkgs/pkgs/tools/networking/cjdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/cjdns/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: -let version = "20.5"; in +let version = "20.6"; in stdenv.mkDerivation { name = "cjdns-"+version; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "13f174bmbyqna899naja4fzpma3yaw815ylksk8klcc3glg07v7b"; + sha256 = "1d5rrnqb5dcmm5cg2ky1cgxz6ncb23n1j797j9zzw6xxdvkf3kgi"; }; buildInputs = [ which python27 nodejs ] ++ @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/cjdelisle/cjdns; + homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; license = licenses.gpl3; maintainers = with maintainers; [ ehmry ]; diff --git a/nixpkgs/pkgs/tools/networking/cksfv/default.nix b/nixpkgs/pkgs/tools/networking/cksfv/default.nix index 3098b091dc64..c777f487b3d4 100644 --- a/nixpkgs/pkgs/tools/networking/cksfv/default.nix +++ b/nixpkgs/pkgs/tools/networking/cksfv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://zakalwe.fi/~shd/foss/cksfv/; + homepage = "http://zakalwe.fi/~shd/foss/cksfv/"; description = "A tool for verifying files against a SFV checksum file"; platforms = platforms.all; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/networking/clash/default.nix b/nixpkgs/pkgs/tools/networking/clash/default.nix index 8e7499caa479..12bfad0c8dfa 100644 --- a/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "clash"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "150zpjchldm1632z6gkydgqhx2a612lpwf5lqngd2if99nas54kk"; + sha256 = "08zwrnpiihlir83fryani8pr972lmj1sjvhjc5pzlw1hks88i9m2"; }; goPackagePath = "github.com/Dreamacro/clash"; - modSha256 = "02bki2iq99lc9iq1mjf9rbxwspalrj7hjlk1h384w3d4s4x4fyxy"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "05i8mzhxzkgcmaa4gazfl8pq3n8mc4prww0ghl6m28cy7a0vsh7f"; buildFlagsArray = [ "-ldflags=" diff --git a/nixpkgs/pkgs/tools/networking/cmst/default.nix b/nixpkgs/pkgs/tools/networking/cmst/default.nix index dcda354e4b42..aa61d42d3d00 100644 --- a/nixpkgs/pkgs/tools/networking/cmst/default.nix +++ b/nixpkgs/pkgs/tools/networking/cmst/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = { description = "QT GUI for Connman with system tray icon"; - homepage = https://github.com/andrew-bibb/cmst; + homepage = "https://github.com/andrew-bibb/cmst"; maintainers = [ lib.maintainers.matejc ]; platforms = lib.platforms.linux; license = lib.licenses.mit; diff --git a/nixpkgs/pkgs/tools/networking/cntlm/default.nix b/nixpkgs/pkgs/tools/networking/cntlm/default.nix index 9b8a1f0e7904..d05d8e48dc0f 100644 --- a/nixpkgs/pkgs/tools/networking/cntlm/default.nix +++ b/nixpkgs/pkgs/tools/networking/cntlm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NTLM/NTLMv2 authenticating HTTP proxy"; - homepage = http://cntlm.sourceforge.net/; + homepage = "http://cntlm.sourceforge.net/"; license = licenses.gpl2; maintainers = [ diff --git a/nixpkgs/pkgs/tools/networking/connect/default.nix b/nixpkgs/pkgs/tools/networking/connect/default.nix index 17923081dfdf..2fbd8ddf4a36 100644 --- a/nixpkgs/pkgs/tools/networking/connect/default.nix +++ b/nixpkgs/pkgs/tools/networking/connect/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. ''; - homepage = https://bitbucket.org/gotoh/connect/wiki/Home; + homepage = "https://bitbucket.org/gotoh/connect/wiki/Home"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix index a3c774a62b11..5de63098185c 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK GUI for Connman"; - homepage = https://github.com/jgke/connman-gtk; + homepage = "https://github.com/jgke/connman-gtk"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix index 140105c24754..7bfb4571e107 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple ncurses UI for connman"; - homepage = https://github.com/eurogiciel-oss/connman-json-client; + homepage = "https://github.com/eurogiciel-oss/connman-json-client"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix index d17729c691d3..df72a9474899 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Desktop notification integration for connman"; - homepage = https://gitlab.com/wavexx/connman-notify; + homepage = "https://gitlab.com/wavexx/connman-notify"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/tools/networking/connman/connman.nix b/nixpkgs/pkgs/tools/networking/connman/connman.nix new file mode 100644 index 000000000000..512194872205 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/connman/connman.nix @@ -0,0 +1,171 @@ +{ stdenv +, fetchurl +, pkgconfig +, file +, glib +# always required runtime dependencies +, dbus +, libmnl +, gnutls +, readline +# configureable options +, firewallType ? "iptables" # or "nftables" +, iptables ? null +, libnftnl ? null # for nftables +, dnsType ? "internal" # or "systemd-resolved" +# optional features which are turned *on* by default +, enableOpenconnect ? true +, openconnect ? null +, enableOpenvpn ? true +, openvpn ? null +, enableVpnc ? true +, vpnc ? true +, enablePolkit ? true +, polkit ? null +, enablePptp ? true +, pptp ? null +, ppp ? null +, enableLoopback ? true +, enableEthernet ? true +, enableWireguard ? true +, enableGadget ? true +, enableWifi ? true +, enableBluetooth ? true +, enableOfono ? true +, enableDundee ? true +, enablePacrunner ? true +, enableNeard ? true +, enableWispr ? true +, enableTools ? true +, enableStats ? true +, enableClient ? true +, enableDatafiles ? true +# optional features which are turned *off* by default +, enableNetworkManager ? false +, enableHh2serialGps ? false +, enableL2tp ? false +, enableIospm ? false +, enableTist ? false +}: + +assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; +assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; + +let inherit (stdenv.lib) optionals; in + +stdenv.mkDerivation rec { + pname = "connman"; + version = "1.38"; + src = fetchurl { + url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; + sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"; + }; + + buildInputs = [ + glib + dbus + libmnl + gnutls + readline + ]; + + nativeBuildInputs = [ + pkgconfig + file + ] + ++ optionals (enablePolkit) [ polkit ] + ++ optionals (enablePptp) [ pptp ppp ] + ++ optionals (firewallType == "iptables") [ iptables ] + ++ optionals (firewallType == "nftables") [ libnftnl ] + ; + + # fix invalid path to 'file' + postPatch = '' + sed -i "s/\/usr\/bin\/file/file/g" ./configure + ''; + + configureFlags = [ + # directories flags + "--sysconfdir=${placeholder "out"}/etc" + "--localstatedir=/var" + "--with-dbusconfdir=${placeholder "out"}/share" + "--with-dbusdatadir=${placeholder "out"}/share" + "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" + "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" + "--with-dns-backend=${dnsType}" + "--with-firewall=${firewallType}" + # production build flags + "--disable-maintainer-mode" + "--enable-session-policy-local=builtin" + # for building and running tests + # "--enable-tests" # installs the tests, we don't want that + "--enable-tools" + ] + ++ optionals (!enableLoopback) [ "--disable-loopback" ] + ++ optionals (!enableEthernet) [ "--disable-ethernet" ] + ++ optionals (!enableWireguard) [ "--disable-wireguard" ] + ++ optionals (!enableGadget) [ "--disable-gadget" ] + ++ optionals (!enableWifi) [ "--disable-wifi" ] + # enable IWD support for wifi as it doesn't require any new dependencies + # and it's easier for the NixOS module to use only one connman package when + # IWD is requested + ++ optionals (enableWifi) [ "--enable-iwd" ] + ++ optionals (!enableBluetooth) [ "--disable-bluetooth" ] + ++ optionals (!enableOfono) [ "--disable-ofono" ] + ++ optionals (!enableDundee) [ "--disable-dundee" ] + ++ optionals (!enablePacrunner) [ "--disable-pacrunner" ] + ++ optionals (!enableNeard) [ "--disable-neard" ] + ++ optionals (!enableWispr) [ "--disable-wispr" ] + ++ optionals (!enableTools) [ "--disable-tools" ] + ++ optionals (!enableStats) [ "--disable-stats" ] + ++ optionals (!enableClient) [ "--disable-client" ] + ++ optionals (!enableDatafiles) [ "--disable-datafiles" ] + ++ optionals (enableOpenconnect) [ + "--enable-openconnect=builtin" + "--with-openconnect=${openconnect}/sbin/openconnect" + ] + ++ optionals (enableOpenvpn) [ + "--enable-openvpn=builtin" + "--with-openvpn=${openvpn}/sbin/openvpn" + ] + ++ optionals (enableVpnc) [ + "--enable-vpnc=builtin" + "--with-vpnc=${vpnc}/sbin/vpnc" + ] + ++ optionals (enablePolkit) [ + "--enable-polkit" + ] + ++ optionals (enablePptp) [ + "--enable-pptp" + "--with-pptp=${pptp}/sbin/pptp" + ] + ++ optionals (!enableWireguard) [ + "--disable-wireguard" + ] + ++ optionals (enableNetworkManager) [ + "--enable-nmcompat" + ] + ++ optionals (enableHh2serialGps) [ + "--enable-hh2serial-gps" + ] + ++ optionals (enableL2tp) [ + "--enable-l2tp" + ] + ++ optionals (enableIospm) [ + "--enable-iospm" + ] + ++ optionals (enableTist) [ + "--enable-tist" + ] + ; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A daemon for managing internet connections"; + homepage = "https://01.org/connman"; + maintainers = [ maintainers.matejc ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix index 7096b9b75861..8bc1b47e1981 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A dmenu wrapper for connmann"; - homepage = https://github.com/march-linux/connman_dmenu; + homepage = "https://github.com/march-linux/connman_dmenu"; license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix b/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix index 17e8551fdda0..51c97e6cb7ec 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A full-featured GTK based trayicon UI for ConnMan"; - homepage = https://github.com/tbursztyka/connman-ui; + homepage = "https://github.com/tbursztyka/connman-ui"; maintainers = [ stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/networking/connman/default.nix b/nixpkgs/pkgs/tools/networking/connman/default.nix index e58b8362f951..ccceaa30b043 100644 --- a/nixpkgs/pkgs/tools/networking/connman/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/default.nix @@ -1,61 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk, - openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, - wpa_supplicant, readline6, pptp, ppp }: +{ callPackage }: -stdenv.mkDerivation rec { - pname = "connman"; - version = "1.37"; - src = fetchurl { - url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"; - }; - - buildInputs = [ openconnect polkit - openvpn vpnc glib dbus iptables gnutls - wpa_supplicant readline6 pptp ppp ]; - - nativeBuildInputs = [ pkgconfig file gawk ]; +{ + # All the defaults + connman = callPackage ./connman.nix { }; - preConfigure = '' - export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant - export PPPD=${ppp}/sbin/pppd - export AWK=${gawk}/bin/gawk - sed -i "s/\/usr\/bin\/file/file/g" ./configure - ''; - - configureFlags = [ - "--sysconfdir=\${out}/etc" - "--localstatedir=/var" - "--with-dbusconfdir=${placeholder "out"}/share" - "--with-dbusdatadir=${placeholder "out"}/share" - "--disable-maintainer-mode" - "--enable-openconnect=builtin" - "--with-openconnect=${openconnect}/sbin/openconnect" - "--enable-openvpn=builtin" - "--with-openvpn=${openvpn}/sbin/openvpn" - "--enable-vpnc=builtin" - "--with-vpnc=${vpnc}/sbin/vpnc" - "--enable-session-policy-local=builtin" - "--enable-client" - "--enable-bluetooth" - "--enable-wifi" - "--enable-polkit" - "--enable-tools" - "--enable-datafiles" - "--enable-pptp" - "--with-pptp=${pptp}/sbin/pptp" - "--enable-iwd" - ]; - - postInstall = '' - cp ./client/connmanctl $out/sbin/connmanctl - ''; + connmanFull = callPackage ./connman.nix { + # TODO: Why is this in `connmanFull` and not the default build? See TODO in + # nixos/modules/services/networking/connman.nix (near the assertions) + enableNetworkManager = true; + enableHh2serialGps = true; + enableL2tp = true; + enableIospm = true; + enableTist = true; + }; - meta = with stdenv.lib; { - description = "A daemon for managing internet connections"; - homepage = https://01.org/connman; - maintainers = [ maintainers.matejc ]; - platforms = platforms.linux; - license = licenses.gpl2; + connmanMinimal = callPackage ./connman.nix { + enableOpenconnect = false; + enableOpenvpn = false; + enableVpnc = false; + vpnc = false; + enablePolkit = false; + enablePptp = false; + enableLoopback = false; + # enableEthernet = false; # If disabled no ethernet connection can be performed + enableWireguard = false; + enableGadget = false; + # enableWifi = false; # If disabled no WiFi connection can be performed + enableBluetooth = false; + enableOfono = false; + enableDundee = false; + enablePacrunner = false; + enableNeard = false; + enableWispr = false; + enableTools = false; + enableStats = false; + enableClient = false; + # enableDatafiles = false; # If disabled, configuration and data files are not installed }; } diff --git a/nixpkgs/pkgs/tools/networking/corerad/default.nix b/nixpkgs/pkgs/tools/networking/corerad/default.nix index 0cfaddcf06ae..7be61d0e853d 100644 --- a/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -1,23 +1,21 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "corerad"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "0nxrksv98mxs5spykhzpydwjzii5cc6gk8az7irs3fdi4jx6pq1w"; + sha256 = "1594qrwrz4bc3iipm4aqb8l1zyi04pwmiz0vdlfn12qn1p7lad5p"; }; - modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1cfhxkvwzf7sn227y6h5h19f27a9ngmpnyqdlfba5km8axqn29vm"; buildFlagsArray = '' -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117 + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1586881022 -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; diff --git a/nixpkgs/pkgs/tools/networking/corkscrew/default.nix b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix index 9394b123bbe6..9cfe65873acd 100644 --- a/nixpkgs/pkgs/tools/networking/corkscrew/default.nix +++ b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://agroman.net/corkscrew/; + homepage = "http://agroman.net/corkscrew/"; description = "A tool for tunneling SSH through HTTP proxies"; license = stdenv.lib.licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/croc/default.nix b/nixpkgs/pkgs/tools/networking/croc/default.nix index d7ab830479ea..b4a74b620035 100644 --- a/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "croc"; - version = "8.0.4"; + version = "8.0.7"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0dc6h102jr5dkg6r3xxma51g702dnyd3d6s5rilwv1fivxn3bj43"; + sha256 = "06iwb2wm9wwcwl88rqhwbrky2ab0kbcyzmcv89vw533glknycw04"; }; - modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1gjigbc9511h3qd12j9ypdnmb5ia4x9f2mk7mxasy9p2xkcfyhpg"; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix b/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix index e6f2dec30e6a..b25e5dcab0b7 100644 --- a/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl-unix-socket/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Run HTTP requests over UNIX socket"; license = licenses.mit; - homepage = https://github.com/Soulou/curl-unix-socket; + homepage = "https://github.com/Soulou/curl-unix-socket"; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/curl/default.nix b/nixpkgs/pkgs/tools/networking/curl/default.nix index a732ddcb89ea..ba54b2c5671c 100644 --- a/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -28,14 +28,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { - name = "curl-7.68.0"; + name = "curl-7.69.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${name}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" ]; - sha256 = "1fgf4f33wj25jk6lkpxmrvmfnnxvc66z3k3561rxr8nngn8m8zr0"; + sha256 = "1s2ddjjif1wkp69vx25nzxklhimgqzaazfzliyl6mpvsa2yybx9g"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line tool for transferring files with URL syntax"; - homepage = https://curl.haxx.se/; + homepage = "https://curl.haxx.se/"; maintainers = with maintainers; [ lovek323 ]; license = licenses.curl; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/curlie/default.nix b/nixpkgs/pkgs/tools/networking/curlie/default.nix index fa1471aa6203..179181fc49c1 100644 --- a/nixpkgs/pkgs/tools/networking/curlie/default.nix +++ b/nixpkgs/pkgs/tools/networking/curlie/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; - homepage = https://curlie.io/; + homepage = "https://curlie.io/"; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; }; diff --git a/nixpkgs/pkgs/tools/networking/cutter/default.nix b/nixpkgs/pkgs/tools/networking/cutter/default.nix index 28eab7f495aa..2430e75430b0 100644 --- a/nixpkgs/pkgs/tools/networking/cutter/default.nix +++ b/nixpkgs/pkgs/tools/networking/cutter/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "TCP/IP Connection cutting on Linux Firewalls and Routers"; - homepage = http://www.digitage.co.uk/digitage/software/linux-security/cutter; + homepage = "http://www.digitage.co.uk/digitage/software/linux-security/cutter"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.offline ]; diff --git a/nixpkgs/pkgs/tools/networking/darkstat/default.nix b/nixpkgs/pkgs/tools/networking/darkstat/default.nix index 6509c9c31060..af15e70aa86c 100644 --- a/nixpkgs/pkgs/tools/networking/darkstat/default.nix +++ b/nixpkgs/pkgs/tools/networking/darkstat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { - Small. Portable. Single-threaded. Efficient. - Supports IPv6. ''; - homepage = http://unix4lyfe.org/darkstat; + homepage = "http://unix4lyfe.org/darkstat"; license = licenses.gpl2; platforms = with platforms; unix; }; diff --git a/nixpkgs/pkgs/tools/networking/davix/default.nix b/nixpkgs/pkgs/tools/networking/davix/default.nix index 9faad3775209..9f1eff220c3c 100644 --- a/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { Davix provides an API and a set of command line tools"; license = licenses.lgpl2Plus; - homepage = http://dmc.web.cern.ch/projects/davix/home; + homepage = "http://dmc.web.cern.ch/projects/davix/home"; maintainers = [ maintainers.adev ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/5.nix b/nixpkgs/pkgs/tools/networking/dd-agent/5.nix index 98902e9809b9..dd206eb8c975 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/5.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/5.nix @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { Event collector for the DataDog analysis service -- v5 Python implementation ''; - homepage = https://www.datadoghq.com; + homepage = "https://www.datadoghq.com"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ thoughtpolice domenkozar ]; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index 2253daa2d115..57d7244148d8 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -73,7 +73,7 @@ in buildGoPackage rec { Event collector for the DataDog analysis service -- v6 new golang implementation. ''; - homepage = https://www.datadoghq.com; + homepage = "https://www.datadoghq.com"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice domenkozar rvl ]; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 280619a5eca6..8f1294eb751a 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Live process collector for the DataDog Agent v6"; - homepage = https://www.datadoghq.com; + homepage = "https://www.datadoghq.com"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ domenkozar rvl ]; diff --git a/nixpkgs/pkgs/tools/networking/ddclient/default.nix b/nixpkgs/pkgs/tools/networking/ddclient/default.nix index 6efba72b1dcf..375898913c8b 100644 --- a/nixpkgs/pkgs/tools/networking/ddclient/default.nix +++ b/nixpkgs/pkgs/tools/networking/ddclient/default.nix @@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Client for updating dynamic DNS service entries"; - homepage = https://sourceforge.net/p/ddclient/wiki/Home/; + homepage = "https://sourceforge.net/p/ddclient/wiki/Home/"; license = licenses.gpl2Plus; # Mostly since `iproute` is Linux only. platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index c45d017e3f5f..1a16645cc9b6 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; - homepage = https://roy.marples.name/projects/dhcpcd; + homepage = "https://roy.marples.name/projects/dhcpcd"; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ eelco fpletz ]; diff --git a/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix index a7cc90c2b33a..f68d68382ddb 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; - homepage = http://www.mavetju.org/unix/dhcpdump-man.php; + homepage = "http://www.mavetju.org/unix/dhcpdump-man.php"; platforms = platforms.linux; license = licenses.bsd2; }; diff --git a/nixpkgs/pkgs/tools/networking/dhcping/default.nix b/nixpkgs/pkgs/tools/networking/dhcping/default.nix index a6cb05b3865b..36f81555495a 100644 --- a/nixpkgs/pkgs/tools/networking/dhcping/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcping/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { privileges are dropped as soon as the program has bound itself to that port. ''; - homepage = http://www.mavetju.org/unix/general.php; + homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/dibbler/default.nix b/nixpkgs/pkgs/tools/networking/dibbler/default.nix index 43c9455712db..1849890d23c2 100644 --- a/nixpkgs/pkgs/tools/networking/dibbler/default.nix +++ b/nixpkgs/pkgs/tools/networking/dibbler/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Portable DHCPv6 implementation"; - homepage = http://www.klub.com.pl/dhcpv6/; + homepage = "http://www.klub.com.pl/dhcpv6/"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/nixpkgs/pkgs/tools/networking/dirb/default.nix b/nixpkgs/pkgs/tools/networking/dirb/default.nix index fe845f3cae87..1f9516ccaccd 100644 --- a/nixpkgs/pkgs/tools/networking/dirb/default.nix +++ b/nixpkgs/pkgs/tools/networking/dirb/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "A web content scanner"; - homepage = http://dirb.sourceforge.net/; + homepage = "http://dirb.sourceforge.net/"; maintainers = with stdenv.lib.maintainers; [ bennofs ]; license = with stdenv.lib.licenses; [ gpl2 ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/djbdns/default.nix b/nixpkgs/pkgs/tools/networking/djbdns/default.nix index 974f8a1f346a..ca622a6244fc 100644 --- a/nixpkgs/pkgs/tools/networking/djbdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/djbdns/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of Domain Name System tools"; longDescription = "Includes software for all the fundamental DNS operations: DNS cache: finding addresses of Internet hosts; DNS server: publishing addresses of Internet hosts; and DNS client: talking to a DNS cache."; - homepage = https://cr.yp.to/djbdns.html; + homepage = "https://cr.yp.to/djbdns.html"; license = licenses.publicDomain; maintainers = with maintainers; [ jerith666 ]; }; diff --git a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 089eee332b4c..7f16d9478f3f 100644 --- a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dnscrypt-proxy2"; - version = "2.0.39"; + version = "2.0.42"; goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; @@ -10,14 +10,14 @@ buildGoPackage rec { owner = "jedisct1"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "0fvnp2brmqkwn04v01k53f9djk9ywa1cg26m2frhv4lj0581430y"; + sha256 = "1v4n0pkwcilxm4mnj4fsd4gf8pficjj40jnmfkiwl7ngznjxwkyw"; }; meta = with stdenv.lib; { description = "A tool that provides secure DNS resolution"; license = licenses.isc; - homepage = https://dnscrypt.info/; + homepage = "https://dnscrypt.info/"; maintainers = with maintainers; [ atemu waynr ]; platforms = with platforms; unix; }; diff --git a/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix index 94d52b953d49..5c44734665c9 100644 --- a/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for adding dnscrypt support to any name resolver"; - homepage = https://dnscrypt.info/; + homepage = "https://dnscrypt.info/"; license = licenses.isc; maintainers = with maintainers; [ tstrobel joachifm ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix index 2a6b776c14d5..667eb9feb0c9 100644 --- a/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; - homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; + homepage = "http://www.thekelleys.org.uk/dnsmasq/doc.html"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ eelco fpletz globin ]; diff --git a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 89173e7b4277..6f57e9812397 100644 --- a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "dnsproxy"; - version = "0.23.7"; + version = "0.24.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "1sfl2nyzspqllbklc9wf62wqxs0k3ac7vzqz8kl5h9ch654g542a"; + sha256 = "1jwy2qi99ks6zcas6h1n0zq3b0k47036ayas0mprdips60azw0hg"; }; - modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0kba3jay6m9ir1pc7i833p7ylbs610g0lkp8kc3gm47xnxy7j4gz"; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; diff --git a/nixpkgs/pkgs/tools/networking/dnstop/default.nix b/nixpkgs/pkgs/tools/networking/dnstop/default.nix index 207078773b26..705888568d9b 100644 --- a/nixpkgs/pkgs/tools/networking/dnstop/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "libpcap application that displays DNS traffic on your network"; - homepage = http://dns.measurement-factory.com/tools/dnstop; + homepage = "http://dns.measurement-factory.com/tools/dnstop"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/dnstracer/default.nix b/nixpkgs/pkgs/tools/networking/dnstracer/default.nix index 5261fdb18960..7109a2945436 100644 --- a/nixpkgs/pkgs/tools/networking/dnstracer/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnstracer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data."; - homepage = http://www.mavetju.org/unix/general.php; + homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; maintainers = with maintainers; [ andir ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/nixpkgs/pkgs/tools/networking/driftnet/default.nix index a0f5b5b08420..441019103716 100644 --- a/nixpkgs/pkgs/tools/networking/driftnet/default.nix +++ b/nixpkgs/pkgs/tools/networking/driftnet/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display"; - homepage = https://github.com/deiv/driftnet; + homepage = "https://github.com/deiv/driftnet"; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/nixpkgs/pkgs/tools/networking/dropbear/default.nix index c51f0a4fdf02..20d2545e5082 100644 --- a/nixpkgs/pkgs/tools/networking/dropbear/default.nix +++ b/nixpkgs/pkgs/tools/networking/dropbear/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ]; meta = with stdenv.lib; { - homepage = http://matt.ucc.asn.au/dropbear/dropbear.html; + homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html"; description = "A small footprint implementation of the SSH 2 protocol"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/networking/dsniff/default.nix b/nixpkgs/pkgs/tools/networking/dsniff/default.nix index 256e59628aa2..4fe381cdd7a7 100644 --- a/nixpkgs/pkgs/tools/networking/dsniff/default.nix +++ b/nixpkgs/pkgs/tools/networking/dsniff/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation { longDescription = '' dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a network for interesting data (passwords, e-mail, files, etc.). arpspoof, dnsspoof, and macof facilitate the interception of network traffic normally unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm implement active monkey-in-the-middle attacks against redirected SSH and HTTPS sessions by exploiting weak bindings in ad-hoc PKI. ''; - homepage = https://www.monkey.org/~dugsong/dsniff/; + homepage = "https://www.monkey.org/~dugsong/dsniff/"; license = licenses.bsd3; maintainers = [ maintainers.symphorien ]; # bsd and solaris should work as well diff --git a/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix b/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix index 9d6a1712e673..fef2648de7fb 100644 --- a/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix +++ b/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = https://openvpn.net/; + homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/easyrsa/default.nix b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix index 4d374cece3d7..90e05e5310bd 100644 --- a/nixpkgs/pkgs/tools/networking/easyrsa/default.nix +++ b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = https://openvpn.net/; + homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/email/default.nix b/nixpkgs/pkgs/tools/networking/email/default.nix index d8c60882cd4a..b61503b1b3f4 100644 --- a/nixpkgs/pkgs/tools/networking/email/default.nix +++ b/nixpkgs/pkgs/tools/networking/email/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Command line SMTP client"; license = with lib.licenses; [ gpl2 ]; - homepage = https://deanproxy.com/code; + homepage = "https://deanproxy.com/code"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/fakeroute/default.nix b/nixpkgs/pkgs/tools/networking/fakeroute/default.nix index d5190331d33f..2bfecc389d5f 100644 --- a/nixpkgs/pkgs/tools/networking/fakeroute/default.nix +++ b/nixpkgs/pkgs/tools/networking/fakeroute/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { Makes your machine appear to be anywhere on the internet to any host running a (UDP) unix traceroute ''; - homepage = https://moxie.org/software/fakeroute/; + homepage = "https://moxie.org/software/fakeroute/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/fastd/default.nix b/nixpkgs/pkgs/tools/networking/fastd/default.nix index 43efe2090f2c..2bf1d8e5d2c9 100644 --- a/nixpkgs/pkgs/tools/networking/fastd/default.nix +++ b/nixpkgs/pkgs/tools/networking/fastd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast and Secure Tunneling Daemon"; - homepage = https://projects.universe-factory.net/projects/fastd/wiki; + homepage = "https://projects.universe-factory.net/projects/fastd/wiki"; license = with licenses; [ bsd2 bsd3 ]; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/nixpkgs/pkgs/tools/networking/fdm/default.nix b/nixpkgs/pkgs/tools/networking/fdm/default.nix index abb76e633ee7..fb125b486d79 100644 --- a/nixpkgs/pkgs/tools/networking/fdm/default.nix +++ b/nixpkgs/pkgs/tools/networking/fdm/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; maintainers = with maintainers; [ raskin ]; platforms = with platforms; linux; - homepage = https://github.com/nicm/fdm; - downloadPage = https://github.com/nicm/fdm/releases; + homepage = "https://github.com/nicm/fdm"; + downloadPage = "https://github.com/nicm/fdm/releases"; license = licenses.isc; }; } diff --git a/nixpkgs/pkgs/tools/networking/ferm/default.nix b/nixpkgs/pkgs/tools/networking/ferm/default.nix index 6f1660484e78..8fcdeb234ec3 100644 --- a/nixpkgs/pkgs/tools/networking/ferm/default.nix +++ b/nixpkgs/pkgs/tools/networking/ferm/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: -stdenv.mkDerivation rec { - version = "2.4.1"; +let + inherit (stdenv.lib.versions) majorMinor; +in stdenv.mkDerivation rec { + version = "2.5"; pname = "ferm"; src = fetchurl { - url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz"; - sha256 = "1fv8wk513yysp4q0i65rl2m0hg2lxwwgk9ppprsca1xcxrdpsvwa"; + url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; + sha256 = "0lxqcpirphihpvdqrh5kq0621aqq0h2vdy9q2v85gqdhd52js20p"; }; buildInputs = [ perl ipset ebtables iptables makeWrapper ]; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { passthru.tests.ferm = nixosTests.ferm; meta = { - homepage = http://ferm.foo-projects.org/; + homepage = "http://ferm.foo-projects.org/"; description = "Tool to maintain complex firewalls"; longDescription = '' ferm is a tool to maintain complex firewalls, without having the trouble to diff --git a/nixpkgs/pkgs/tools/networking/filegive/default.nix b/nixpkgs/pkgs/tools/networking/filegive/default.nix index f9e334d81962..bedb97200c12 100644 --- a/nixpkgs/pkgs/tools/networking/filegive/default.nix +++ b/nixpkgs/pkgs/tools/networking/filegive/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "viric.name/soft/filegive"; meta = with stdenv.lib; { - homepage = http://viric.name/cgi-bin/filegive; + homepage = "http://viric.name/cgi-bin/filegive"; description = "Easy p2p file sending program"; license = licenses.agpl3Plus; maintainers = [ maintainers.viric ]; diff --git a/nixpkgs/pkgs/tools/networking/findomain/default.nix b/nixpkgs/pkgs/tools/networking/findomain/default.nix index c78a6ad55267..e19442576988 100644 --- a/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "0c6jjr1343lqwggvpxdhbjyi1far4f7f3yzq1y0nj1j952j7a36x"; + sha256 = "1w3parmk3836v5ghn3cgcxyk0alk05r5ljl3j1fpnly5xvl131rd"; }; - cargoSha256 = "1cyfxfhbc2xhavnkhva1xdcw8vy9i5pqhfbiwn6idpfy6hm1w0bx"; + cargoSha256 = "1cs076cgkzjan6y78a3bhriv2q2s83hp5vzhkjwz4dqn83r6b8hx"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/tools/networking/flannel/default.nix b/nixpkgs/pkgs/tools/networking/flannel/default.nix index d2f0ec2ec634..a52088ed231d 100644 --- a/nixpkgs/pkgs/tools/networking/flannel/default.nix +++ b/nixpkgs/pkgs/tools/networking/flannel/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "Network fabric for containers, designed for Kubernetes"; license = licenses.asl20; - homepage = https://github.com/coreos/flannel; + homepage = "https://github.com/coreos/flannel"; maintainers = with maintainers; [johanot offline]; platforms = with platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix b/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix index b5e61bee4dfe..57f29b275e37 100644 --- a/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix +++ b/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = https://savannah.nongnu.org/projects/flvstreamer; + homepage = "https://savannah.nongnu.org/projects/flvstreamer"; maintainers = [ stdenv.lib.maintainers.thammers ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/tools/networking/fping/default.nix b/nixpkgs/pkgs/tools/networking/fping/default.nix index 4b5242818b3d..6d74cd2c78ca 100644 --- a/nixpkgs/pkgs/tools/networking/fping/default.nix +++ b/nixpkgs/pkgs/tools/networking/fping/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; meta = with stdenv.lib; { - homepage = http://fping.org/; + homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; maintainers = with maintainers; [ the-kenny ]; license = licenses.bsd0; diff --git a/nixpkgs/pkgs/tools/networking/freebind/default.nix b/nixpkgs/pkgs/tools/networking/freebind/default.nix index 0c74f14e1744..c1dc3d8fd5f8 100644 --- a/nixpkgs/pkgs/tools/networking/freebind/default.nix +++ b/nixpkgs/pkgs/tools/networking/freebind/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "IPv4 and IPv6 address rate limiting evasion tool"; - homepage = https://github.com/blechschmidt/freebind; + homepage = "https://github.com/blechschmidt/freebind"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; diff --git a/nixpkgs/pkgs/tools/networking/frp/default.nix b/nixpkgs/pkgs/tools/networking/frp/default.nix index 7323c914bfa1..f44e2208646c 100644 --- a/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, fetchFromGitHub, Security }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "frp"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "cmd/frpc" "cmd/frps" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast reverse proxy"; longDescription = '' frp is a fast reverse proxy to help you expose a local server behind a diff --git a/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix b/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix index 2ea09404e347..b323cde28bc2 100644 --- a/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Command-line interface to the public Gandi.net API"; - homepage = https://cli.gandi.net/; + homepage = "https://cli.gandi.net/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kampka ]; }; diff --git a/nixpkgs/pkgs/tools/networking/getmail/default.nix b/nixpkgs/pkgs/tools/networking/getmail/default.nix index f107e4106784..0bf0ebb07b33 100644 --- a/nixpkgs/pkgs/tools/networking/getmail/default.nix +++ b/nixpkgs/pkgs/tools/networking/getmail/default.nix @@ -22,7 +22,7 @@ python2Packages.buildPythonApplication rec { maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ]; platforms = stdenv.lib.platforms.linux; - homepage = http://pyropus.ca/software/getmail/; + homepage = "http://pyropus.ca/software/getmail/"; inherit version; updateWalker = true; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/networking/gftp/default.nix b/nixpkgs/pkgs/tools/networking/gftp/default.nix index fb63ee46c9d3..f6aa4c061ce6 100644 --- a/nixpkgs/pkgs/tools/networking/gftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/gftp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gftp-2.0.19"; src = fetchurl { - url = https://www.gftp.org/gftp-2.0.19.tar.bz2; + url = "https://www.gftp.org/gftp-2.0.19.tar.bz2"; sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "GTK-based FTP client"; - homepage = http://www.gftp.org; + homepage = "http://www.gftp.org"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix index d942dce6a197..fa364dc4eab6 100644 --- a/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -30,7 +30,7 @@ in meta = with stdenv.lib; { description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; - homepage = https://github.com/hzeller/gmrender-resurrect; + homepage = "https://github.com/hzeller/gmrender-resurrect"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ koral ashkitten ]; diff --git a/nixpkgs/pkgs/tools/networking/gmvault/default.nix b/nixpkgs/pkgs/tools/networking/gmvault/default.nix index aab5b77351c9..31b91c01c2d6 100644 --- a/nixpkgs/pkgs/tools/networking/gmvault/default.nix +++ b/nixpkgs/pkgs/tools/networking/gmvault/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Backup and restore your gmail account"; - homepage = http://gmvault.org; + homepage = "http://gmvault.org"; license = pkgs.lib.licenses.agpl3Plus; }; } diff --git a/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix b/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix index 601f70e187a6..f739e80be1fe 100644 --- a/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix +++ b/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { This relies on adb, make sure you have the required permissions/udev rules. ''; - homepage = https://github.com/Genymobile/gnirehtet; + homepage = "https://github.com/Genymobile/gnirehtet"; license = licenses.asl20; maintainers = with maintainers; [ symphorien ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/goklp/default.nix b/nixpkgs/pkgs/tools/networking/goklp/default.nix index c260b47a6332..534a809e46af 100644 --- a/nixpkgs/pkgs/tools/networking/goklp/default.nix +++ b/nixpkgs/pkgs/tools/networking/goklp/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand"; - homepage = https://github.com/AppliedTrust/goklp; + homepage = "https://github.com/AppliedTrust/goklp"; maintainers = with maintainers; [ disassembler ]; license = licenses.bsd2; }; diff --git a/nixpkgs/pkgs/tools/networking/gping/default.nix b/nixpkgs/pkgs/tools/networking/gping/default.nix index 85f13f031b4d..092f3611abb7 100644 --- a/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Ping, but with a graph"; - homepage = https://github.com/orf/gping; + homepage = "https://github.com/orf/gping"; license = licenses.gpl2; maintainers = with maintainers; [ andrew-d ]; }; diff --git a/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/nixpkgs/pkgs/tools/networking/grpcui/default.nix index de2b3f787986..58e698ed7081 100644 --- a/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "grpcui"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; homepage = "https://github.com/fullstorydev/grpcui"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix index b4c224841639..6a72be9a1e45 100644 --- a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = { description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"; - homepage = https://github.com/fullstorydev/grpcurl; + homepage = "https://github.com/fullstorydev/grpcurl"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ knl ]; }; diff --git a/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix b/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix index 830d27fa6ce2..c93873caa07f 100644 --- a/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix +++ b/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of utilities and demos to work with UPnP"; - homepage = https://wiki.gnome.org/Projects/GUPnP; + homepage = "https://wiki.gnome.org/Projects/GUPnP"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/gvpe/default.nix b/nixpkgs/pkgs/tools/networking/gvpe/default.nix index ba59870a6b86..3dea0217b60d 100644 --- a/nixpkgs/pkgs/tools/networking/gvpe/default.nix +++ b/nixpkgs/pkgs/tools/networking/gvpe/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A protected multinode virtual network"; - homepage = http://software.schmorp.de/pkg/gvpe.html; + homepage = "http://software.schmorp.de/pkg/gvpe.html"; maintainers = [ maintainers.raskin ]; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/networking/hans/default.nix b/nixpkgs/pkgs/tools/networking/hans/default.nix index ccc598b0692f..cea13bca24c3 100644 --- a/nixpkgs/pkgs/tools/networking/hans/default.nix +++ b/nixpkgs/pkgs/tools/networking/hans/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { the situation that your Internet access is firewalled, but pings are allowed. ''; - homepage = https://code.gerade.org/hans/; + homepage = "https://code.gerade.org/hans/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 9c7adfce21da..c5aeaaa7bb43 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv"; + sha256 = "1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si"; }; buildInputs = [ openssl zlib ] diff --git a/nixpkgs/pkgs/tools/networking/hey/default.nix b/nixpkgs/pkgs/tools/networking/hey/default.nix index 69cfa4526029..d65d5c9e3235 100644 --- a/nixpkgs/pkgs/tools/networking/hey/default.nix +++ b/nixpkgs/pkgs/tools/networking/hey/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, fetchFromGitHub, Security }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "hey"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; homepage = "https://github.com/rakyll/hey"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/networking/horst/default.nix b/nixpkgs/pkgs/tools/networking/horst/default.nix index 96fb342e27fc..704eaa85cd04 100644 --- a/nixpkgs/pkgs/tools/networking/horst/default.nix +++ b/nixpkgs/pkgs/tools/networking/horst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface"; - homepage = http://br1.einfach.org/tech/horst/; + homepage = "http://br1.einfach.org/tech/horst/"; maintainers = [ maintainers.fpletz ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/hping/default.nix b/nixpkgs/pkgs/tools/networking/hping/default.nix index 6e00a6e9afa8..1ef02b599e83 100644 --- a/nixpkgs/pkgs/tools/networking/hping/default.nix +++ b/nixpkgs/pkgs/tools/networking/hping/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command-line oriented TCP/IP packet assembler/analyzer"; - homepage = http://www.hping.org/; + homepage = "http://www.hping.org/"; license = licenses.gpl2; platforms = platforms.all; broken = stdenv.isDarwin; diff --git a/nixpkgs/pkgs/tools/networking/hss/default.nix b/nixpkgs/pkgs/tools/networking/hss/default.nix index 913e76c0f4ba..77f96113decf 100644 --- a/nixpkgs/pkgs/tools/networking/hss/default.nix +++ b/nixpkgs/pkgs/tools/networking/hss/default.nix @@ -26,7 +26,7 @@ buildRubyGem rec { description = '' A SSH helper that uses regex and fancy expansion to dynamically manage SSH shortcuts. ''; - homepage = https://github.com/akerl/hss; + homepage = "https://github.com/akerl/hss"; license = licenses.mit; maintainers = with maintainers; [ nixy ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/htpdate/default.nix b/nixpkgs/pkgs/tools/networking/htpdate/default.nix index 9bb44b70f11e..d03b08cf5eb5 100644 --- a/nixpkgs/pkgs/tools/networking/htpdate/default.nix +++ b/nixpkgs/pkgs/tools/networking/htpdate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to fetch time and set the system clock over HTTP"; - homepage = http://www.vervest.org/htp/; + homepage = "http://www.vervest.org/htp/"; platforms = platforms.linux; license = licenses.gpl2Plus; }; diff --git a/nixpkgs/pkgs/tools/networking/http-prompt/default.nix b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix index 9ed2f000f325..9c524c0cc090 100644 --- a/nixpkgs/pkgs/tools/networking/http-prompt/default.nix +++ b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; - homepage = https://github.com/eliangcs/http-prompt; + homepage = "https://github.com/eliangcs/http-prompt"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/networking/httperf/default.nix b/nixpkgs/pkgs/tools/networking/httperf/default.nix index 271be9c2352f..50c35fbb33c1 100644 --- a/nixpkgs/pkgs/tools/networking/httperf/default.nix +++ b/nixpkgs/pkgs/tools/networking/httperf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The httperf HTTP load generator"; - homepage = https://github.com/httperf/httperf; + homepage = "https://github.com/httperf/httperf"; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/httpie/default.nix b/nixpkgs/pkgs/tools/networking/httpie/default.nix index a0e2b8e01cc1..01986bf93219 100644 --- a/nixpkgs/pkgs/tools/networking/httpie/default.nix +++ b/nixpkgs/pkgs/tools/networking/httpie/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "httpie"; rev = version; - sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0"; + sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2"; }; outputs = [ "out" "doc" "man" ]; @@ -87,7 +87,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A command line HTTP client whose goal is to make CLI human-friendly"; - homepage = https://httpie.org/; + homepage = "https://httpie.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ]; }; diff --git a/nixpkgs/pkgs/tools/networking/httping/default.nix b/nixpkgs/pkgs/tools/networking/httping/default.nix index e269a38f8218..74aff38e1a60 100644 --- a/nixpkgs/pkgs/tools/networking/httping/default.nix +++ b/nixpkgs/pkgs/tools/networking/httping/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://vanheusden.com/httping; + homepage = "https://vanheusden.com/httping"; description = "ping with HTTP requests"; longDescription = '' Give httping an url, and it'll show you how long it takes to connect, diff --git a/nixpkgs/pkgs/tools/networking/httplab/default.nix b/nixpkgs/pkgs/tools/networking/httplab/default.nix index a7b157d3ebc2..f39b061c34db 100644 --- a/nixpkgs/pkgs/tools/networking/httplab/default.nix +++ b/nixpkgs/pkgs/tools/networking/httplab/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/gchaincl/httplab; + homepage = "https://github.com/gchaincl/httplab"; description = "Interactive WebServer"; license = licenses.mit; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/nixpkgs/pkgs/tools/networking/httplz/default.nix b/nixpkgs/pkgs/tools/networking/httplz/default.nix index 5d59010ac1ef..c4f003f884fc 100644 --- a/nixpkgs/pkgs/tools/networking/httplz/default.nix +++ b/nixpkgs/pkgs/tools/networking/httplz/default.nix @@ -12,10 +12,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - openssl pkgconfig - ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/tools/networking/httpstat/default.nix b/nixpkgs/pkgs/tools/networking/httpstat/default.nix index b3700fb93389..70bbabc35bb7 100644 --- a/nixpkgs/pkgs/tools/networking/httpstat/default.nix +++ b/nixpkgs/pkgs/tools/networking/httpstat/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "curl statistics made simple"; - homepage = https://github.com/reorx/httpstat; + homepage = "https://github.com/reorx/httpstat"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ nequissimus ]; }; diff --git a/nixpkgs/pkgs/tools/networking/httptunnel/default.nix b/nixpkgs/pkgs/tools/networking/httptunnel/default.nix index df62f90ad0bb..e8ed86da3da3 100644 --- a/nixpkgs/pkgs/tools/networking/httptunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/httptunnel/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests"; - homepage = http://www.nocrew.org/software/httptunnel; + homepage = "http://www.nocrew.org/software/httptunnel"; license = licenses.gpl2; maintainers = with maintainers; [ koral ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/hue-cli/Gemfile.lock b/nixpkgs/pkgs/tools/networking/hue-cli/Gemfile.lock index 8109cd96ac23..0600d6b7eca6 100644 --- a/nixpkgs/pkgs/tools/networking/hue-cli/Gemfile.lock +++ b/nixpkgs/pkgs/tools/networking/hue-cli/Gemfile.lock @@ -15,4 +15,4 @@ DEPENDENCIES hue-cli BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/networking/hue-cli/default.nix b/nixpkgs/pkgs/tools/networking/hue-cli/default.nix index b9b4a8eac9d2..f2ea6b37c810 100644 --- a/nixpkgs/pkgs/tools/networking/hue-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/hue-cli/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Command line interface for controlling Philips Hue system's lights and bridge"; - homepage = https://github.com/birkirb/hue-cli; + homepage = "https://github.com/birkirb/hue-cli"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ manveru nicknovitski ]; diff --git a/nixpkgs/pkgs/tools/networking/hyenae/default.nix b/nixpkgs/pkgs/tools/networking/hyenae/default.nix index cbcaee4de784..2ec22f2bab6f 100644 --- a/nixpkgs/pkgs/tools/networking/hyenae/default.nix +++ b/nixpkgs/pkgs/tools/networking/hyenae/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz; + url = "mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz"; sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = ""; - homepage = https://sourceforge.net/projects/hyenae/; + homepage = "https://sourceforge.net/projects/hyenae/"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 3b9680770951..191035f59f27 100644 --- a/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://i2pd.website; + homepage = "https://i2pd.website"; description = "Minimal I2P router written in C++"; license = licenses.bsd3; maintainers = with maintainers; [ edwtjo ]; diff --git a/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix b/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix index 72aaaa1e1706..25b6af5e92f4 100644 --- a/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Report network interfaces bandwith just like vmstat/iostat do for other system counters - legacy version"; - homepage = http://gael.roualland.free.fr/ifstat/; + homepage = "http://gael.roualland.free.fr/ifstat/"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/networking/iftop/default.nix b/nixpkgs/pkgs/tools/networking/iftop/default.nix index bc6f657f3781..70c1f0b6c965 100644 --- a/nixpkgs/pkgs/tools/networking/iftop/default.nix +++ b/nixpkgs/pkgs/tools/networking/iftop/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, ncurses, libpcap, automake}: +{ stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }: stdenv.mkDerivation { name = "iftop-1.0pre4"; src = fetchurl { - url = http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz; + url = "http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz"; sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp"; }; @@ -18,6 +18,8 @@ stdenv.mkDerivation { buildInputs = [ncurses libpcap]; + passthru.tests = { inherit (nixosTests) iftop; }; + meta = with stdenv.lib; { description = "Display bandwidth usage on a network interface"; longDescription = '' @@ -26,7 +28,7 @@ stdenv.mkDerivation { bandwidth usage by pairs of hosts. ''; license = licenses.gpl2Plus; - homepage = http://ex-parrot.com/pdw/iftop/; + homepage = "http://ex-parrot.com/pdw/iftop/"; platforms = platforms.unix; maintainers = [ ]; }; diff --git a/nixpkgs/pkgs/tools/networking/imapproxy/default.nix b/nixpkgs/pkgs/tools/networking/imapproxy/default.nix index 984b0a2f87ea..01480056a2ae 100644 --- a/nixpkgs/pkgs/tools/networking/imapproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/imapproxy/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "imapproxy-1.2.7"; src = fetchurl { - url = mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2; + url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2"; sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://imapproxy.org/; + homepage = "http://imapproxy.org/"; description = "It proxies IMAP transactions caching server connections"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/imapsync/default.nix b/nixpkgs/pkgs/tools/networking/imapsync/default.nix index c05928fa34b9..aa0980a2514e 100644 --- a/nixpkgs/pkgs/tools/networking/imapsync/default.nix +++ b/nixpkgs/pkgs/tools/networking/imapsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.linux-france.org/prj/imapsync/; + homepage = "http://www.linux-france.org/prj/imapsync/"; description = "Mail folder synchronizer between IMAP servers"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/nixpkgs/pkgs/tools/networking/inetutils/default.nix index 612e3ec0f835..1290ec2bdb1d 100644 --- a/nixpkgs/pkgs/tools/networking/inetutils/default.nix +++ b/nixpkgs/pkgs/tools/networking/inetutils/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { traceroute, uucpd, and whois. ''; - homepage = https://www.gnu.org/software/inetutils/; + homepage = "https://www.gnu.org/software/inetutils/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ matthewbauer ]; diff --git a/nixpkgs/pkgs/tools/networking/iodine/default.nix b/nixpkgs/pkgs/tools/networking/iodine/default.nix index c978a330ceeb..2703ca0fc64d 100644 --- a/nixpkgs/pkgs/tools/networking/iodine/default.nix +++ b/nixpkgs/pkgs/tools/networking/iodine/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://code.kryo.se/iodine/; + homepage = "http://code.kryo.se/iodine/"; description = "Tool to tunnel IPv4 data through a DNS server"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/ip2location/default.nix b/nixpkgs/pkgs/tools/networking/ip2location/default.nix index c3304c385e7b..205a4e6e7015 100644 --- a/nixpkgs/pkgs/tools/networking/ip2location/default.nix +++ b/nixpkgs/pkgs/tools/networking/ip2location/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { weather, MCC, MNC, mobile brand name, elevation and usage type of any IP address or host name in the IP2Location databases. ''; - homepage = https://www.ip2location.com/free/applications; + homepage = "https://www.ip2location.com/free/applications"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/ip2unix/default.nix b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix index d2dbd235e11c..83a6ea4b2434 100644 --- a/nixpkgs/pkgs/tools/networking/ip2unix/default.nix +++ b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/nixcloud/ip2unix; + homepage = "https://github.com/nixcloud/ip2unix"; description = "Turn IP sockets into Unix domain sockets"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; diff --git a/nixpkgs/pkgs/tools/networking/ipcalc/default.nix b/nixpkgs/pkgs/tools/networking/ipcalc/default.nix index 2727175f0412..7f118193a3a3 100644 --- a/nixpkgs/pkgs/tools/networking/ipcalc/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipcalc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "Simple IP network calculator"; - homepage = http://jodies.de/ipcalc; + homepage = "http://jodies.de/ipcalc"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/tools/networking/iperf/2.nix b/nixpkgs/pkgs/tools/networking/iperf/2.nix index 6494b907a3a9..f90b74313e50 100644 --- a/nixpkgs/pkgs/tools/networking/iperf/2.nix +++ b/nixpkgs/pkgs/tools/networking/iperf/2.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/iperf/; + homepage = "https://sourceforge.net/projects/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/networking/iperf/3.nix b/nixpkgs/pkgs/tools/networking/iperf/3.nix index bea61b082ec0..4506fbb11e36 100644 --- a/nixpkgs/pkgs/tools/networking/iperf/3.nix +++ b/nixpkgs/pkgs/tools/networking/iperf/3.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://software.es.net/iperf/; + homepage = "http://software.es.net/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/networking/isync/default.nix b/nixpkgs/pkgs/tools/networking/isync/default.nix index e62d819e1ec0..0373b05ede06 100644 --- a/nixpkgs/pkgs/tools/networking/isync/default.nix +++ b/nixpkgs/pkgs/tools/networking/isync/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl db cyrus_sasl zlib ]; meta = with stdenv.lib; { - homepage = http://isync.sourceforge.net/; + homepage = "http://isync.sourceforge.net/"; description = "Free IMAP and MailDir mailbox synchronizer"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/networking/jnettop/default.nix b/nixpkgs/pkgs/tools/networking/jnettop/default.nix index 083ec23af569..2d23ff1f1fd2 100644 --- a/nixpkgs/pkgs/tools/networking/jnettop/default.nix +++ b/nixpkgs/pkgs/tools/networking/jnettop/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { by bandwidth they use. ''; - homepage = http://jnettop.kubs.info/; + homepage = "http://jnettop.kubs.info/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/jwhois/default.nix b/nixpkgs/pkgs/tools/networking/jwhois/default.nix index e9f43da981c5..0a9ac99e2361 100644 --- a/nixpkgs/pkgs/tools/networking/jwhois/default.nix +++ b/nixpkgs/pkgs/tools/networking/jwhois/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jwhois-4.0"; src = fetchurl { - url = mirror://gnu/jwhois/jwhois-4.0.tar.gz; + url = "mirror://gnu/jwhois/jwhois-4.0.tar.gz"; sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; - homepage = https://www.gnu.org/software/jwhois/; + homepage = "https://www.gnu.org/software/jwhois/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/kail/default.nix b/nixpkgs/pkgs/tools/networking/kail/default.nix index 931cfa3a74d9..e7c9b499675a 100644 --- a/nixpkgs/pkgs/tools/networking/kail/default.nix +++ b/nixpkgs/pkgs/tools/networking/kail/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Kubernetes log viewer"; - homepage = https://github.com/boz/kail; + homepage = "https://github.com/boz/kail"; license = licenses.mit; maintainers = with maintainers; [ offline vdemeester ]; }; diff --git a/nixpkgs/pkgs/tools/networking/kea/default.nix b/nixpkgs/pkgs/tools/networking/kea/default.nix index 3986cadd08a5..386a3ae280aa 100644 --- a/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://kea.isc.org/; + homepage = "https://kea.isc.org/"; description = "High-performance, extensible DHCP server by ISC"; longDescription = '' KEA is a new open source DHCPv4/DHCPv6 server being developed by diff --git a/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/nixpkgs/pkgs/tools/networking/keepalived/default.nix index 68d253ef0b8f..076953161a33 100644 --- a/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://keepalived.org; + homepage = "https://keepalived.org"; description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/lftp/default.nix b/nixpkgs/pkgs/tools/networking/lftp/default.nix index 602ada1476a9..3bd61a0bd498 100644 --- a/nixpkgs/pkgs/tools/networking/lftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/lftp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A file transfer program supporting a number of network protocols"; - homepage = https://lftp.tech/; + homepage = "https://lftp.tech/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/networking/libnids/default.nix b/nixpkgs/pkgs/tools/networking/libnids/default.nix index ef753127c67e..2a93d3c8a598 100644 --- a/nixpkgs/pkgs/tools/networking/libnids/default.nix +++ b/nixpkgs/pkgs/tools/networking/libnids/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x"; - homepage = http://libnids.sourceforge.net/; + homepage = "http://libnids.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.symphorien ]; # probably also bsd and solaris diff --git a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix index 3c361fe48baf..6f94e0c63c50 100644 --- a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix +++ b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix @@ -48,7 +48,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Check websites for broken links"; - homepage = https://linkcheck.github.io/linkchecker/; + homepage = "https://linkcheck.github.io/linkchecker/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ peterhoeg tweber ]; }; diff --git a/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/nixpkgs/pkgs/tools/networking/lldpd/default.nix index 653865b0e919..8462d907a1f6 100644 --- a/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"; - homepage = https://vincentbernat.github.io/lldpd/; + homepage = "https://vincentbernat.github.io/lldpd/"; license = licenses.isc; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix b/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix index e8a83d381317..4abe083a0b9c 100644 --- a/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; - homepage = https://secure.logmein.com/products/hamachi/; + homepage = "https://secure.logmein.com/products/hamachi/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/lsh/default.nix b/nixpkgs/pkgs/tools/networking/lsh/default.nix index 5d788af1682e..56ed33ea36af 100644 --- a/nixpkgs/pkgs/tools/networking/lsh/default.nix +++ b/nixpkgs/pkgs/tools/networking/lsh/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { SECSH working group. ''; - homepage = http://www.lysator.liu.se/~nisse/lsh/; + homepage = "http://www.lysator.liu.se/~nisse/lsh/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; diff --git a/nixpkgs/pkgs/tools/networking/maildrop/default.nix b/nixpkgs/pkgs/tools/networking/maildrop/default.nix index 44c8b9a9c4d5..d0a74fe4b5bf 100644 --- a/nixpkgs/pkgs/tools/networking/maildrop/default.nix +++ b/nixpkgs/pkgs/tools/networking/maildrop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { doCheck = false; # fails with "setlocale: LC_ALL: cannot change locale (en_US.UTF-8)" meta = with stdenv.lib; { - homepage = http://www.courier-mta.org/maildrop/; + homepage = "http://www.courier-mta.org/maildrop/"; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/mailsend/default.nix b/nixpkgs/pkgs/tools/networking/mailsend/default.nix index c888f354eae7..6b9a0caacb92 100644 --- a/nixpkgs/pkgs/tools/networking/mailsend/default.nix +++ b/nixpkgs/pkgs/tools/networking/mailsend/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = https://github.com/muquit/mailsend/commit/960df6d7a11eef90128dc2ae660866b27f0e4336.patch; + url = "https://github.com/muquit/mailsend/commit/960df6d7a11eef90128dc2ae660866b27f0e4336.patch"; sha256 = "0vz373zcfl19inflybfjwshcq06rvhx0i5g0f4b021cxfhyb1sm0"; }) ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.bsd3 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://github.com/muquit/mailsend; + homepage = "https://github.com/muquit/mailsend"; downloadPage = "https://github.com/muquit/mailsend/releases"; }; } diff --git a/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 3e5300549db6..935cadbd7b87 100644 --- a/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej vrthra ]; - homepage = https://www.gnu.org/software/mailutils/; + homepage = "https://www.gnu.org/software/mailutils/"; # Some of the dependencies fail to build on {cyg,dar}win. platforms = platforms.gnu ++ platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/maphosts/Gemfile.lock b/nixpkgs/pkgs/tools/networking/maphosts/Gemfile.lock index c456210217e5..3e2332f75ccf 100644 --- a/nixpkgs/pkgs/tools/networking/maphosts/Gemfile.lock +++ b/nixpkgs/pkgs/tools/networking/maphosts/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES maphosts BUNDLED WITH - 1.12.5 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/networking/maphosts/default.nix b/nixpkgs/pkgs/tools/networking/maphosts/default.nix index dd9886a65eee..8e3d0cf9160c 100644 --- a/nixpkgs/pkgs/tools/networking/maphosts/default.nix +++ b/nixpkgs/pkgs/tools/networking/maphosts/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Small command line application for keeping your project hostnames in sync with /etc/hosts"; - homepage = https://github.com/mpscholten/maphosts; + homepage = "https://github.com/mpscholten/maphosts"; license = licenses.mit; maintainers = with maintainers; [ mpscholten nicknovitski ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/maxscale/default.nix b/nixpkgs/pkgs/tools/networking/maxscale/default.nix index 4288395cdac5..48590a9e3059 100644 --- a/nixpkgs/pkgs/tools/networking/maxscale/default.nix +++ b/nixpkgs/pkgs/tools/networking/maxscale/default.nix @@ -79,9 +79,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''MaxScale database proxy extends MariaDB Server's high availability''; - homepage = https://mariadb.com/products/technology/maxscale; + homepage = "https://mariadb.com/products/technology/maxscale"; license = licenses.bsl11; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; + broken = true; }; } diff --git a/nixpkgs/pkgs/tools/networking/mcrcon/default.nix b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix index 469dd4cceb71..4f943f2cec61 100644 --- a/nixpkgs/pkgs/tools/networking/mcrcon/default.nix +++ b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/; + homepage = "https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/"; description = "Minecraft console client with Bukkit coloring support."; longDescription = '' Mcrcon is a powerful Minecraft RCON terminal client with Bukkit coloring support. diff --git a/nixpkgs/pkgs/tools/networking/megatools/default.nix b/nixpkgs/pkgs/tools/networking/megatools/default.nix index 50875858574d..b729e9961857 100644 --- a/nixpkgs/pkgs/tools/networking/megatools/default.nix +++ b/nixpkgs/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 ] @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; - homepage = https://megatools.megous.com/; + homepage = "https://megatools.megous.com/"; license = licenses.gpl2Plus; maintainers = [ maintainers.viric maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix b/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix index 075696cfba1b..3579002e4169 100644 --- a/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Redis and Memcached traffic generation and benchmarking tool"; - homepage = https://github.com/redislabs/memtier_benchmark; + homepage = "https://github.com/redislabs/memtier_benchmark"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/nixpkgs/pkgs/tools/networking/minidlna/default.nix b/nixpkgs/pkgs/tools/networking/minidlna/default.nix index 49cc5710e599..0fbd76855a7d 100644 --- a/nixpkgs/pkgs/tools/networking/minidlna/default.nix +++ b/nixpkgs/pkgs/tools/networking/minidlna/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully compliant with DLNA/UPnP-AV clients. ''; - homepage = https://sourceforge.net/projects/minidlna/; + homepage = "https://sourceforge.net/projects/minidlna/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index b8cf93bc2d3f..b3b150d4b83a 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "minio-client"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - subPackages = [ "." ]; preBuild = '' @@ -22,7 +20,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/minio/mc; + homepage = "https://github.com/minio/mc"; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; maintainers = with maintainers; [ eelco bachp ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/minissdpd/default.nix b/nixpkgs/pkgs/tools/networking/minissdpd/default.nix index 1277a17f9bae..b5702b9bfadd 100644 --- a/nixpkgs/pkgs/tools/networking/minissdpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/minissdpd/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { the machine. Software must be patched in order to take advantage of MiniSSDPd, and MiniSSDPd must be started before any other UPnP program. ''; - homepage = http://miniupnp.free.fr/minissdpd.html; - downloadPage = http://miniupnp.free.fr/files/; + homepage = "http://miniupnp.free.fr/minissdpd.html"; + downloadPage = "http://miniupnp.free.fr/files/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix index ebe6a60291a4..41927278ac82 100644 --- a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix +++ b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix @@ -20,7 +20,7 @@ let makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://miniupnp.free.fr/; + homepage = "http://miniupnp.free.fr/"; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = with platforms; linux ++ freebsd ++ darwin; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix index f65c0c63370b..23f02dde1f42 100644 --- a/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://miniupnp.free.fr/; + homepage = "http://miniupnp.free.fr/"; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/networking/miredo/default.nix b/nixpkgs/pkgs/tools/networking/miredo/default.nix index 26f6c2498e18..1982cab6b395 100644 --- a/nixpkgs/pkgs/tools/networking/miredo/default.nix +++ b/nixpkgs/pkgs/tools/networking/miredo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Teredo IPv6 Tunneling Daemon"; - homepage = https://www.remlab.net/miredo/; + homepage = "https://www.remlab.net/miredo/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix b/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix index 53369baa01c8..b9d873fad6af 100644 --- a/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix @@ -4,47 +4,15 @@ with python3Packages; buildPythonPackage rec { pname = "mitmproxy"; - version = "4.0.4"; + version = "5.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "14i9dkafvyl15rq2qa8xldscn5lmkk2g52kbi2hl63nzx9yibx6r"; + sha256 = "1lirlckpvd3c6s6q3p32w4k4yfna5mlgr1x9g39lhzzq0sdiz3lk"; }; - patches = [ - (fetchpatch { - # Tests failed due to expired test certificates, - # https://github.com/mitmproxy/mitmproxy/issues/3316 - # TODO: remove on next update - name = "test-certificates.patch"; - url = "https://github.com/mitmproxy/mitmproxy/commit/1b6a8d6acd3d70f9b9627ad4ae9def08103f8250.patch"; - sha256 = "03y79c25yir7d8xj79czdc81y3irqq1i3ks9ca0mv1az8b7xsvfv"; - }) - (fetchpatch { - # 0.13 <= wsproto < 0.14 patch - # https://github.com/mitmproxy/mitmproxy/issues/3459 - # TODO: remove on next update - name = "wsproto-0.13.patch"; - url = https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch; - sha256 = "1ddxdr7js510kzyq3gyks4k5k1n8zb1i9amxw7wzmi1dcg8kqw9a"; - # We strip these bounds anyway - excludes = [ "setup.py" ]; - }) - (fetchpatch { - # Fix for newer pytest disallowing calling fixtures - # https://github.com/mitmproxy/mitmproxy/issues/3403 - # TODO: remove on next update - name = "dont-call-fixtures.patch"; - url = https://github.com/mitmproxy/mitmproxy/commit/ce28721458c8cc71de86513a5110676e9763041b.patch; - sha256 = "05pljr28lx7l1xgswqr9sz8dnhvc7npzh8xg2p9hignf159kd54d"; - # Irrelevant in nixpkgs - excludes = [ "setup.py" "setup.cfg" "release/docker/*" ]; - }) - ./pytest5.patch - ]; - postPatch = '' # remove dependency constraints sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py @@ -61,22 +29,26 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - blinker click certifi cryptography - h2 hyperframe kaitaistruct passlib - pyasn1 pyopenssl pyparsing pyperclip - ruamel_yaml tornado urwid brotlipy - sortedcontainers ldap3 wsproto setuptools + blinker brotli certifi cffi + click cryptography flask h11 + h2 hpack hyperframe itsdangerous + jinja2 kaitaistruct ldap3 markupsafe + passlib protobuf publicsuffix2 pyasn1 + pycparser pyopenssl pyparsing pyperclip + ruamel_yaml setuptools six sortedcontainers + tornado urwid werkzeug wsproto zstandard ]; checkInputs = [ beautifulsoup4 flask pytest requests glibcLocales asynctest parver pytest-asyncio + hypothesis ]; meta = with stdenv.lib; { description = "Man-in-the-middle proxy"; - homepage = https://mitmproxy.org/; + homepage = "https://mitmproxy.org/"; license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; }; diff --git a/nixpkgs/pkgs/tools/networking/mitmproxy/pytest5.patch b/nixpkgs/pkgs/tools/networking/mitmproxy/pytest5.patch deleted file mode 100644 index bfbf7253b9c4..000000000000 --- a/nixpkgs/pkgs/tools/networking/mitmproxy/pytest5.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/test/mitmproxy/net/test_tls.py b/test/mitmproxy/net/test_tls.py -index 489bf89f..c78472e3 100644 ---- a/test/mitmproxy/net/test_tls.py -+++ b/test/mitmproxy/net/test_tls.py -@@ -87,14 +87,16 @@ def test_get_client_hello(): - rfile = io.BufferedReader(io.BytesIO( - FULL_CLIENT_HELLO_NO_EXTENSIONS[:30] - )) -- with pytest.raises(exceptions.TlsProtocolException, message="Unexpected EOF"): -+ with pytest.raises(exceptions.TlsProtocolException): - tls.get_client_hello(rfile) -+ pytest.fail("Unexpected EOF") - - rfile = io.BufferedReader(io.BytesIO( - b"GET /" - )) -- with pytest.raises(exceptions.TlsProtocolException, message="Expected TLS record"): -+ with pytest.raises(exceptions.TlsProtocolException): - tls.get_client_hello(rfile) -+ pytest.fail("Expected TLS record") - - - class TestClientHello: -@@ -153,5 +155,6 @@ class TestClientHello: - b"\x01\x00\x00\x03" + # handshake header - b"foo" - )) -- with pytest.raises(exceptions.TlsProtocolException, message='Cannot parse Client Hello'): -+ with pytest.raises(exceptions.TlsProtocolException): - tls.ClientHello.from_file(rfile) -+ pytest.fail('Cannot parse Client Hello') diff --git a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix index e9d925fb930c..badfddd6d50c 100644 --- a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" ''; + enableParallelBuilding = true; + doCheck = true; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/networking/mosh/default.nix b/nixpkgs/pkgs/tools/networking/mosh/default.nix index 98d2625aade9..648fdb9d20e8 100644 --- a/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ++ (with perlPackages; [ perl IOTty ]) ++ lib.optional withUtempter libutempter; + enableParallelBuilding = true; + patches = [ ./ssh_path.patch ./utempter_path.patch @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { - homepage = https://mosh.org/; + homepage = "https://mosh.org/"; description = "Mobile shell (ssh replacement)"; longDescription = '' Remote terminal application that allows roaming, supports intermittent diff --git a/nixpkgs/pkgs/tools/networking/mtr/default.nix b/nixpkgs/pkgs/tools/networking/mtr/default.nix index 18850fab3300..ae5695537af4 100644 --- a/nixpkgs/pkgs/tools/networking/mtr/default.nix +++ b/nixpkgs/pkgs/tools/networking/mtr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/traviscross/mtr/pull/315 (fetchpatch { - url = https://github.com/traviscross/mtr/pull/315.patch?full_index=1; + url = "https://github.com/traviscross/mtr/pull/315.patch?full_index=1"; sha256 = "18qcsj9058snc2qhq6v6gdbqhz021gi5fgw9h7vfczv45gf0qasa"; }) ]; diff --git a/nixpkgs/pkgs/tools/networking/mu/default.nix b/nixpkgs/pkgs/tools/networking/mu/default.nix index cdd954e19758..ae1ca3f77611 100644 --- a/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz"; + sha256 = "0q2ik7fj5k9i76js4ijyxbgrwqff437lass0sd5if2r40rqh0as0"; }; - # test-utils coredumps so don't run those - postPatch = '' - sed -i -e '/test-utils/d' lib/parser/Makefile.am - ''; - buildInputs = [ sqlite xapian glib gmime3 texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; @@ -27,19 +22,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + preConfigure = "./autogen.sh"; + preBuild = '' # Fix mu4e-builddir (set it to $out) substituteInPlace mu4e/mu4e-meta.el.in \ --replace "@abs_top_builddir@" "$out" - - # We install msg2pdf to bin/msg2pdf, fix its location in elisp - substituteInPlace mu4e/mu4e-actions.el \ - --replace "/toys/msg2pdf/" "/bin/" ''; - # Install mug and msg2pdf + # Install mug postInstall = stdenv.lib.optionalString withMug '' - for f in msg2pdf mug ; do + for f in mug ; do install -m755 toys/$f/$f $out/bin/$f done ''; @@ -49,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; - homepage = https://www.djcbsoftware.nl/code/mu/; + homepage = "https://www.djcbsoftware.nl/code/mu/"; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ antono the-kenny peterhoeg ]; }; diff --git a/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix b/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix index a4dcfb4a40f2..e3bf3391f21e 100644 --- a/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix +++ b/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { isn't necessary to reconfigure the involved NAT gateways, either. nat-traverse works out-of-the-box. ''; - homepage = https://www.speicherleck.de/iblech/nat-traverse/; + homepage = "https://www.speicherleck.de/iblech/nat-traverse/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.iblech ]; diff --git a/nixpkgs/pkgs/tools/networking/nbd/default.nix b/nixpkgs/pkgs/tools/networking/nbd/default.nix index 9c443696eda6..d634c37b1231 100644 --- a/nixpkgs/pkgs/tools/networking/nbd/default.nix +++ b/nixpkgs/pkgs/tools/networking/nbd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lrt -lpthread"; meta = { - homepage = http://nbd.sourceforge.net; + homepage = "http://nbd.sourceforge.net"; description = "Map arbitrary files as block devices over the network"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/nixpkgs/pkgs/tools/networking/ncftp/default.nix b/nixpkgs/pkgs/tools/networking/ncftp/default.nix index acd9a0e27f86..98fa6cc29f1a 100644 --- a/nixpkgs/pkgs/tools/networking/ncftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ncftp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line FTP (File Transfer Protocol) client"; - homepage = https://www.ncftp.com/ncftp/; + homepage = "https://www.ncftp.com/ncftp/"; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; license = licenses.clArtistic; diff --git a/nixpkgs/pkgs/tools/networking/ndisc6/default.nix b/nixpkgs/pkgs/tools/networking/ndisc6/default.nix index 43018e401f1e..03304df5f792 100644 --- a/nixpkgs/pkgs/tools/networking/ndisc6/default.nix +++ b/nixpkgs/pkgs/tools/networking/ndisc6/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.remlab.net/ndisc6/; + homepage = "https://www.remlab.net/ndisc6/"; description = "A small collection of useful tools for IPv6 networking"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix b/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix index 85de6d131837..3edfe9b7e5d6 100644 --- a/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { longDescription = '' Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. ''; - homepage = http://pjp.dgplug.org/ndjbdns/; + homepage = "http://pjp.dgplug.org/ndjbdns/"; license = licenses.gpl2; maintainers = [ maintainers.msackman ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/networking/nebula/default.nix b/nixpkgs/pkgs/tools/networking/nebula/default.nix index f78d7129c34a..ec94fc97997a 100644 --- a/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -1,25 +1,23 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "nebula"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "v${version}"; - sha256 = "0nwagk3q2gkirqrk27fisad2c2p2y1lsvz5phax9v5h51p1y79ia"; + sha256 = "0xrki9w83b4b3l5adq1rxz374f124wf388sdyvy7ngc3b04k7qlb"; }; - modSha256 = "1sy5mnwn9fxjf3y41lm8gsggid2c0y08iw88m9ng8psaf4qid8ij"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0v45ikw0bl00412krg4v6sr9bggvsrvl0h6clihkh4mdfz6kwa47"; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; longDescription = '' Nebula is a scalable overlay networking tool with a focus on performance, diff --git a/nixpkgs/pkgs/tools/networking/netcat/default.nix b/nixpkgs/pkgs/tools/networking/netcat/default.nix index 47ec804e5d48..5c275ee6ab4b 100644 --- a/nixpkgs/pkgs/tools/networking/netcat/default.nix +++ b/nixpkgs/pkgs/tools/networking/netcat/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "netcat-gnu-0.7.1"; src = fetchurl { - url = mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2; + url = "mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2"; sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; }; meta = with stdenv.lib; { description = "Utility which reads and writes data across network connections"; - homepage = http://netcat.sourceforge.net/; + homepage = "http://netcat.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/nethogs/default.nix b/nixpkgs/pkgs/tools/networking/nethogs/default.nix index a85d4d7ad108..7bc6d0e2be78 100644 --- a/nixpkgs/pkgs/tools/networking/nethogs/default.nix +++ b/nixpkgs/pkgs/tools/networking/nethogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nethogs"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; rev = "v${version}"; - sha256 = "13plwblwbnyyi40jaqx471gwhln08wm7f0fxyvj1yh3d81k556yx"; + sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9"; }; buildInputs = [ ncurses libpcap ]; diff --git a/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix b/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix index de53cfdd224c..847d8cbcf895 100644 --- a/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; - homepage = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/; + homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; license = stdenv.lib.licenses.bsdOriginal; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/networking/netmask/default.nix b/nixpkgs/pkgs/tools/networking/netmask/default.nix index 864838bdd390..fa36ee5d8026 100644 --- a/nixpkgs/pkgs/tools/networking/netmask/default.nix +++ b/nixpkgs/pkgs/tools/networking/netmask/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/tlby/netmask; + homepage = "https://github.com/tlby/netmask"; description = "An IP address formatting tool "; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/netrw/default.nix b/nixpkgs/pkgs/tools/networking/netrw/default.nix index dfd355237dc0..f7d73283d48f 100644 --- a/nixpkgs/pkgs/tools/networking/netrw/default.nix +++ b/nixpkgs/pkgs/tools/networking/netrw/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple tool for transporting data over the network"; license = stdenv.lib.licenses.gpl2; - homepage = https://mamuti.net/netrw/index.en.html; + homepage = "https://mamuti.net/netrw/index.en.html"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/netselect/default.nix b/nixpkgs/pkgs/tools/networking/netselect/default.nix index c40f43c214fc..dfca4c9058ee 100644 --- a/nixpkgs/pkgs/tools/networking/netselect/default.nix +++ b/nixpkgs/pkgs/tools/networking/netselect/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/apenwarr/netselect; + homepage = "https://github.com/apenwarr/netselect"; description = "An ultrafast intelligent parallelizing binary-search implementation of \"ping\""; license = licenses.bsd3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix b/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix index 8da36d72fda2..c0c7b6782dfc 100644 --- a/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix +++ b/nixpkgs/pkgs/tools/networking/netsniff-ng/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { to user space and vice versa. The toolkit can be used for network development and analysis, debugging, auditing or network reconnaissance. ''; - homepage = http://netsniff-ng.org/; + homepage = "http://netsniff-ng.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix index 131ec6751159..6035e35f6340 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = "http://projects.gnome.org/NetworkManager/"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/default.nix index bbec39b9502b..baf2128153aa 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/default.nix @@ -10,11 +10,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "network-manager"; - version = "1.22.8"; + version = "1.22.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "0kxbgln78lb1cxhd79vbpdbncsb0cppr15fycgqb9df6f8nbj4cm"; + sha256 = "0xyaizyp3yz6x3pladw3nvl3hf4n5g140zx9jnxfp9qvag0wqa9b"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/NetworkManager; + homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace ]; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix index 93a169a3fb0f..f84ef027f762 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; - homepage = https://github.com/firecat53/networkmanager-dmenu; + homepage = "https://github.com/firecat53/networkmanager-dmenu"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.jensbin ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix index 09fb0c5977b5..430462f91997 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/nm-l2tp/network-manager-l2tp; + homepage = "https://github.com/nm-l2tp/network-manager-l2tp"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix index 13f7eab5cc78..79435a9e5e8b 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, libnma }: +, gtk3, withGnome ? true, gnome3, kmod, libnma }: let pname = "NetworkManager-openvpn"; - version = "1.8.10"; + version = "1.8.12"; in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vri49yff4lj13dnzkpq9nx3a4z1bmbrv807r151plj8m1mwhg5g"; + sha256 = "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"; }; patches = [ @@ -17,11 +17,6 @@ in stdenv.mkDerivation { src = ./fix-paths.patch; inherit kmod openvpn; }) - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/merge_requests/13.patch"; - sha256 = "06cvqi28v72dd53fw8ix95mqj885xhwi8qcs2q7hvm5bvnhwn704"; - }) ]; buildInputs = [ openvpn networkmanager ] @@ -30,7 +25,6 @@ in stdenv.mkDerivation { nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; configureFlags = [ - "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager "--enable-absolute-paths" diff --git a/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/nixpkgs/pkgs/tools/networking/nfdump/default.nix index 256bb8243102..22d84a7f6999 100644 --- a/nixpkgs/pkgs/tools/networking/nfdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, yacc }: -let version = "1.6.19"; in +let version = "1.6.20"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "0idhg7pdkv602h0d0dz7msk8gsxz32ingn16dkqbxp4mgfiakp9r"; + sha256 = "06pywhymb92l0kac9djjpvlwrn1c7bxs3wm5yzrlaf815175ar3c"; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; diff --git a/nixpkgs/pkgs/tools/networking/ngrep/default.nix b/nixpkgs/pkgs/tools/networking/ngrep/default.nix index ab8da6236cff..60125b515d67 100644 --- a/nixpkgs/pkgs/tools/networking/ngrep/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrep/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { null interfaces, and understands BPF filter logic in the same fashion as more common packet sniffing tools, such as tcpdump and snoop. ''; - homepage = https://github.com/jpr5/ngrep/; + homepage = "https://github.com/jpr5/ngrep/"; # <ngrep>/doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. diff --git a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix index 6e6d543c4391..82f6ed4760cf 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix @@ -30,6 +30,6 @@ buildGoPackage rec { buildFlags = [ "-tags release" ]; meta = { - homepage = https://ngrok.com/; + homepage = "https://ngrok.com/"; }; } diff --git a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix index a0d6171efe21..f17849ef757c 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { longDescription = '' Allows you to expose a web server running on your local machine to the internet. ''; - homepage = https://ngrok.com/; + homepage = "https://ngrok.com/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bobvanderlinden ]; diff --git a/nixpkgs/pkgs/tools/networking/noip/default.nix b/nixpkgs/pkgs/tools/networking/noip/default.nix index 0ef2ce508671..6503e7013774 100644 --- a/nixpkgs/pkgs/tools/networking/noip/default.nix +++ b/nixpkgs/pkgs/tools/networking/noip/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "noip-2.1.9-1"; src = fetchurl { - url = https://www.noip.com/client/linux/noip-duc-linux.tar.gz; + url = "https://www.noip.com/client/linux/noip-duc-linux.tar.gz"; sha256 = "82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Dynamic DNS daemon for no-ip accounts"; - homepage = http://noip.com/download?page=linux; + homepage = "http://noip.com/download?page=linux"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.iand675 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix b/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix index 9f83949e8de0..1aaead46f6ad 100644 --- a/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { domain `.local'. ''; - homepage = http://0pointer.de/lennart/projects/nss-mdns/; + homepage = "http://0pointer.de/lennart/projects/nss-mdns/"; license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. diff --git a/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix b/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix index 569a6d118e77..3ce7638923c3 100644 --- a/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; - homepage = https://arthurdejong.org/nss-pam-ldapd/; + homepage = "https://arthurdejong.org/nss-pam-ldapd/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/ntopng/default.nix b/nixpkgs/pkgs/tools/networking/ntopng/default.nix index 68f801060310..3db5a28f1616 100644 --- a/nixpkgs/pkgs/tools/networking/ntopng/default.nix +++ b/nixpkgs/pkgs/tools/networking/ntopng/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; - homepage = http://www.ntop.org/products/ntop/; + homepage = "http://www.ntop.org/products/ntop/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/networking/ntp/default.nix b/nixpkgs/pkgs/tools/networking/ntp/default.nix index 0ce1c5a04292..d118227c3268 100644 --- a/nixpkgs/pkgs/tools/networking/ntp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ntp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "An implementation of the Network Time Protocol"; license = { # very close to isc and bsd2 - url = https://www.eecis.udel.edu/~mills/ntp/html/copyright.html; + url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"; }; maintainers = with maintainers; [ eelco thoughtpolice ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/nuttcp/default.nix b/nixpkgs/pkgs/tools/networking/nuttcp/default.nix index f01d5ccada19..fe3cde5f91a0 100644 --- a/nixpkgs/pkgs/tools/networking/nuttcp/default.nix +++ b/nixpkgs/pkgs/tools/networking/nuttcp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { and loss percentage (for UDP transfers). ''; license = licenses.gpl2; - homepage = http://nuttcp.net/; + homepage = "http://nuttcp.net/"; maintainers = with maintainers; [ ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/nylon/default.nix b/nixpkgs/pkgs/tools/networking/nylon/default.nix index 5c8f98101eed..d6f8cb21e0bc 100644 --- a/nixpkgs/pkgs/tools/networking/nylon/default.nix +++ b/nixpkgs/pkgs/tools/networking/nylon/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "nylon-1.21"; src = fetchurl { - url = https://monkey.org/~marius/nylon/nylon-1.21.tar.gz; + url = "https://monkey.org/~marius/nylon/nylon-1.21.tar.gz"; sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ libevent ]; meta = with stdenv.lib; { - homepage = http://monkey.org/~marius/nylon; + homepage = "http://monkey.org/~marius/nylon"; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; license = licenses.bsdOriginal; maintainers = with maintainers; [ edwtjo ]; diff --git a/nixpkgs/pkgs/tools/networking/nyx/default.nix b/nixpkgs/pkgs/tools/networking/nyx/default.nix index 901187c6abb9..6ae81609eec8 100644 --- a/nixpkgs/pkgs/tools/networking/nyx/default.nix +++ b/nixpkgs/pkgs/tools/networking/nyx/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages }: +{ lib, python3Packages }: -with pythonPackages; +with python3Packages; buildPythonApplication rec { pname = "nyx"; @@ -18,7 +18,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line monitor for Tor"; - homepage = https://nyx.torproject.org/; + homepage = "https://nyx.torproject.org/"; license = licenses.gpl3; maintainers = with maintainers; [ offline ]; }; diff --git a/nixpkgs/pkgs/tools/networking/nzbget/default.nix b/nixpkgs/pkgs/tools/networking/nzbget/default.nix index b3c77f5b797c..c25f19c03507 100644 --- a/nixpkgs/pkgs/tools/networking/nzbget/default.nix +++ b/nixpkgs/pkgs/tools/networking/nzbget/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://nzbget.net; + homepage = "https://nzbget.net"; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/networking/obfs4/default.nix b/nixpkgs/pkgs/tools/networking/obfs4/default.nix index 93ebdeb0720c..02820c0a74fd 100644 --- a/nixpkgs/pkgs/tools/networking/obfs4/default.nix +++ b/nixpkgs/pkgs/tools/networking/obfs4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildGoModule, Security }: +{ lib, fetchgit, buildGoModule }: buildGoModule rec { pname = "obfs4"; @@ -12,12 +12,10 @@ buildGoModule rec { modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A pluggable transport proxy"; - homepage = https://www.torproject.org/projects/obfsproxy; - repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git; + homepage = "https://www.torproject.org/projects/obfsproxy"; + repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; maintainers = with maintainers; [ phreedom thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/ocproxy/default.nix b/nixpkgs/pkgs/tools/networking/ocproxy/default.nix index 729f5b319980..877f15865acb 100644 --- a/nixpkgs/pkgs/tools/networking/ocproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/ocproxy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ocproxy is a user-level SOCKS and port forwarding proxy for OpenConnect based on lwIP. ''; - homepage = https://github.com/cernekee/ocproxy; + homepage = "https://github.com/cernekee/ocproxy"; license = licenses.bsd3; maintainers = [ maintainers.joko ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/nixpkgs/pkgs/tools/networking/ocserv/default.nix index 8d4b340ea2b1..dea0d10a277f 100644 --- a/nixpkgs/pkgs/tools/networking/ocserv/default.nix +++ b/nixpkgs/pkgs/tools/networking/ocserv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ nettle gnutls libev protobufc guile geoip libseccomp gperf readline lz4 libgssglue ronn pam ]; meta = with stdenv.lib; { - homepage = https://gitlab.com/openconnect/ocserv; + homepage = "https://gitlab.com/openconnect/ocserv"; license = licenses.gpl2; description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client."; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix index 983ba0184738..73e2e6b60f51 100644 --- a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix +++ b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix @@ -2,14 +2,14 @@ asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { - version = "7.3.2"; + version = "7.3.3"; pname = "offlineimap"; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0rmj1ws6hljqnfap3p3js5s46kx85yc02hjkiki5zg44wn3hswjg"; + sha256 = "1gg8ry67i20qapj4z20am9bm67m2q28kixcj7ja75m897vhzarnq"; }; postPatch = '' @@ -33,7 +33,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; - homepage = http://offlineimap.org; + homepage = "http://offlineimap.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ endocrimes ]; }; diff --git a/nixpkgs/pkgs/tools/networking/ofono/default.nix b/nixpkgs/pkgs/tools/networking/ofono/default.nix index 5cae8a612033..c6b2ffe9e832 100644 --- a/nixpkgs/pkgs/tools/networking/ofono/default.nix +++ b/nixpkgs/pkgs/tools/networking/ofono/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Infrastructure for building mobile telephony (GSM/UMTS) applications"; - homepage = https://01.org/ofono; + homepage = "https://01.org/ofono"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/olsrd/default.nix b/nixpkgs/pkgs/tools/networking/olsrd/default.nix index cff4b7e97137..bc5a03580195 100644 --- a/nixpkgs/pkgs/tools/networking/olsrd/default.nix +++ b/nixpkgs/pkgs/tools/networking/olsrd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An adhoc wireless mesh routing daemon"; license = stdenv.lib.licenses.bsd3; - homepage = http://olsr.org/; + homepage = "http://olsr.org/"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 1cb8e02130f7..2e5695ff4525 100644 --- a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; - homepage = https://github.com/OpenAPITools/openapi-generator; + homepage = "https://github.com/OpenAPITools/openapi-generator"; license = licenses.asl20; maintainers = [ maintainers.shou ]; }; diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 01a0ef2242ed..f5d71fb8e85b 100644 --- a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; - homepage = https://github.com/OpenAPITools/openapi-generator; + homepage = "https://github.com/OpenAPITools/openapi-generator"; license = licenses.asl20; maintainers = [ maintainers.shou ]; }; diff --git a/nixpkgs/pkgs/tools/networking/openconnect/default.nix b/nixpkgs/pkgs/tools/networking/openconnect/default.nix index a926ef1e1ddc..101346d31b1e 100644 --- a/nixpkgs/pkgs/tools/networking/openconnect/default.nix +++ b/nixpkgs/pkgs/tools/networking/openconnect/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VPN Client for Cisco's AnyConnect SSL VPN"; - homepage = http://www.infradead.org/openconnect/; + homepage = "http://www.infradead.org/openconnect/"; license = licenses.lgpl21; maintainers = with maintainers; [ pradeepchhetri tricktron ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix b/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix index 68d18bff777b..2c452847aa3b 100644 --- a/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix +++ b/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN"; - homepage = https://github.com/dlenski/openconnect/; + homepage = "https://github.com/dlenski/openconnect/"; license = licenses.lgpl21; maintainers = with maintainers; [ chessai ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index 548f0e97be99..6e6e8fbf23c2 100644 --- a/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.12.0"; + version = "1.13.1"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1ndyiw4c2s8m0xds4ff87rdpixhbma5v2g420w3gfc1p7alhqz66"; + sha256 = "1sfqi169xf0wmlpzri9frkgsh99fgjvcpbdkd42vsm10qa1dnpk5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/openntpd/default.nix b/nixpkgs/pkgs/tools/networking/openntpd/default.nix index 9cfb24ce95d4..7cbba9bfbf6b 100644 --- a/nixpkgs/pkgs/tools/networking/openntpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/openntpd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.openntpd.org/; + homepage = "http://www.openntpd.org/"; license = licenses.bsd3; description = "OpenBSD NTP daemon (Debian port)"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/openresolv/default.nix b/nixpkgs/pkgs/tools/networking/openresolv/default.nix index a05c8283e76c..a80f94d2e9f2 100644 --- a/nixpkgs/pkgs/tools/networking/openresolv/default.nix +++ b/nixpkgs/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; - homepage = https://roy.marples.name/projects/openresolv; + homepage = "https://roy.marples.name/projects/openresolv"; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/openssh/default.nix b/nixpkgs/pkgs/tools/networking/openssh/default.nix index dd0151c89dac..ad5072342f15 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.openssh.com/; + homepage = "http://www.openssh.com/"; description = "An implementation of the SSH protocol"; license = stdenv.lib.licenses.bsd2; platforms = platforms.unix ++ platforms.windows; diff --git a/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/openvpn/default.nix index c8aa2c1f5c57..88ed0599c2ce 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A robust and highly flexible tunneling application"; downloadPage = "https://openvpn.net/index.php/open-source/downloads.html"; - homepage = https://openvpn.net/; + homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 35b577ac37ec..bb06479be30e 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LDAP authentication plugin for OpenVPN"; - homepage = https://github.com/threerings/openvpn-auth-ldap; + homepage = "https://github.com/threerings/openvpn-auth-ldap"; license = [ licenses.asl20 licenses.bsd3 diff --git a/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index d86934d079b1..d73b8e911b9d 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "openvpn-learnaddress-19b03c3"; src = fetchgit { - url = https://gist.github.com/4058733.git; + url = "https://gist.github.com/4058733.git"; rev = "19b03c3beb0190df46ea07bf4b68244acb8eae80"; sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Openvpn learn-address script to manage a hosts-like file"; - homepage = https://gist.github.com/offlinehacker/4058733/; + homepage = "https://gist.github.com/offlinehacker/4058733/"; maintainers = [ stdenv.lib.maintainers.offline ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 0f7e8f2c4450..76d04e6b685c 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; - homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; + homepage = "https://github.com/masterkorp/openvpn-update-resolv-conf/"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index ddb3cc8e3771..4d18372363b6 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Helper script for OpenVPN to directly update the DNS settings of a link through systemd-resolved via DBus"; - homepage = https://github.com/jonathanio/update-systemd-resolved; + homepage = "https://github.com/jonathanio/update-systemd-resolved"; maintainers = with maintainers; [ eadwu ]; license = licenses.gpl3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix b/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix index 4fcfc251f3fa..03737f9af277 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "azureus-2.3.0.6"; builder = ./builder.sh; src = fetchurl { - url = http://tarballs.nixos.org/Azureus2.3.0.6.jar; + url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar"; sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; }; # buildInputs = [unzip]; diff --git a/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 70e36cb7ec58..08163bd8a9e2 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,37 +1,58 @@ -{ stdenv, fetchurl, fetchpatch, bison, pkgconfig, gettext, desktop-file-utils -, glib, gtk2, libxml2, libbfd, zlib, binutils, gnutls +{ stdenv +, fetchFromGitHub +, fetchpatch +, bison +, pkgconfig +, gettext +, desktop-file-utils +, glib +, gtk2 +, libxml2 +, libbfd +, zlib +, binutils +, gnutls +, enableGui ? true }: stdenv.mkDerivation rec { pname = "gtk-gnutella"; - version = "1.1.14"; + # NOTE: Please remove hardeningDisable on the next release, see: + # https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19 + version = "1.1.15"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0sljjha4anfz1r1xq1c6qnnkjv62ld56p7xgj4bsi6lqmq1azvii"; + src = fetchFromGitHub { + owner = "gtk-gnutella"; + repo = "gtk-gnutella"; + rev = "v${version}"; + sha256 = "1g7w6ywwp2g4qdgmfqkrl1rldk1b4rx50yb7h75hh15mh6nr159r"; }; - patches = [ - (fetchpatch { - # Avoid namespace conflict with glibc 2.28 'statx' struct / remove after v1.1.14 - url = "https://github.com/gtk-gnutella/gtk-gnutella/commit/e4205a082eb32161e28de81f5cba8095eea8ecc7.patch"; - sha256 = "0ffkw2cw2b2yhydii8jm40vd40p4xl224l8jvhimg02lgs3zfbca"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gtk-gnutella/raw/f30/f/gtk-gnutella-1.1.14-endian.patch"; - sha256 = "19q4lq8msknfz4mkbjdqmmgld16p30j2yx371p8spmr19q5i0sfn"; - }) + nativeBuildInputs = [ + bison + desktop-file-utils + gettext + pkgconfig ]; - - postPatch = '' - substituteInPlace Makefile.SH --replace "@exit 0" "@echo done" - ''; - - nativeBuildInputs = [ bison desktop-file-utils gettext pkgconfig ]; - buildInputs = [ binutils glib gnutls gtk2 libbfd libxml2 zlib ]; + buildInputs = [ + glib + gnutls + libbfd + libxml2 + zlib + ] + ++ + stdenv.lib.optionals (enableGui) [ gtk2 ] + ; configureScript = "./build.sh"; - configureFlags = [ "--configure-only" ]; + configureFlags = [ + "--configure-only" + # See https://sourceforge.net/p/gtk-gnutella/bugs/555/ + "--disable-malloc" + ] + ++ stdenv.lib.optionals (!enableGui) [ "--topless" ] + ; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; @@ -45,6 +66,7 @@ stdenv.mkDerivation rec { description = "A GTK Gnutella client, optimized for speed and scalability"; homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; + maintainers = [ maintainers.doronbehar ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix b/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix index 2ca31a6a1e73..b55c673c058b 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://rakshasa.github.io/rtorrent/; + homepage = "https://rakshasa.github.io/rtorrent/"; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix b/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix index 2a89e419b2e4..eccf38f39fdc 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.agpl3Plus; - homepage = http://www.seeks-project.info/; + homepage = "http://www.seeks-project.info/"; maintainers = [ stdenv.lib.maintainers.matejc diff --git a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index e8a4261ed12e..d55a46f609b1 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -86,7 +86,7 @@ pythonPackages.buildPythonApplication rec { such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. ''; - homepage = http://tahoe-lafs.org/; + homepage = "http://tahoe-lafs.org/"; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/packetdrill/default.nix b/nixpkgs/pkgs/tools/networking/packetdrill/default.nix index 623645efc0ca..e4322242e0b6 100644 --- a/nixpkgs/pkgs/tools/networking/packetdrill/default.nix +++ b/nixpkgs/pkgs/tools/networking/packetdrill/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { description = "Quick, precise tests for entire TCP/UDP/IPv4/IPv6 network stacks"; - homepage = https://github.com/google/packetdrill; + homepage = "https://github.com/google/packetdrill"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ dmjio cleverca22 ]; diff --git a/nixpkgs/pkgs/tools/networking/pacparser/default.nix b/nixpkgs/pkgs/tools/networking/pacparser/default.nix index 211256ea72b8..2d703730785f 100644 --- a/nixpkgs/pkgs/tools/networking/pacparser/default.nix +++ b/nixpkgs/pkgs/tools/networking/pacparser/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to parse proxy auto-config (PAC) files"; - homepage = http://pacparser.manugarg.com/; + homepage = "http://pacparser.manugarg.com/"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix b/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix index 29d3230c6d37..ecfe5fa03572 100644 --- a/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix +++ b/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/Parchive/par2cmdline; + homepage = "https://github.com/Parchive/par2cmdline"; description = "PAR 2.0 compatible file verification and repair tool"; longDescription = '' par2cmdline is a program for creating and using PAR2 files to detect diff --git a/nixpkgs/pkgs/tools/networking/pcapc/default.nix b/nixpkgs/pkgs/tools/networking/pcapc/default.nix index 663e04db4601..94a181eb5ae2 100644 --- a/nixpkgs/pkgs/tools/networking/pcapc/default.nix +++ b/nixpkgs/pkgs/tools/networking/pcapc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/pfactum/pcapc; + homepage = "https://github.com/pfactum/pcapc"; description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix index 92df5d55524b..a700bd54e7ae 100644 --- a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix +++ b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { postPatch = ''sed -i "s|/usr|$out|" Makefile''; meta = with stdenv.lib; { - homepage = https://f00l.de/pcapfix/; + homepage = "https://f00l.de/pcapfix/"; description = "Repair your broken pcap and pcapng files"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; diff --git a/nixpkgs/pkgs/tools/networking/pdnsd/default.nix b/nixpkgs/pkgs/tools/networking/pdnsd/default.nix index f5d30fa32a8b..d2894271301f 100644 --- a/nixpkgs/pkgs/tools/networking/pdnsd/default.nix +++ b/nixpkgs/pkgs/tools/networking/pdnsd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pdnsd-1.2.9a-par"; src = fetchurl { - url = http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz; + url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz"; sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Permanent DNS caching"; - homepage = http://members.home.nl/p.a.rombouts/pdnsd; + homepage = "http://members.home.nl/p.a.rombouts/pdnsd"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/networking/pdsh/default.nix b/nixpkgs/pkgs/tools/networking/pdsh/default.nix index 68aa356261ab..9dd1a5581c55 100644 --- a/nixpkgs/pkgs/tools/networking/pdsh/default.nix +++ b/nixpkgs/pkgs/tools/networking/pdsh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/chaos/pdsh; + homepage = "https://github.com/chaos/pdsh"; description = "High-performance, parallel remote shell utility"; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/networking/persepolis/default.nix b/nixpkgs/pkgs/tools/networking/persepolis/default.nix index 7412bc568a28..63e2af48c1ea 100644 --- a/nixpkgs/pkgs/tools/networking/persepolis/default.nix +++ b/nixpkgs/pkgs/tools/networking/persepolis/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Persepolis Download Manager is a GUI for aria2."; - homepage = https://persepolisdm.github.io/; + homepage = "https://persepolisdm.github.io/"; license = licenses.gpl3; maintainers = [ maintainers.linarcx ]; }; diff --git a/nixpkgs/pkgs/tools/networking/philter/default.nix b/nixpkgs/pkgs/tools/networking/philter/default.nix index c8b441168468..ee079fe9fdf0 100644 --- a/nixpkgs/pkgs/tools/networking/philter/default.nix +++ b/nixpkgs/pkgs/tools/networking/philter/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mail sorter for Maildirs"; - homepage = http://philter.sourceforge.net; + homepage = "http://philter.sourceforge.net"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/networking/phodav/default.nix b/nixpkgs/pkgs/tools/networking/phodav/default.nix index 617eb0ec40ce..c6b479dd2507 100644 --- a/nixpkgs/pkgs/tools/networking/phodav/default.nix +++ b/nixpkgs/pkgs/tools/networking/phodav/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebDav server implementation and library using libsoup"; - homepage = https://wiki.gnome.org/phodav; + homepage = "https://wiki.gnome.org/phodav"; license = licenses.lgpl21; maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/photon/default.nix b/nixpkgs/pkgs/tools/networking/photon/default.nix index 8d75ea413eca..22da1320803e 100644 --- a/nixpkgs/pkgs/tools/networking/photon/default.nix +++ b/nixpkgs/pkgs/tools/networking/photon/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "a lightning fast web crawler which extracts URLs, files, intel & endpoints from a target"; - homepage = https://github.com/s0md3v/Photon; + homepage = "https://github.com/s0md3v/Photon"; license = licenses.gpl3; maintainers = with maintainers; [ genesis ]; }; diff --git a/nixpkgs/pkgs/tools/networking/pingtcp/default.nix b/nixpkgs/pkgs/tools/networking/pingtcp/default.nix index d791f6b91d99..d3fb37705bd9 100644 --- a/nixpkgs/pkgs/tools/networking/pingtcp/default.nix +++ b/nixpkgs/pkgs/tools/networking/pingtcp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Measure TCP handshake time"; - homepage = https://github.com/LanetNetwork/pingtcp; + homepage = "https://github.com/LanetNetwork/pingtcp"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/pirate-get/default.nix b/nixpkgs/pkgs/tools/networking/pirate-get/default.nix index b92d255b719c..bacea663493f 100644 --- a/nixpkgs/pkgs/tools/networking/pirate-get/default.nix +++ b/nixpkgs/pkgs/tools/networking/pirate-get/default.nix @@ -4,20 +4,20 @@ with python3Packages; buildPythonApplication rec { pname = "pirate-get"; - version = "0.3.4"; + version = "0.3.5"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "0f82yf3bl9jaywagv4vvwypm57z1x8a8qqn0xhz9np3949df4ysm"; + sha256 = "01jr9c04ic4bfalfdijavzvqzmpkw3hq1glqyc86z3v6zwl8dlp2"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ]; meta = with stdenv.lib; { description = "A command line interface for The Pirate Bay"; - homepage = https://github.com/vikstrous/pirate-get; + homepage = "https://github.com/vikstrous/pirate-get"; license = licenses.gpl1; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/pixiewps/default.nix b/nixpkgs/pkgs/tools/networking/pixiewps/default.nix index 8bbf589f3b3d..98a780a1704f 100644 --- a/nixpkgs/pkgs/tools/networking/pixiewps/default.nix +++ b/nixpkgs/pkgs/tools/networking/pixiewps/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An offline WPS bruteforce utility"; - homepage = https://github.com/wiire/pixiewps; + homepage = "https://github.com/wiire/pixiewps"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.nico202 ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/polygraph/default.nix b/nixpkgs/pkgs/tools/networking/polygraph/default.nix index bdc6e7b67f7d..05053b373494 100644 --- a/nixpkgs/pkgs/tools/networking/polygraph/default.nix +++ b/nixpkgs/pkgs/tools/networking/polygraph/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ncurses ]; meta = with stdenv.lib; { - homepage = http://www.web-polygraph.org; + homepage = "http://www.web-polygraph.org"; description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/networking/polysh/default.nix b/nixpkgs/pkgs/tools/networking/polysh/default.nix index cf963068d1c5..34bc908060aa 100644 --- a/nixpkgs/pkgs/tools/networking/polysh/default.nix +++ b/nixpkgs/pkgs/tools/networking/polysh/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { at once. ''; maintainers = [ maintainers.astsmtl ]; - homepage = http://guichaz.free.fr/polysh/; + homepage = "http://guichaz.free.fr/polysh/"; license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/tools/networking/ppp/default.nix b/nixpkgs/pkgs/tools/networking/ppp/default.nix index 1579823450b6..f507b582f64b 100644 --- a/nixpkgs/pkgs/tools/networking/ppp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ppp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4"; }) (fetchurl { - url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch; + url = "https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch"; sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; }) (fetchpatch { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://ppp.samba.org/; + homepage = "https://ppp.samba.org/"; description = "Point-to-point implementation for Linux and Solaris"; license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/pptp/default.nix b/nixpkgs/pkgs/tools/networking/pptp/default.nix index 6a97abfab590..dfc61d8197c1 100644 --- a/nixpkgs/pkgs/tools/networking/pptp/default.nix +++ b/nixpkgs/pkgs/tools/networking/pptp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PPTP client for Linux"; - homepage = http://pptpclient.sourceforge.net/; + homepage = "http://pptpclient.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/pptpd/default.nix b/nixpkgs/pkgs/tools/networking/pptpd/default.nix index f373f594df80..e6f5f9503d8e 100644 --- a/nixpkgs/pkgs/tools/networking/pptpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/pptpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://poptop.sourceforge.net/dox/; + homepage = "http://poptop.sourceforge.net/dox/"; description = "The PPTP Server for Linux"; platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; diff --git a/nixpkgs/pkgs/tools/networking/prettyping/default.nix b/nixpkgs/pkgs/tools/networking/prettyping/default.nix index fb0508b3c903..43f32ddb9fb4 100644 --- a/nixpkgs/pkgs/tools/networking/prettyping/default.nix +++ b/nixpkgs/pkgs/tools/networking/prettyping/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/denilsonsa/prettyping; + homepage = "https://github.com/denilsonsa/prettyping"; description = "A wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read"; license = with licenses; [ mit ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/nixpkgs/pkgs/tools/networking/privoxy/default.nix index 848a99f77718..331295ffd1f4 100644 --- a/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec{ ''; meta = with stdenv.lib; { - homepage = https://www.privoxy.org/; + homepage = "https://www.privoxy.org/"; description = "Non-caching web proxy with advanced filtering capabilities"; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/proxychains/default.nix b/nixpkgs/pkgs/tools/networking/proxychains/default.nix index 52ef43838c26..6f00c7fc8b74 100644 --- a/nixpkgs/pkgs/tools/networking/proxychains/default.nix +++ b/nixpkgs/pkgs/tools/networking/proxychains/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Proxifier for SOCKS proxies"; - homepage = http://proxychains.sourceforge.net; + homepage = "http://proxychains.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/pwnat/default.nix b/nixpkgs/pkgs/tools/networking/pwnat/default.nix index 9e06a6441456..55965173e0ef 100644 --- a/nixpkgs/pkgs/tools/networking/pwnat/default.nix +++ b/nixpkgs/pkgs/tools/networking/pwnat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://samy.pl/pwnat/; + homepage = "http://samy.pl/pwnat/"; description = "ICMP NAT to NAT client-server communication"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix b/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix index b95d0facda89..bb62be6d3e24 100644 --- a/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix +++ b/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix @@ -16,7 +16,7 @@ buildGoPackage { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/claudiodangelis/qr-filetransfer; + homepage = "https://github.com/claudiodangelis/qr-filetransfer"; description = "Transfer files over wifi by scanning a QR code from your terminal"; longDescription = '' qr-filetransfer binds a web server to the address of your Wi-Fi network diff --git a/nixpkgs/pkgs/tools/networking/quickserve/default.nix b/nixpkgs/pkgs/tools/networking/quickserve/default.nix index 22589582e3b9..8f4876b6ee26 100644 --- a/nixpkgs/pkgs/tools/networking/quickserve/default.nix +++ b/nixpkgs/pkgs/tools/networking/quickserve/default.nix @@ -3,7 +3,7 @@ let threaded_servers = python3Packages.buildPythonPackage { name = "threaded_servers"; src = fetchzip { - url = https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz; + url = "https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz"; sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf"; }; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple HTTP server for quickly sharing files."; - homepage = https://xyne.archlinux.ca/projects/quickserve/; + homepage = "https://xyne.archlinux.ca/projects/quickserve/"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; }; diff --git a/nixpkgs/pkgs/tools/networking/quicktun/default.nix b/nixpkgs/pkgs/tools/networking/quicktun/default.nix index 87071e23a966..0f7a16caa82c 100644 --- a/nixpkgs/pkgs/tools/networking/quicktun/default.nix +++ b/nixpkgs/pkgs/tools/networking/quicktun/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Very simple, yet secure VPN software"; - homepage = http://wiki.ucis.nl/QuickTun; + homepage = "http://wiki.ucis.nl/QuickTun"; maintainers = [ maintainers.fpletz ]; platforms = platforms.unix; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix b/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix index 5460bf80a07e..ab5ff481ec7a 100644 --- a/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://software.nordu.net/radsecproxy/; + homepage = "https://software.nordu.net/radsecproxy/"; description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports."; license = licenses.bsd3; maintainers = with maintainers; [ sargon ]; diff --git a/nixpkgs/pkgs/tools/networking/radvd/default.nix b/nixpkgs/pkgs/tools/networking/radvd/default.nix index 30e706d66737..aef67022f786 100644 --- a/nixpkgs/pkgs/tools/networking/radvd/default.nix +++ b/nixpkgs/pkgs/tools/networking/radvd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdaemon ]; meta = with stdenv.lib; { - homepage = http://www.litech.org/radvd/; + homepage = "http://www.litech.org/radvd/"; description = "IPv6 Router Advertisement Daemon"; platforms = platforms.linux; license = licenses.bsdOriginal; diff --git a/nixpkgs/pkgs/tools/networking/ratools/default.nix b/nixpkgs/pkgs/tools/networking/ratools/default.nix index f5353db68035..23d0dae086ec 100644 --- a/nixpkgs/pkgs/tools/networking/ratools/default.nix +++ b/nixpkgs/pkgs/tools/networking/ratools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; - homepage = https://github.com/danrl/ratools; + homepage = "https://github.com/danrl/ratools"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.fpletz ]; diff --git a/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix b/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix index 2d239180a93d..d347273f50ec 100644 --- a/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Online and offline brute force attack against WPS"; - homepage = https://github.com/t6x/reaver-wps-fork-t6x; + homepage = "https://github.com/t6x/reaver-wps-fork-t6x"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nico202 volth ]; diff --git a/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix b/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix index 864a7fb5e613..9f4f2d5bea4e 100644 --- a/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix +++ b/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brute force attack against Wifi Protected Setup"; - homepage = https://code.google.com/archive/p/reaver-wps/; + homepage = "https://code.google.com/archive/p/reaver-wps/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nico202 volth ]; diff --git a/nixpkgs/pkgs/tools/networking/redir/default.nix b/nixpkgs/pkgs/tools/networking/redir/default.nix index 1a6efb065e2e..7f69dacedf31 100644 --- a/nixpkgs/pkgs/tools/networking/redir/default.nix +++ b/nixpkgs/pkgs/tools/networking/redir/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A TCP port redirector for UNIX"; - homepage = https://github.com/troglobit/redir; + homepage = "https://github.com/troglobit/redir"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/redsocks/default.nix b/nixpkgs/pkgs/tools/networking/redsocks/default.nix index 32a30f48ec65..d389221eabb1 100644 --- a/nixpkgs/pkgs/tools/networking/redsocks/default.nix +++ b/nixpkgs/pkgs/tools/networking/redsocks/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Transparent redirector of any TCP connection to proxy"; - homepage = http://darkk.net.ru/redsocks/; + homepage = "http://darkk.net.ru/redsocks/"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.ekleog ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/ripmime/default.nix b/nixpkgs/pkgs/tools/networking/ripmime/default.nix index ae84d9662aa0..0c3c32270b17 100644 --- a/nixpkgs/pkgs/tools/networking/ripmime/default.nix +++ b/nixpkgs/pkgs/tools/networking/ripmime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; - homepage = http://www.pldaniels.com/ripmime/; + homepage = "http://www.pldaniels.com/ripmime/"; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix b/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix index bdb526c70543..d8476d1d159a 100644 --- a/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix +++ b/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Roaring Penguin Point-to-Point over Ethernet tool"; platforms = platforms.linux; - homepage = https://www.roaringpenguin.com/products/pppoe; + homepage = "https://www.roaringpenguin.com/products/pppoe"; license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/tools/networking/rshijack/default.nix b/nixpkgs/pkgs/tools/networking/rshijack/default.nix new file mode 100644 index 000000000000..59558028c01e --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/rshijack/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "rshijack"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0y01hi3jpfawqlqs8ka0vwfhjw5j5gkhk2nz5m13ns2h27bw20v7"; + }; + + cargoSha256 = "0l1kavacnjvi22l6pawgkqqxnjaizi3pddqkhwjshw4pzzixzvli"; + + meta = with lib; { + description = "TCP connection hijacker"; + homepage = "https://github.com/kpcyrd/rshijack"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/s3cmd/default.nix b/nixpkgs/pkgs/tools/networking/s3cmd/default.nix index 31b111f2b83d..53f24ddb7524 100644 --- a/nixpkgs/pkgs/tools/networking/s3cmd/default.nix +++ b/nixpkgs/pkgs/tools/networking/s3cmd/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ stdenv, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: -python2Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "s3cmd"; - version = "2.0.2"; - + version = "2.1.0"; + src = fetchFromGitHub { - owner = "s3tools"; - repo = "s3cmd"; - rev = "v${version}"; - sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk"; + owner = "s3tools"; + repo = "s3cmd"; + rev = "v${version}"; + sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs"; }; - propagatedBuildInputs = with python2Packages; [ python_magic dateutil ]; + propagatedBuildInputs = [ python_magic dateutil ]; + + dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { - homepage = http://s3tools.org/; - description = "A command-line tool to manipulate Amazon S3 buckets"; + homepage = "https://s3tools.org/s3cmd"; + description = "Command line tool for managing Amazon S3 and CloudFront services"; license = licenses.gpl2; maintainers = [ maintainers.spwhitt ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/networking/s4cmd/default.nix b/nixpkgs/pkgs/tools/networking/s4cmd/default.nix index 8088cc0ec4d9..dedbc751179f 100644 --- a/nixpkgs/pkgs/tools/networking/s4cmd/default.nix +++ b/nixpkgs/pkgs/tools/networking/s4cmd/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/bloomreach/s4cmd; + homepage = "https://github.com/bloomreach/s4cmd"; description = "Super S3 command line tool"; license = licenses.asl20; maintainers = [ maintainers.bhipple ]; diff --git a/nixpkgs/pkgs/tools/networking/s6-dns/default.nix b/nixpkgs/pkgs/tools/networking/s6-dns/default.nix index 66bdcbbba54a..739fdc2e2fce 100644 --- a/nixpkgs/pkgs/tools/networking/s6-dns/default.nix +++ b/nixpkgs/pkgs/tools/networking/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.1.1"; - sha256 = "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1"; + version = "2.3.2.0"; + sha256 = "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7"; description = "A suite of DNS client programs and libraries for Unix systems"; @@ -28,6 +28,7 @@ buildPackage { rm $(find -type f -mindepth 1 -maxdepth 1 -executable) rm libs6dns.* rm libskadns.* + rm libdcache.* mv doc $doc/share/doc/s6-dns/html ''; diff --git a/nixpkgs/pkgs/tools/networking/s6-networking/default.nix b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix index 1551d6da97be..f8c479d5ce27 100644 --- a/nixpkgs/pkgs/tools/networking/s6-networking/default.nix +++ b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix @@ -20,8 +20,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.3.1.1"; - sha256 = "127i7ig5wdgjbkjf0py0g96llc6cbxij22ns2j7bwa95figinhcx"; + version = "2.3.1.2"; + sha256 = "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr"; description = "A suite of small networking utilities for Unix systems"; diff --git a/nixpkgs/pkgs/tools/networking/samplicator/default.nix b/nixpkgs/pkgs/tools/networking/samplicator/default.nix index d8167b8a48fc..0cc446edd9cd 100644 --- a/nixpkgs/pkgs/tools/networking/samplicator/default.nix +++ b/nixpkgs/pkgs/tools/networking/samplicator/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Send copies of (UDP) datagrams to multiple receivers"; - homepage = https://github.com/sleinen/samplicator/; + homepage = "https://github.com/sleinen/samplicator/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix index 37d5edaec452..f2ae143e1b9e 100644 --- a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "shadowfox"; @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; buildFlags = [ "--tags" "release" ]; diff --git a/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix index c9ff4c7f649d..7ad0f1e862d6 100644 --- a/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes. It is a port of Shadowsocks created by @clowwindy, which is maintained by @madeye and @linusyang. ''; - homepage = https://github.com/shadowsocks/shadowsocks-libev; + homepage = "https://github.com/shadowsocks/shadowsocks-libev"; license = licenses.gpl3Plus; maintainers = [ maintainers.nfjinjing ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index 973d0287149b..36f6b5849592 100644 --- a/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/shadowsocks/shadowsocks-rust; + homepage = "https://github.com/shadowsocks/shadowsocks-rust"; description = "A Rust port of shadowsocks"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/nixpkgs/pkgs/tools/networking/shncpd/default.nix b/nixpkgs/pkgs/tools/networking/shncpd/default.nix index be861654f658..46c9b22248ac 100644 --- a/nixpkgs/pkgs/tools/networking/shncpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/shncpd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple, stupid and slow HNCP daemon"; - homepage = https://www.irif.univ-paris-diderot.fr/~jch/software/homenet/shncpd.html; + homepage = "https://www.irif.univ-paris-diderot.fr/~jch/software/homenet/shncpd.html"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.fpletz ]; diff --git a/nixpkgs/pkgs/tools/networking/shorewall/default.nix b/nixpkgs/pkgs/tools/networking/shorewall/default.nix index 8e62aa735a41..67f81b821053 100644 --- a/nixpkgs/pkgs/tools/networking/shorewall/default.nix +++ b/nixpkgs/pkgs/tools/networking/shorewall/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.shorewall.net/; + homepage = "http://www.shorewall.net/"; description = "An IP gateway/firewall configuration tool for GNU/Linux"; longDescription = '' Shorewall is a high-level tool for configuring Netfilter. You describe your diff --git a/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix b/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix index f94e177a8585..7a5bc713faee 100644 --- a/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/vzaliva/simpleproxy; + homepage = "https://github.com/vzaliva/simpleproxy"; description = "A simple TCP proxy"; license = licenses.gpl2; maintainers = [ maintainers.montag451 ]; diff --git a/nixpkgs/pkgs/tools/networking/sipcalc/default.nix b/nixpkgs/pkgs/tools/networking/sipcalc/default.nix index dff929e9fa1c..081f20053301 100644 --- a/nixpkgs/pkgs/tools/networking/sipcalc/default.nix +++ b/nixpkgs/pkgs/tools/networking/sipcalc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced console ip subnet calculator"; - homepage = http://www.routemeister.net/projects/sipcalc/; + homepage = "http://www.routemeister.net/projects/sipcalc/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.globin ]; diff --git a/nixpkgs/pkgs/tools/networking/sipsak/default.nix b/nixpkgs/pkgs/tools/networking/sipsak/default.nix index c1a2451328df..09de1c2e594a 100644 --- a/nixpkgs/pkgs/tools/networking/sipsak/default.nix +++ b/nixpkgs/pkgs/tools/networking/sipsak/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/sipwise/sipsak; + homepage = "https://github.com/sipwise/sipsak"; description = "SIP Swiss army knife"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ sheenobu ]; diff --git a/nixpkgs/pkgs/tools/networking/slimrat/default.nix b/nixpkgs/pkgs/tools/networking/slimrat/default.nix index 8632a33e3498..1c26dc27b3f0 100644 --- a/nixpkgs/pkgs/tools/networking/slimrat/default.nix +++ b/nixpkgs/pkgs/tools/networking/slimrat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://code.google.com/archive/p/slimrat/; + homepage = "https://code.google.com/archive/p/slimrat/"; description = "Linux Rapidshare downloader"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index b70bf2952f7a..f3bd0a23d587 100644 --- a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, libcap, libseccomp }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, glib +, libcap +, libseccomp +, libslirp +}: stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "0.4.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "1932q80s6187k4fsvgia5iwc9lqsdkxzqqwpw1ksy0mx8wzmwbih"; + sha256 = "152wmccz47anvx5w88qcz8higw80l17jl7i24xfj5574adviqnv2"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libcap libseccomp glib ]; + buildInputs = [ glib libcap libseccomp libslirp ]; enableParallelBuilding = true; @@ -21,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; license = licenses.gpl2; - maintainers = with maintainers; [ orivej saschagrunert ]; + maintainers = with maintainers; [ orivej ] ++ teams.podman.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/smokeping/default.nix b/nixpkgs/pkgs/tools/networking/smokeping/default.nix index 6a816615e9c1..80f8b49a0cce 100644 --- a/nixpkgs/pkgs/tools/networking/smokeping/default.nix +++ b/nixpkgs/pkgs/tools/networking/smokeping/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "Network latency collector"; - homepage = http://oss.oetiker.ch/smokeping; + homepage = "http://oss.oetiker.ch/smokeping"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.erictapen ]; diff --git a/nixpkgs/pkgs/tools/networking/snabb/default.nix b/nixpkgs/pkgs/tools/networking/snabb/default.nix index caca1c829ec3..52ad14c1d110 100644 --- a/nixpkgs/pkgs/tools/networking/snabb/default.nix +++ b/nixpkgs/pkgs/tools/networking/snabb/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = { - homepage = https://github.com/SnabbCo/snabbswitch; + homepage = "https://github.com/SnabbCo/snabbswitch"; description = "Simple and fast packet networking toolkit"; longDescription = '' Snabb Switch is a LuaJIT-based toolkit for writing high-speed diff --git a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix new file mode 100644 index 000000000000..83f1e372aa58 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkgconfig }: + +rustPlatform.buildRustPackage rec { + pname = "sniffglue"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0vyxlqwh90shihp80fk0plnkjix9i37n2dnypzyz6nx44xd5737s"; + }; + + cargoSha256 = "162p3a696k281cygqpl6gg4makwk2v0g2jnf1gd108dnz4jya11l"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libpcap libseccomp ]; + + meta = with lib; { + description = "Secure multithreaded packet sniffer"; + homepage = "https://github.com/kpcyrd/sniffglue"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/socat/2.x.nix b/nixpkgs/pkgs/tools/networking/socat/2.x.nix index 99f0301c7c86..97775a00604b 100644 --- a/nixpkgs/pkgs/tools/networking/socat/2.x.nix +++ b/nixpkgs/pkgs/tools/networking/socat/2.x.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility for bidirectional data transfer between two independent data channels"; - homepage = http://www.dest-unreach.org/socat/; - repositories.git = git://repo.or.cz/socat.git; + homepage = "http://www.dest-unreach.org/socat/"; + repositories.git = "git://repo.or.cz/socat.git"; platforms = platforms.unix; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; diff --git a/nixpkgs/pkgs/tools/networking/socat/default.nix b/nixpkgs/pkgs/tools/networking/socat/default.nix index ba7aaee63ab9..c50b2236c9e4 100644 --- a/nixpkgs/pkgs/tools/networking/socat/default.nix +++ b/nixpkgs/pkgs/tools/networking/socat/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A utility for bidirectional data transfer between two independent data channels"; - homepage = http://www.dest-unreach.org/socat/; - repositories.git = git://repo.or.cz/socat.git; + homepage = "http://www.dest-unreach.org/socat/"; + repositories.git = "git://repo.or.cz/socat.git"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/nixpkgs/pkgs/tools/networking/spoofer/default.nix b/nixpkgs/pkgs/tools/networking/spoofer/default.nix index 2b5aa2b7cbf7..cadaf021cda7 100644 --- a/nixpkgs/pkgs/tools/networking/spoofer/default.nix +++ b/nixpkgs/pkgs/tools/networking/spoofer/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ optional withGUI qt5.qtbase ; meta = with stdenv.lib; { - homepage = https://www.caida.org/projects/spoofer; + homepage = "https://www.caida.org/projects/spoofer"; description = "Assess and report on deployment of source address validation"; longDescription = '' Spoofer is a new client-server system for Windows, MacOS, and diff --git a/nixpkgs/pkgs/tools/networking/srelay/default.nix b/nixpkgs/pkgs/tools/networking/srelay/default.nix index b55860a20c17..1e7486dd3059 100644 --- a/nixpkgs/pkgs/tools/networking/srelay/default.nix +++ b/nixpkgs/pkgs/tools/networking/srelay/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "A SOCKS proxy and relay"; - homepage = http://socks-relay.sourceforge.net/; + homepage = "http://socks-relay.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.bsd3; }; diff --git a/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix b/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix index b01d373088b7..a4e930281a50 100644 --- a/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssh-agents/default.nix @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { given name is expected to be a folder under ~/.ssh/name containing the keys to include in the agent. ''; - homepage = https://github.com/kalbasit/ssh-agents; + homepage = "https://github.com/kalbasit/ssh-agents"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix b/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix index cb07d73a6319..d46d6ea1ac28 100644 --- a/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/ccontavalli/ssh-ident; + homepage = "https://github.com/ccontavalli/ssh-ident"; description = "Start and use ssh-agent and load identities as necessary"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ telotortium ]; diff --git a/nixpkgs/pkgs/tools/networking/sshpass/default.nix b/nixpkgs/pkgs/tools/networking/sshpass/default.nix index 3765e6aa08f7..7f5644edb526 100644 --- a/nixpkgs/pkgs/tools/networking/sshpass/default.nix +++ b/nixpkgs/pkgs/tools/networking/sshpass/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/sshpass/; + homepage = "https://sourceforge.net/projects/sshpass/"; description = "Non-interactive ssh password auth"; license = licenses.gpl2; maintainers = [ maintainers.madjar ]; diff --git a/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/nixpkgs/pkgs/tools/networking/ssldump/default.nix index 0081e7d1ddb9..2c008cbb36a1 100644 --- a/nixpkgs/pkgs/tools/networking/ssldump/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssldump/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { "--with-openssl-inc=${openssl}/include" ]; meta = { description = "ssldump is an SSLv3/TLS network protocol analyzer"; - homepage = http://ssldump.sourceforge.net; + homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/ssmtp/default.nix b/nixpkgs/pkgs/tools/networking/ssmtp/default.nix index 81da427a52cf..90547eb13643 100644 --- a/nixpkgs/pkgs/tools/networking/ssmtp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssmtp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ssmtp-2.64"; src = fetchurl { - url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; + url = "mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2"; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; }; diff --git a/nixpkgs/pkgs/tools/networking/sstp/default.nix b/nixpkgs/pkgs/tools/networking/sstp/default.nix index de65298d6481..4d05b478ab40 100644 --- a/nixpkgs/pkgs/tools/networking/sstp/default.nix +++ b/nixpkgs/pkgs/tools/networking/sstp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "SSTP client for Linux"; - homepage = http://sstp-client.sourceforge.net/; + homepage = "http://sstp-client.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ktosiek ]; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/nixpkgs/pkgs/tools/networking/strongswan/default.nix index fb7de5486fb0..6ff141e099c7 100644 --- a/nixpkgs/pkgs/tools/networking/strongswan/default.nix +++ b/nixpkgs/pkgs/tools/networking/strongswan/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenSource IPsec-based VPN Solution"; - homepage = https://www.strongswan.org; + homepage = "https://www.strongswan.org"; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/networking/stun/default.nix b/nixpkgs/pkgs/tools/networking/stun/default.nix index 9960e6f00304..306b1899f763 100644 --- a/nixpkgs/pkgs/tools/networking/stun/default.nix +++ b/nixpkgs/pkgs/tools/networking/stun/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stun server and test client"; - homepage = https://sourceforge.net/projects/stun/; + homepage = "https://sourceforge.net/projects/stun/"; license = licenses.vsl10; maintainers = with maintainers; [ marcweber obadz ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/surfraw/default.nix b/nixpkgs/pkgs/tools/networking/surfraw/default.nix index eac737653004..d26bdbbb771a 100644 --- a/nixpkgs/pkgs/tools/networking/surfraw/default.nix +++ b/nixpkgs/pkgs/tools/networking/surfraw/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; - homepage = https://gitlab.com/surfraw/Surfraw; + homepage = "https://gitlab.com/surfraw/Surfraw"; maintainers = []; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.publicDomain; diff --git a/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix b/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix index 91f155739140..ac4c1e24e3ba 100644 --- a/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix +++ b/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; - homepage = https://github.com/swagger-api/swagger-codegen; + homepage = "https://github.com/swagger-api/swagger-codegen"; license = licenses.asl20; maintainers = [ maintainers.jraygauthier ]; }; diff --git a/nixpkgs/pkgs/tools/networking/swec/default.nix b/nixpkgs/pkgs/tools/networking/swec/default.nix index 515fcee6963b..e65bc5e208fc 100644 --- a/nixpkgs/pkgs/tools/networking/swec/default.nix +++ b/nixpkgs/pkgs/tools/networking/swec/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { checkPhase = "make test"; meta = { - homepage = https://random.zerodogg.org/swec/; + homepage = "https://random.zerodogg.org/swec/"; description = "Simple Web Error Checker (SWEC)"; diff --git a/nixpkgs/pkgs/tools/networking/tayga/default.nix b/nixpkgs/pkgs/tools/networking/tayga/default.nix index 97bcbdc999eb..866d680a02d1 100644 --- a/nixpkgs/pkgs/tools/networking/tayga/default.nix +++ b/nixpkgs/pkgs/tools/networking/tayga/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { It is intended to provide production-quality NAT64 service for networks where dedicated NAT64 hardware would be overkill. ''; - homepage = http://www.litech.org/tayga; + homepage = "http://www.litech.org/tayga"; license = licenses.gpl2; maintainers = [ maintainers."0x4A6F" ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/tcpdump/default.nix b/nixpkgs/pkgs/tools/networking/tcpdump/default.nix index a74dc7ca1d72..fd7b203fbbf4 100644 --- a/nixpkgs/pkgs/tools/networking/tcpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcpdump/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Network sniffer"; - homepage = http://www.tcpdump.org/; + homepage = "http://www.tcpdump.org/"; license = "BSD-style"; maintainers = with stdenv.lib.maintainers; [ globin ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index 032adbff74fb..d6d7b45364a3 100644 --- a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A suite of utilities for editing and replaying network traffic"; - homepage = http://tcpreplay.appneta.com/; + homepage = "http://tcpreplay.appneta.com/"; license = with licenses; [ bsd3 gpl3 ]; maintainers = with maintainers; [ eleanor ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix b/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix index 01c832dbcea5..6901166e38fa 100644 --- a/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A traceroute implementation using TCP packets."; - homepage = https://github.com/mct/tcptraceroute; + homepage = "https://github.com/mct/tcptraceroute"; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; }; diff --git a/nixpkgs/pkgs/tools/networking/telepresence/default.nix b/nixpkgs/pkgs/tools/networking/telepresence/default.nix index 697c33957a3d..216a2863f849 100644 --- a/nixpkgs/pkgs/tools/networking/telepresence/default.nix +++ b/nixpkgs/pkgs/tools/networking/telepresence/default.nix @@ -45,7 +45,7 @@ in pythonPackages.buildPythonPackage rec { doCheck = false; meta = { - homepage = https://www.telepresence.io/; + homepage = "https://www.telepresence.io/"; description = "Local development against a remote Kubernetes or OpenShift cluster"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ offline ]; diff --git a/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 91378757af1d..2bf907380e06 100644 --- a/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "tendermint"; - version = "0.32.3"; + version = "0.32.10"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "0vpnw42a28glghdpgxmqhxd63cnbpghhazpzsdksqkw0i1l36ywr"; + sha256 = "0rf00fqbf8xvxbxnhki93knwdp4bqjvv548ia8c0w6cryj07plyg"; }; - modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "08f03haxzpi57gaxymsbzs0nbbgnf6z4gmpal476xy3gvc0dyi3r"; meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; - homepage = https://tendermint.com/; + homepage = "https://tendermint.com/"; license = licenses.asl20; maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/networking/termshark/default.nix b/nixpkgs/pkgs/tools/networking/termshark/default.nix index a24ff25ef2ba..ea1ef86f979b 100644 --- a/nixpkgs/pkgs/tools/networking/termshark/default.nix +++ b/nixpkgs/pkgs/tools/networking/termshark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli, Security }: +{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: buildGoModule rec { pname = "termshark"; @@ -12,8 +12,7 @@ buildGoModule rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wireshark-cli ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ wireshark-cli ]; modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; @@ -27,7 +26,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - homepage = https://termshark.io/; + homepage = "https://termshark.io/"; description = "A terminal UI for wireshark-cli, inspired by Wireshark"; license = licenses.mit; maintainers = with maintainers; [ winpat elseym ]; diff --git a/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix b/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix index edd2abdd13e3..2d88c9bf07e6 100644 --- a/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix +++ b/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.bsd3; - homepage = https://www.kernel.org/pub/software/network/tftp/; + homepage = "https://www.kernel.org/pub/software/network/tftp/"; }; passthru = { diff --git a/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix b/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix index f3e6f2f156f6..1a476676a258 100644 --- a/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec{ stdenv.lib.optional stdenv.isDarwin "--disable-regexcheck"; meta = with stdenv.lib; { - homepage = https://tinyproxy.github.io/; + homepage = "https://tinyproxy.github.io/"; description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems"; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/tlspool/default.nix b/nixpkgs/pkgs/tools/networking/tlspool/default.nix index df199869e605..c91c703f28fb 100644 --- a/nixpkgs/pkgs/tools/networking/tlspool/default.nix +++ b/nixpkgs/pkgs/tools/networking/tlspool/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment"; license = licenses.gpl3; - homepage = http://www.tlspool.org; + homepage = "http://www.tlspool.org"; maintainers = with maintainers; [ leenaars qknight ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/nixpkgs/pkgs/tools/networking/tox-node/default.nix index 6f9ee7355df9..1124c2ab5575 100644 --- a/nixpkgs/pkgs/tools/networking/tox-node/default.nix +++ b/nixpkgs/pkgs/tools/networking/tox-node/default.nix @@ -35,7 +35,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "A server application to run tox node written in pure Rust"; - homepage = https://github.com/tox-rs/tox-node; + homepage = "https://github.com/tox-rs/tox-node"; license = [ licenses.mit ]; platforms = platforms.linux; maintainers = with maintainers; [ suhr ]; diff --git a/nixpkgs/pkgs/tools/networking/toxvpn/default.nix b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix index e4faa5e30f4a..10e4dc2f1b14 100644 --- a/nixpkgs/pkgs/tools/networking/toxvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; - homepage = https://github.com/cleverca22/toxvpn; + homepage = "https://github.com/cleverca22/toxvpn"; license = licenses.gpl3; maintainers = with maintainers; [ cleverca22 obadz toonn ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/networking/tracebox/default.nix b/nixpkgs/pkgs/tools/networking/tracebox/default.nix index 1d3c4190e388..1fe2d25e35d0 100644 --- a/nixpkgs/pkgs/tools/networking/tracebox/default.nix +++ b/nixpkgs/pkgs/tools/networking/tracebox/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.tracebox.org/; + homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.lethalman ]; diff --git a/nixpkgs/pkgs/tools/networking/traceroute/default.nix b/nixpkgs/pkgs/tools/networking/traceroute/default.nix index 8591db4e016c..2948a571a386 100644 --- a/nixpkgs/pkgs/tools/networking/traceroute/default.nix +++ b/nixpkgs/pkgs/tools/networking/traceroute/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://traceroute.sourceforge.net/; + homepage = "http://traceroute.sourceforge.net/"; description = "Tracks the route taken by packets over an IP network"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.koral ]; diff --git a/nixpkgs/pkgs/tools/networking/trickle/default.nix b/nixpkgs/pkgs/tools/networking/trickle/default.nix index 7a4adc14c2df..f97d3c857621 100644 --- a/nixpkgs/pkgs/tools/networking/trickle/default.nix +++ b/nixpkgs/pkgs/tools/networking/trickle/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; license = stdenv.lib.licenses.bsd3; - homepage = https://monkey.org/~marius/pages/?page=trickle; + homepage = "https://monkey.org/~marius/pages/?page=trickle"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix b/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix index 44daa23cd92d..5efca2cb7fd3 100644 --- a/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix +++ b/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tridactyl native messaging host application"; - homepage = https://github.com/tridactyl/tridactyl; + homepage = "https://github.com/tridactyl/tridactyl"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ timokau ]; diff --git a/nixpkgs/pkgs/tools/networking/twa/default.nix b/nixpkgs/pkgs/tools/networking/twa/default.nix index b15b6dcba31e..21cbd2dfefba 100644 --- a/nixpkgs/pkgs/tools/networking/twa/default.nix +++ b/nixpkgs/pkgs/tools/networking/twa/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiny web auditor with strong opinions"; - homepage = https://github.com/trailofbits/twa; + homepage = "https://github.com/trailofbits/twa"; license = licenses.mit; maintainers = with maintainers; [ avaq ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/ua/default.nix b/nixpkgs/pkgs/tools/networking/ua/default.nix index ddd0bab5d615..9ce7f5df247f 100644 --- a/nixpkgs/pkgs/tools/networking/ua/default.nix +++ b/nixpkgs/pkgs/tools/networking/ua/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { buildInputs = [ glib libxml2 ]; meta = { - homepage = https://github.com/sloonz/ua; + homepage = "https://github.com/sloonz/ua"; license = stdenv.lib.licenses.isc; description = "Universal Aggregator"; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix b/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix index 8a3b292ad81f..72325df8be79 100644 --- a/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ucspi-tcp/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { Interface, using the TCP protocol. UCSPI tools are available for several different networks. ''; - homepage = http://cr.yp.to/ucspi-tcp.html; + homepage = "http://cr.yp.to/ucspi-tcp.html"; license = licenses.publicDomain; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/networking/udptunnel/default.nix b/nixpkgs/pkgs/tools/networking/udptunnel/default.nix index 4ee4fa418335..08fb7cd62e06 100644 --- a/nixpkgs/pkgs/tools/networking/udptunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/udptunnel/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://code.google.com/archive/p/udptunnel/; + homepage = "https://code.google.com/archive/p/udptunnel/"; description = "Tunnels TCP over UDP packets"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix b/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix index 68f457c2a638..a600d6c5341c 100644 --- a/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix +++ b/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Native messaging host to integrate uGet Download Manager with web browsers"; - homepage = https://github.com/ugetdm/uget-integrator; + homepage = "https://github.com/ugetdm/uget-integrator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix index 18d9defdd946..c03f68c36e2f 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "0myv8l886gmlh9nh4j3q5549idxnl51hf9cw20yxfqbwd47l13ca"; + sha256 = "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm"; }; # https://github.com/NLnetLabs/unbound/pull/90 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; - homepage = https://www.unbound.net; + homepage = "https://www.unbound.net"; maintainers = with maintainers; [ ehmry fpletz globin ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/unbound/python.nix b/nixpkgs/pkgs/tools/networking/unbound/python.nix index c11862041049..939c2299e32c 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/python.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/python.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Python library for Unbound, the validating, recursive, and caching DNS resolver"; license = licenses.bsd3; - homepage = http://www.unbound.net; + homepage = "http://www.unbound.net"; maintainers = with maintainers; [ leenaars ]; platforms = stdenv.lib.platforms.unix; broken = true; diff --git a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix index 3e572a10da0a..e7cbaa73cce1 100644 --- a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix +++ b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A tool for monitoring webpages for updates"; - homepage = https://thp.io/2008/urlwatch/; + homepage = "https://thp.io/2008/urlwatch/"; license = licenses.bsd3; maintainers = with maintainers; [ tv ]; }; diff --git a/nixpkgs/pkgs/tools/networking/uwimap/default.nix b/nixpkgs/pkgs/tools/networking/uwimap/default.nix index 4a8dab9366f6..bd38a1cfa2fe 100644 --- a/nixpkgs/pkgs/tools/networking/uwimap/default.nix +++ b/nixpkgs/pkgs/tools/networking/uwimap/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation ({ ''; meta = { - homepage = https://www.washington.edu/imap/; + homepage = "https://www.washington.edu/imap/"; description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; license = stdenv.lib.licenses.asl20; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/networking/vlan/default.nix b/nixpkgs/pkgs/tools/networking/vlan/default.nix index 7a6a37c91128..331a993f3acd 100644 --- a/nixpkgs/pkgs/tools/networking/vlan/default.nix +++ b/nixpkgs/pkgs/tools/networking/vlan/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "vlan-1.9"; src = fetchurl { - url = mirror://gentoo/distfiles/vlan.1.9.tar.gz; + url = "mirror://gentoo/distfiles/vlan.1.9.tar.gz"; sha256 = "1jjc5f26hj7bk8nkjxsa8znfxcf8pgry2ipnwmj2fr6ky0dhm3rv"; }; diff --git a/nixpkgs/pkgs/tools/networking/vpnc/default.nix b/nixpkgs/pkgs/tools/networking/vpnc/default.nix index 424355e41df8..7a52112e65ff 100644 --- a/nixpkgs/pkgs/tools/networking/vpnc/default.nix +++ b/nixpkgs/pkgs/tools/networking/vpnc/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.unix-ag.uni-kl.de/~massar/vpnc/; + homepage = "https://www.unix-ag.uni-kl.de/~massar/vpnc/"; description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/networking/vtun/default.nix b/nixpkgs/pkgs/tools/networking/vtun/default.nix index d2cbb5d8a4ee..71d9097a1501 100644 --- a/nixpkgs/pkgs/tools/networking/vtun/default.nix +++ b/nixpkgs/pkgs/tools/networking/vtun/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { url = http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch; + (fetchpatch { url = "http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch"; sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1"; }) ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; - homepage = http://vtun.sourceforge.net/; + homepage = "http://vtun.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/networking/wavemon/default.nix b/nixpkgs/pkgs/tools/networking/wavemon/default.nix index 89177f49ecfc..dab52720a029 100644 --- a/nixpkgs/pkgs/tools/networking/wavemon/default.nix +++ b/nixpkgs/pkgs/tools/networking/wavemon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Ncurses-based monitoring application for wireless network devices"; - homepage = https://github.com/uoaerg/wavemon; + homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin fpletz ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/wbox/default.nix b/nixpkgs/pkgs/tools/networking/wbox/default.nix index b1fb6ae8d909..8b10bb599c4e 100644 --- a/nixpkgs/pkgs/tools/networking/wbox/default.nix +++ b/nixpkgs/pkgs/tools/networking/wbox/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple HTTP benchmarking tool"; - homepage = http://www.hping.org/wbox/; + homepage = "http://www.hping.org/wbox/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/webalizer/default.nix b/nixpkgs/pkgs/tools/networking/webalizer/default.nix index bd80eae2bebc..133aac67bdbf 100644 --- a/nixpkgs/pkgs/tools/networking/webalizer/default.nix +++ b/nixpkgs/pkgs/tools/networking/webalizer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "webalizer-2.23-05"; src = fetchurl { - url = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2; + url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2"; sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Web server log file analysis program"; - homepage = http://www.webalizer.org; + homepage = "http://www.webalizer.org"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/nixpkgs/pkgs/tools/networking/weighttp/default.nix b/nixpkgs/pkgs/tools/networking/weighttp/default.nix index 8ba47534cfbc..efcb8d8cf425 100644 --- a/nixpkgs/pkgs/tools/networking/weighttp/default.nix +++ b/nixpkgs/pkgs/tools/networking/weighttp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.4"; src = fetchgit { - url = https://git.lighttpd.net/weighttp.git; + url = "https://git.lighttpd.net/weighttp.git"; rev = "refs/tags/weighttp-${version}"; sha256 = "14yjmdx9p8g8c3zlrx5qid8k156lsagfwhl3ny54162nxjf7kzgr"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; - homepage = https://redmine.lighttpd.net/projects/weighttp/wiki; + homepage = "https://redmine.lighttpd.net/projects/weighttp/wiki"; description = "A lightweight and simple webserver benchmarking tool"; }; } diff --git a/nixpkgs/pkgs/tools/networking/wget/default.nix b/nixpkgs/pkgs/tools/networking/wget/default.nix index b7486ded4c8a..77913c4f32a1 100644 --- a/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/wget/; + homepage = "https://www.gnu.org/software/wget/"; maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/whois/default.nix b/nixpkgs/pkgs/tools/networking/whois/default.nix index 1010c5d9cda3..35124ef6719c 100644 --- a/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/nixpkgs/pkgs/tools/networking/whois/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { select the appropriate WHOIS server for most queries. ''; - homepage = https://packages.qa.debian.org/w/whois.html; + homepage = "https://packages.qa.debian.org/w/whois.html"; license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/wicd/default.nix b/nixpkgs/pkgs/tools/networking/wicd/default.nix index 2f95876c2f30..8cd0b7c55f7c 100644 --- a/nixpkgs/pkgs/tools/networking/wicd/default.nix +++ b/nixpkgs/pkgs/tools/networking/wicd/default.nix @@ -103,7 +103,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wicd.net/; + homepage = "http://wicd.net/"; description = "A wiredless and wired network manager"; longDescription='' A complete network connection manager diff --git a/nixpkgs/pkgs/tools/networking/wifite2/default.nix b/nixpkgs/pkgs/tools/networking/wifite2/default.nix index 2333408f0781..505e461e4806 100644 --- a/nixpkgs/pkgs/tools/networking/wifite2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wifite2/default.nix @@ -1,16 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, python3, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools, which }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, python3, wirelesstools +, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools +, hcxdumptool, pyrit, which }: python3.pkgs.buildPythonApplication rec { - version = "2.2.5"; + version = "2.5.3"; pname = "wifite2"; src = fetchFromGitHub { - owner = "derv82"; + owner = "kimocoder"; repo = "wifite2"; rev = version; - sha256 = "1hfy90wf2bjg0z8rbs8cfhhvz78pzg2c6nj0zksal42mb6b5cjdp"; + sha256 = "080hbjpbgdnzr6jkmg5cb8dvzxm57zpi4c9x0y92yy472vqll3ax"; }; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-aircrack-failing-test.patch"; + sha256 = "04qql8w27c1lqk59ghkr1n6r08jwdrb1dcam5k88szkk2bxv8yx1"; + }) + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-two-failing-tests.patch"; + sha256 = "1sixcqz1kbkhxf38yq55pwycm54adjx22bq46dfnl44mg69nx356"; + }) + ]; + propagatedBuildInputs = [ aircrack-ng wireshark-cli @@ -18,6 +31,9 @@ python3.pkgs.buildPythonApplication rec { cowpatty hashcat hcxtools + hcxdumptool + wirelesstools + pyrit which ]; @@ -27,14 +43,14 @@ python3.pkgs.buildPythonApplication rec { mv ${sitePackagesDir}/wifite/__main__.py ${sitePackagesDir}/wifite/wifite.py ''; - # which is not found - doCheck = false; + checkInputs = propagatedBuildInputs; + checkPhase = "python -m unittest discover tests -v"; meta = with stdenv.lib; { homepage = "https://github.com/derv82/wifite2"; description = "Rewrite of the popular wireless network auditor, wifite"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ lassulus ]; + maintainers = with maintainers; [ lassulus danielfullmer ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix index a722a8016bc9..1fa8bac33e29 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Userspace Go implementation of WireGuard"; - homepage = https://git.zx2c4.com/wireguard-go/about/; + homepage = "https://git.zx2c4.com/wireguard-go/about/"; license = licenses.gpl2; maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ]; }; diff --git a/nixpkgs/pkgs/tools/networking/wol/default.nix b/nixpkgs/pkgs/tools/networking/wol/default.nix index 570d800311e2..3ca10e2ecbc3 100644 --- a/nixpkgs/pkgs/tools/networking/wol/default.nix +++ b/nixpkgs/pkgs/tools/networking/wol/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implements Wake On LAN functionality in a small program"; - homepage = https://sourceforge.net/projects/wake-on-lan/; + homepage = "https://sourceforge.net/projects/wake-on-lan/"; license = licenses.gpl2; maintainers = with maintainers; [ makefu ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/wolfebin/default.nix b/nixpkgs/pkgs/tools/networking/wolfebin/default.nix index 7eded00db858..52874e89bbe7 100644 --- a/nixpkgs/pkgs/tools/networking/wolfebin/default.nix +++ b/nixpkgs/pkgs/tools/networking/wolfebin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/thejoshwolfe/wolfebin; + homepage = "https://github.com/thejoshwolfe/wolfebin"; description = "Quick and easy file sharing"; license = licenses.mit; maintainers = [ maintainers.andrewrk ]; diff --git a/nixpkgs/pkgs/tools/networking/wrk/default.nix b/nixpkgs/pkgs/tools/networking/wrk/default.nix index 98705430c2f0..40daeb861944 100644 --- a/nixpkgs/pkgs/tools/networking/wrk/default.nix +++ b/nixpkgs/pkgs/tools/networking/wrk/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP benchmarking tool"; - homepage = https://github.com/wg/wrk; + homepage = "https://github.com/wg/wrk"; longDescription = '' wrk is a modern HTTP benchmarking tool capable of generating significant load when run on a single multi-core CPU. It diff --git a/nixpkgs/pkgs/tools/networking/wrk2/default.nix b/nixpkgs/pkgs/tools/networking/wrk2/default.nix index 7908143bdab3..2a5e8e3a5dca 100644 --- a/nixpkgs/pkgs/tools/networking/wrk2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wrk2/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Constant throughput, correct latency recording variant of wrk"; - homepage = https://github.com/giltene/wrk2; + homepage = "https://github.com/giltene/wrk2"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/nixpkgs/pkgs/tools/networking/wuzz/default.nix b/nixpkgs/pkgs/tools/networking/wuzz/default.nix index e84a97525f12..8db9c07ffc56 100644 --- a/nixpkgs/pkgs/tools/networking/wuzz/default.nix +++ b/nixpkgs/pkgs/tools/networking/wuzz/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/asciimoo/wuzz; + homepage = "https://github.com/asciimoo/wuzz"; description = "Interactive cli tool for HTTP inspection"; license = licenses.agpl3; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix b/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix index 1b9d55349030..7e1597451b13 100644 --- a/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/nixpkgs/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz; + url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz"; sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { - homepage = https://github.com/sigmavirus24/x11-ssh-askpass; + homepage = "https://github.com/sigmavirus24/x11-ssh-askpass"; description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH"; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix b/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix index 01453379022c..38a45fd3e6fa 100644 --- a/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.xelerance.com/software/xl2tpd/; + homepage = "http://www.xelerance.com/software/xl2tpd/"; description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/networking/xnbd/default.nix b/nixpkgs/pkgs/tools/networking/xnbd/default.nix index a874565684ff..79a968f806e3 100644 --- a/nixpkgs/pkgs/tools/networking/xnbd/default.nix +++ b/nixpkgs/pkgs/tools/networking/xnbd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://bitbucket.org/hirofuchi/xnbd; + homepage = "https://bitbucket.org/hirofuchi/xnbd"; description = "Yet another NBD (Network Block Device) server program"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.volth ]; diff --git a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index 605801b6ab73..91b080153279 100644 --- a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Foundation }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "yggdrasil"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "1k3xxarrl33sxik1dqahfllrhd501xqq5q5mcn4y5wi9lwywsy50"; + sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; }; - modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Foundation ]; + modSha256 = "1ffp7q7kbkm1312sz6xnpc7342iczy9vj3m76lflirr1ljmw0dnb"; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to @@ -29,7 +27,7 @@ buildGoModule rec { -s -w ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; diff --git a/nixpkgs/pkgs/tools/networking/yrd/default.nix b/nixpkgs/pkgs/tools/networking/yrd/default.nix index a259d892cc15..9b76d033829f 100644 --- a/nixpkgs/pkgs/tools/networking/yrd/default.nix +++ b/nixpkgs/pkgs/tools/networking/yrd/default.nix @@ -22,6 +22,6 @@ in pythonPackages.buildPythonApplication { maintainers = with maintainers; [ akru ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = https://github.com/kpcyrd/yrd; + homepage = "https://github.com/kpcyrd/yrd"; }; } diff --git a/nixpkgs/pkgs/tools/networking/zap/default.nix b/nixpkgs/pkgs/tools/networking/zap/default.nix index 3acd207df95d..2d8902f69097 100644 --- a/nixpkgs/pkgs/tools/networking/zap/default.nix +++ b/nixpkgs/pkgs/tools/networking/zap/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.owasp.org/index.php/ZAP; + homepage = "https://www.owasp.org/index.php/ZAP"; description = "Java application for web penetration testing"; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index 2a3987f490ff..666b30d2c8e7 100644 --- a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create flat virtual Ethernet networks of almost unlimited size"; - homepage = https://www.zerotier.com; + homepage = "https://www.zerotier.com"; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/zssh/default.nix b/nixpkgs/pkgs/tools/networking/zssh/default.nix index b2016fe9452c..720c43ccc2d7 100644 --- a/nixpkgs/pkgs/tools/networking/zssh/default.nix +++ b/nixpkgs/pkgs/tools/networking/zssh/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { # Cargo-culted from Arch, returns “out of pty's” without it (fetchurl { name = "fix_use_ptmx_on_arch.patch"; - url = https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67"; sha256 = "12daw9wpy58ql882zww945wk9cg2adwp8qsr5rvazx0xq0qawgbr"; }) ]; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "SSH and Telnet client with ZMODEM file transfer capability"; - homepage = http://zssh.sourceforge.net/; + homepage = "http://zssh.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix b/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix new file mode 100644 index 000000000000..dc69d3f030d7 --- /dev/null +++ b/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, openssl, pkgconfig, ronn, rustPlatform }: + +let + blake3-src = fetchFromGitHub { + owner = "BLAKE3-team"; + repo = "BLAKE3"; + rev = "0.3.1"; + sha256 = "0wkxx2w56hsng28p8zpndsy288ix4s5qg6xqjzgjz53fbyk46hda"; + }; + +in rustPlatform.buildRustPackage rec { + pname = "cached-nix-shell"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "xzfc"; + repo = pname; + rev = "v${version}"; + sha256 = "0pzwknpc4qrh9pv5z0xvldql2dkj9ddksvaci86a4f8cnd86p2l6"; + }; + + cargoSha256 = "1n88gcnrfdrk025hb54igc83cn5vlv8n6ndyx1ydmzhd95vhbznf"; + + # The BLAKE3 C library is intended to be built by the project depending on it + # rather than as a standalone library. + # https://github.com/BLAKE3-team/BLAKE3/blob/0.3.1/c/README.md#building + BLAKE3_CSRC = "${blake3-src}/c"; + + nativeBuildInputs = [ ronn ]; + + postBuild = '' + ronn -r cached-nix-shell.1.md + ''; + + postInstall = '' + mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty + cp target/release/build/cached-nix-shell-*/out/trace-nix.so $out/lib + cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh + cp cached-nix-shell.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Instant startup time for nix-shell"; + homepage = "https://github.com/xzfc/cached-nix-shell"; + license = with licenses; [ unlicense /* or */ mit ]; + maintainers = with maintainers; [ xzfc ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/nix/nix-script/default.nix b/nixpkgs/pkgs/tools/nix/nix-script/default.nix index d69b5943123c..da8ba3bce8e9 100644 --- a/nixpkgs/pkgs/tools/nix/nix-script/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-script/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nix-script"; - version = "2015-09-22"; + version = "2020-03-23"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-script"; - rev = "83064dc557b642f6748d4f2372b2c88b2a82c4e7"; - sha256 = "0iwclyd2zz8lv012yghfr4696kdnsq6xvc91wv00jpwk2c09xl7a"; + rev = "7706b45429ff22c35bab575734feb2926bf8840b"; + sha256 = "0yiqljamcj9x8z801bwj7r30sskrwv4rm6sdf39j83jqql1fyq7y"; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A shebang for running inside nix-shell."; - homepage = https://github.com/bennofs/nix-script; + homepage = "https://github.com/bennofs/nix-script"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs rnhmjoj ]; platforms = haskellPackages.ghc.meta.platforms; diff --git a/nixpkgs/pkgs/tools/nix/nixdoc/default.nix b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix index 6ea28dbea2b4..cdcb274945e2 100644 --- a/nixpkgs/pkgs/tools/nix/nixdoc/default.nix +++ b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Generate documentation for Nix functions"; - homepage = https://github.com/tazjin/nixdoc; + homepage = "https://github.com/tazjin/nixdoc"; license = [ licenses.gpl3 ]; maintainers = [ maintainers.tazjin ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix b/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix index f161591c8f1d..49669cba40a9 100644 --- a/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix +++ b/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/DE-IBH/apt-dater; + homepage = "https://github.com/DE-IBH/apt-dater"; description = "Terminal-based remote package update manager"; longDescription = '' Provides an ncurses frontend for managing package updates on a large diff --git a/nixpkgs/pkgs/tools/package-management/apt/default.nix b/nixpkgs/pkgs/tools/package-management/apt/default.nix index 0438e340b212..b83c49029b38 100644 --- a/nixpkgs/pkgs/tools/package-management/apt/default.nix +++ b/nixpkgs/pkgs/tools/package-management/apt/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line package management tools used on Debian-based systems"; - homepage = https://salsa.debian.org/apt-team/apt; + homepage = "https://salsa.debian.org/apt-team/apt"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/nixpkgs/pkgs/tools/package-management/bunny/default.nix b/nixpkgs/pkgs/tools/package-management/bunny/default.nix index 938a762ba303..33c6249ebd47 100644 --- a/nixpkgs/pkgs/tools/package-management/bunny/default.nix +++ b/nixpkgs/pkgs/tools/package-management/bunny/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple shell script wrapper around multiple package managers"; - homepage = https://gitlab.com/tim241/bunny; + homepage = "https://gitlab.com/tim241/bunny"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ buffet ]; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-deps/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-deps/default.nix index e648990ccf8f..d90d0fe79796 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-deps/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-deps/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo subcommand for building dependency graphs of Rust projects"; - homepage = https://github.com/m-cat/cargo-deps; + homepage = "https://github.com/m-cat/cargo-deps"; license = licenses.mit; maintainers = with maintainers; [ arcnmx ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix index 2fdf8a999561..7bcc6c12ee9d 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-edit/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A utility for managing cargo dependencies from the command line"; - homepage = https://github.com/killercup/cargo-edit; + homepage = "https://github.com/killercup/cargo-edit"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gerschtli jb55 filalex77 killercup ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix index a87387b3831f..41b6d26d02d8 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "112yk46yq484zvr8mbj678qsirmyn2ij2h0z359qrhhl7r19icab"; + sha256 = "01yvkfclrynv7gpvdckzbcv03xr28yb4v6333a6nv6gy05p26g3a"; }; - cargoSha256 = "1bjs7lkbamy9za619z31ycqqgrfhvxbgfgpc79ykh4mfwphxzg3n"; + cargoSha256 = "152f2f16d5vlww51aldvh1r2r4kx8ad5d48dc30xsfj669zzw24h"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix index 145d8aaacc00..69a55bcda91c 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-release/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; - homepage = https://github.com/sunng87/cargo-release; + homepage = "https://github.com/sunng87/cargo-release"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix index c0a1e8edc0f4..8dc07d287d2d 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix @@ -23,8 +23,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ]; cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1"; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libgit2 libssh2 openssl zlib ] ++ stdenv.lib.optional stdenv.isDarwin curl; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/package-management/cde/default.nix b/nixpkgs/pkgs/tools/package-management/cde/default.nix index 5354fbb5e5ed..ec6ad6eb55ab 100644 --- a/nixpkgs/pkgs/tools/package-management/cde/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cde/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pgbovine/CDE; + homepage = "https://github.com/pgbovine/CDE"; description = "A packaging tool for building portable packages"; license = licenses.gpl3; maintainers = [ maintainers.rlupton20 ]; diff --git a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix index 6605d9de65ae..bd23da8efb51 100644 --- a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix +++ b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "checkinstall-1.6.2"; src = fetchurl { - url = http://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-1.6.2.tar.gz; + url = "http://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-1.6.2.tar.gz"; sha256 = "1x4kslyvfd6lm6zd1ylbq2pjxrafb77ydfjaqi16sa5qywn1jqfw"; }; @@ -65,7 +65,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://checkinstall.izto.org/; + homepage = "http://checkinstall.izto.org/"; description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/package-management/clib/default.nix b/nixpkgs/pkgs/tools/package-management/clib/default.nix index 75c47dda0c40..5fdf6d663627 100644 --- a/nixpkgs/pkgs/tools/package-management/clib/default.nix +++ b/nixpkgs/pkgs/tools/package-management/clib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C micro-package manager"; - homepage = https://github.com/clibs/clib; + homepage = "https://github.com/clibs/clib"; license = licenses.mit; maintainers = with maintainers; [ jb55 ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/package-management/conda/default.nix b/nixpkgs/pkgs/tools/package-management/conda/default.nix index 92d0e2543125..325a5c4fa5ee 100644 --- a/nixpkgs/pkgs/tools/package-management/conda/default.nix +++ b/nixpkgs/pkgs/tools/package-management/conda/default.nix @@ -66,7 +66,7 @@ in meta = { description = "Conda is a package manager for Python"; - homepage = https://conda.io/; + homepage = "https://conda.io/"; platforms = lib.platforms.linux; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine bhipple ]; diff --git a/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index dd64241fd372..5ede7af10bf0 100644 --- a/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "DisnixWebService-0.9"; src = fetchurl { - url = https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz"; sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl"; }; buildInputs = [ apacheAnt jdk ]; diff --git a/nixpkgs/pkgs/tools/package-management/disnix/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/default.nix index 2c5bc41e18d6..cc6072eb6dc8 100644 --- a/nixpkgs/pkgs/tools/package-management/disnix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/disnix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "disnix-0.9.1"; src = fetchurl { - url = https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz"; sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf"; }; diff --git a/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix index 319716c0f3ea..709c5454e104 100644 --- a/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "disnixos-0.8"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz"; sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91"; }; diff --git a/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix b/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix index 7b5d99bef9e7..2485becc9e57 100644 --- a/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -22,10 +22,10 @@ assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; stdenv.mkDerivation { - name = "dysnomia-0.9"; + name = "dysnomia-0.9.1"; src = fetchurl { - url = https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9/dysnomia-0.9.tar.gz; - sha256 = "09pk2l3pss48kvm5wvskh842vakbzmjzxzfzyw1nkqnvni130ikl"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9.1/dysnomia-0.9.1.tar.gz"; + sha256 = "1rrq9jnmpsjg1rrjbnq7znm4gma2ga5j4nlykvxwkylp72dq12ks"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/nixpkgs/pkgs/tools/package-management/elm-github-install/Gemfile.lock b/nixpkgs/pkgs/tools/package-management/elm-github-install/Gemfile.lock index a551368eade1..5b586256278b 100644 --- a/nixpkgs/pkgs/tools/package-management/elm-github-install/Gemfile.lock +++ b/nixpkgs/pkgs/tools/package-management/elm-github-install/Gemfile.lock @@ -36,4 +36,4 @@ DEPENDENCIES elm_install BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix b/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix index 5703a13745bd..8da05981dafa 100644 --- a/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix +++ b/nixpkgs/pkgs/tools/package-management/elm-github-install/default.nix @@ -13,7 +13,7 @@ bundlerEnv rec { meta = with lib; { description = "Install Elm packages from git repositories."; - homepage = https://github.com/gdotdesign/elm-github-install; + homepage = "https://github.com/gdotdesign/elm-github-install"; license = licenses.unfree; maintainers = with maintainers; [ roberth nicknovitski ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/nixpkgs/pkgs/tools/package-management/emplace/default.nix index 8845c54b5714..bb91697ab57c 100644 --- a/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,22 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.12"; + version = "0.2.15"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "1jhv7c68ymwaq9fr586rjbgcaxpkxcr0d3pq7lyhbzihaywz7m6m"; + sha256 = "1h1z18m504kflzv9wcybkgc4xr5w9l9d7qsjri0an57lxv6dpv0f"; }; - cargoSha256 = "1n4k8mnsix3sy6pmqkk7wymknn1mn5dkwa9i90nlb4k2h9y709wj"; + cargoSha256 = "1wfxy4py2xwf1m0i52jq1f9xgzc7v5m55crl0xbp8f0raflksaxk"; meta = with lib; { description = "Mirror installed software on multiple machines"; homepage = "https://github.com/tversteeg/emplace"; license = licenses.agpl3; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/package-management/fpm/Gemfile.lock b/nixpkgs/pkgs/tools/package-management/fpm/Gemfile.lock index 1045c7b495a0..c8bb7d364132 100644 --- a/nixpkgs/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/nixpkgs/pkgs/tools/package-management/fpm/Gemfile.lock @@ -44,4 +44,4 @@ DEPENDENCIES fpm BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/package-management/fpm/default.nix b/nixpkgs/pkgs/tools/package-management/fpm/default.nix index ccb50717accf..4eab1556d954 100644 --- a/nixpkgs/pkgs/tools/package-management/fpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/fpm/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Tool to build packages for multiple platforms with ease"; - homepage = https://github.com/jordansissel/fpm; + homepage = "https://github.com/jordansissel/fpm"; license = licenses.mit; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/package-management/gx/default.nix b/nixpkgs/pkgs/tools/package-management/gx/default.nix index 8e8d30e4fccf..791dfe755ee4 100644 --- a/nixpkgs/pkgs/tools/package-management/gx/default.nix +++ b/nixpkgs/pkgs/tools/package-management/gx/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A packaging tool built around IPFS"; - homepage = https://github.com/whyrusleeping/gx; + homepage = "https://github.com/whyrusleeping/gx"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/nixpkgs/pkgs/tools/package-management/gx/go/default.nix b/nixpkgs/pkgs/tools/package-management/gx/go/default.nix index 0a0793130d14..652edf95e550 100644 --- a/nixpkgs/pkgs/tools/package-management/gx/go/default.nix +++ b/nixpkgs/pkgs/tools/package-management/gx/go/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A tool for importing go packages into gx"; - homepage = https://github.com/whyrusleeping/gx-go; + homepage = "https://github.com/whyrusleeping/gx-go"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index 793c7cfae32d..8c70a5a47242 100644 --- a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2020-03-07"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "5c1e7349bbd9b51fe41ea96b67c380feef996b90"; - sha256 = "03lw5pq878zbkkwm5abr01p77radn2zgfyvwlra7fhywbl76l83x"; + rev = "5969551a5cc52f9470b5ff5ca01327bf4bda82c1"; + sha256 = "0f4kz83a1kp3ci8zi5hvp8fp34wi73arpykl4d9vlywdk6w36bnd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix index 6afba001e08d..54435b76947a 100644 --- a/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "mynewt-newt"; @@ -13,21 +13,19 @@ buildGoModule rec { patches = [ (fetchpatch { - url = https://github.com/apache/mynewt-newt/commit/6a51e35565323ebe8feb8d1aa6e00960b6ce662e.patch; + url = "https://github.com/apache/mynewt-newt/commit/6a51e35565323ebe8feb8d1aa6e00960b6ce662e.patch"; sha256 = "186yha60jzcjq8r04w12rqqh3cin2w974l77hz2ixhmjzyr56wqv"; }) (fetchpatch { - url = https://github.com/apache/mynewt-newt/commit/7d4ef3fe65a9a83cc58e7bd973654ad235cc68bc.patch; + url = "https://github.com/apache/mynewt-newt/commit/7d4ef3fe65a9a83cc58e7bd973654ad235cc68bc.patch"; sha256 = "01scmq58bfr4c9icqzm79q7a55izflsb3mlx9xn0dv92m3mbprx7"; }) ]; modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { - homepage = https://mynewt.apache.org/; + homepage = "https://mynewt.apache.org/"; description = "Build and package management tool for embedded development."; longDescription = '' Apache Newt is a smart build and package management tool, diff --git a/nixpkgs/pkgs/tools/package-management/niff/default.nix b/nixpkgs/pkgs/tools/package-management/niff/default.nix index 8c6a72cf131e..9d3736f6faad 100644 --- a/nixpkgs/pkgs/tools/package-management/niff/default.nix +++ b/nixpkgs/pkgs/tools/package-management/niff/default.nix @@ -27,8 +27,8 @@ in stdenv.mkDerivation { meta = { description = "A program that compares two Nix expressions and determines which attributes changed"; - homepage = https://github.com/FRidh/niff; + homepage = "https://github.com/FRidh/niff"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix b/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix index b78b3bf07cd5..352d1e68b50a 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; description = "Create bundles from Nixpkgs attributes"; license = licenses.mit; - homepage = https://github.com/matthewbauer/nix-bundle; + homepage = "https://github.com/matthewbauer/nix-bundle"; }; } diff --git a/nixpkgs/pkgs/tools/package-management/nix-du/default.nix b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix index 6ee7dee33f67..fa1394242d29 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-du/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A tool to determine which gc-roots take space in your nix store"; - homepage = https://github.com/symphorien/nix-du; + homepage = "https://github.com/symphorien/nix-du"; license = licenses.lgpl3; maintainers = [ maintainers.symphorien ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/package-management/nix-index/default.nix b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix index da7469ea6465..db26f9e0b087 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-index/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A files database for nixpkgs"; - homepage = https://github.com/bennofs/nix-index; + homepage = "https://github.com/bennofs/nix-index"; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.bennofs ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix b/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix index 19a40b7395fa..1a750da69301 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,67 +1,74 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt -, coreutils, gawk, gnugrep, gnused, jq, nix }: +{ stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc +, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk +, gnugrep, gnused, jq, nix }: -stdenv.mkDerivation rec { +let + binPath = stdenv.lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; + +in stdenv.mkDerivation rec { pname = "nix-prefetch"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "msteen"; repo = "nix-prefetch"; rev = version; - sha256 = "0b9gdi7xzmfq0j258x724xsll8gi31m0m4pzfjkqinlm6zwr3sgm"; + sha256 = "15h6f743nn6sdq8l771sjxh92cyzqznkcs7szrc7nm066xvx8rd4"; + # the stat call has to be in a subshell or we get the current date + extraPostFetch = '' + echo $(stat -c %Y $out) > $out/.timestamp + ''; }; + postPatch = '' + lib=$out/lib/${pname} + + substituteInPlace doc/nix-prefetch.1.asciidoc \ + --subst-var-by version $version + + substituteInPlace src/main.sh \ + --subst-var-by lib $lib \ + --subst-var-by version $version + + substituteInPlace src/tests.sh \ + --subst-var-by bin $out/bin + ''; + nativeBuildInputs = [ + asciidoc + docbook_xml_dtd_45 + docbook_xsl + installShellFiles + libxml2 + libxslt makeWrapper - asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - configurePhase = '' - . configure.sh - ''; + dontConfigure = true; buildPhase = '' - a2x -f manpage doc/nix-prefetch.1.asciidoc + a2x -a revdate=$(date --utc --date=@$(cat $src/.timestamp) +%d/%m/%Y) \ + -f manpage doc/nix-prefetch.1.asciidoc ''; installPhase = '' - lib=$out/lib/${pname} - mkdir -p $lib - substitute src/main.sh $lib/main.sh \ - --subst-var-by lib $lib \ - --subst-var-by version '${version}' - chmod +x $lib/main.sh - patchShebangs $lib/main.sh - cp lib/*.nix $lib/ - - mkdir -p $out/bin + install -Dm555 -t $lib src/*.sh + install -Dm444 -t $lib lib/* makeWrapper $lib/main.sh $out/bin/${pname} \ - --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}' - - substitute src/tests.sh $lib/tests.sh \ - --subst-var-by bin $out/bin - chmod +x $lib/tests.sh - patchShebangs $lib/tests.sh + --prefix PATH : ${binPath} - mkdir -p $out/share/man/man1 - substitute doc/nix-prefetch.1 $out/share/man/man1/nix-prefetch.1 \ - --subst-var-by version '${version}' \ - --replace '01/01/1970' "$date" + installManPage doc/nix-prefetch.? - install -D contrib/nix-prefetch-completion.bash $out/share/bash-completion/completions/nix-prefetch - install -D contrib/nix-prefetch-completion.zsh $out/share/zsh/site-functions/_nix_prefetch + installShellCompletion --name ${pname} contrib/nix-prefetch-completion.{bash,zsh} mkdir -p $out/share/doc/${pname}/contrib - cp -r contrib/hello_rs $out/share/doc/${pname}/contrib/ + cp -r contrib/hello_rs $out/share/doc/${pname}/contrib ''; meta = with stdenv.lib; { description = "Prefetch any fetcher function call, e.g. package sources"; - homepage = "https://github.com/msteen/nix-prefetch"; license = licenses.mit; maintainers = with maintainers; [ msteen ]; - platforms = platforms.all; + inherit (src.meta) homepage; }; } diff --git a/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix b/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix index 63f948db9db3..fccfbe98f786 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/edolstra/nix-serve; + homepage = "https://github.com/edolstra/nix-serve"; description = "A utility for sharing a Nix store as a binary cache"; maintainers = [ maintainers.eelco ]; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/tools/package-management/nix-top/default.nix b/nixpkgs/pkgs/tools/package-management/nix-top/default.nix index 1d2cad2e39e4..0a003ba6b6b4 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-top/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-top/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tracks what nix is building"; - homepage = https://github.com/samueldr/nix-top; + homepage = "https://github.com/samueldr/nix-top"; license = licenses.mit; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/nixpkgs/pkgs/tools/package-management/nix-universal-prefetch/default.nix index a4e43f149677..7079904735d7 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-universal-prefetch/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-universal-prefetch/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Uses nixpkgs fetchers to figure out hashes"; - homepage = https://github.com/samueldr/nix-universal-prefetch; + homepage = "https://github.com/samueldr/nix-universal-prefetch"; license = licenses.mit; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index 29af4a90cb90..96fd1bebdd45 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, callPackage +{ lib, fetchurl, fetchFromGitHub, callPackage , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -12,6 +12,7 @@ common = { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, gzip, gnutar , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json + , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , jq, libarchive, rustc, cargo , busybox-sandbox-shell , storeDir @@ -20,7 +21,7 @@ common = , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp - , name, suffix ? "", src, includesPerl ? false + , name, suffix ? "", src, crates ? null }: let @@ -29,7 +30,6 @@ common = inherit name src; version = lib.getVersion name; - is20 = lib.versionAtLeast version "2.0pre"; is24 = lib.versionAtLeast version "2.4pre"; isExactly23 = lib.versionAtLeast version "2.3" && lib.versionOlder version "2.4"; @@ -39,21 +39,22 @@ common = nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals (!is20) [ curl perl ] - ++ lib.optionals is24 [ jq ]; + ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ]; - buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json ] + buildInputs = + [ curl openssl sqlite xz bzip2 nlohmann_json + brotli boost editline + ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is20 [ brotli boost editline ] ++ lib.optionals is24 [ libarchive rustc cargo ] ++ lib.optional withLibseccomp libseccomp - ++ lib.optional (withAWS && is20) + ++ lib.optional withAWS ((aws-sdk-cpp.override { apis = ["s3" "transfer"]; customMemoryManagement = false; }).overrideDerivation (args: { patches = args.patches or [] ++ [(fetchpatch { - url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch; + url = "https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch"; sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; })]; })); @@ -66,7 +67,7 @@ common = preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. # https://github.com/NixOS/nixpkgs/issues/45462 - lib.optionalString is20 '' + '' mkdir -p $out/lib cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib rm -f $out/lib/*.a @@ -75,6 +76,11 @@ common = patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} '' + + # Unpack the Rust crates. + lib.optionalString is24 '' + tar xvf ${crates} -C nix-rust/ + mv nix-rust/nix-vendored-crates* nix-rust/vendor + '' + # For Nix-2.3, patch around an issue where the Nix configure step pulls in the # build system's bash and other utilities when cross-compiling lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly23) '' @@ -97,12 +103,7 @@ common = "--disable-init-state" "--enable-gc" ] - ++ lib.optionals (!is20) [ - "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" - "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" - "BDW_GC_LIBS=\"-lgc -lgccpp\"" - ] ++ lib.optionals (is20 && stdenv.isLinux) [ + ++ lib.optionals stdenv.isLinux [ "--with-sandbox-shell=${sh}/bin/busybox" ] ++ lib.optional ( @@ -135,7 +136,7 @@ common = a package, multi-user package management and easy setup of build environments. ''; - homepage = https://nixos.org/; + homepage = "https://nixos.org/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; @@ -143,7 +144,7 @@ common = }; passthru = { - perl-bindings = if includesPerl then nix else stdenv.mkDerivation { + perl-bindings = stdenv.mkDerivation { pname = "nix-perl"; inherit version; @@ -154,8 +155,7 @@ common = # This is not cross-compile safe, don't have time to fix right now # but noting for future travellers. nativeBuildInputs = - [ perl pkgconfig curl nix libsodium ] - ++ lib.optional is20 boost; + [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive ]; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" @@ -174,24 +174,11 @@ in rec { nix = nixStable; - nix1 = callPackage common rec { - name = "nix-1.11.16"; - src = fetchurl { - url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; - }; - - # Nix1 has the perl bindings by default, so no need to build the manually. - includesPerl = true; - - inherit storeDir stateDir confDir boehmgc; - }; - nixStable = callPackage common (rec { - name = "nix-2.3.3"; + name = "nix-2.3.4"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "332fffb8dfc33eab854c136ef162a88cec15b701def71fa63714d160831ba224"; + sha256 = "1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d"; }; inherit storeDir stateDir confDir boehmgc; @@ -201,10 +188,18 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre7250_94c93437"; - src = fetchurl { - url = "https://hydra.nixos.org/build/112193977/download/3/nix-2.4${suffix}.tar.xz"; - sha256 = "f9baf241c9449c1e3e5c9610adbcd2ce9e5fbcab16aff3ba3030d2fad7b34d7b"; + suffix = "pre7346_5e7ccdc9"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "5e7ccdc9e3ddd61dc85e20c898001345bfb497a5"; + sha256 = "10jg0rq92xbigbbri7harn4b75blqaf6rjgq4hhvlnggf2w9iprg"; + }; + + crates = fetchurl { + url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; + sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; }; inherit storeDir stateDir confDir boehmgc; @@ -212,10 +207,18 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200220_4a4521f"; - src = fetchurl { - url = "https://hydra.nixos.org/build/113373394/download/3/nix-2.4${suffix}.tar.xz"; - sha256 = "31fe87c40f40a590bc8f575283725d5f04ecb9aebb6b404f679d77438d75265d"; + suffix = "pre20200403_3473b19"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "3473b1950a90d596a3baa080fdfdb080f55a5cc0"; + sha256 = "1bb7a8a5lzmb3pzq80zxd3s9y3qv757q7032s5wvp75la9wgvmvr"; + }; + + crates = fetchurl { + url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; + sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/nixpkgs/pkgs/tools/package-management/nixops/generic.nix b/nixpkgs/pkgs/tools/package-management/nixops/generic.nix index 79400a8e5ea0..59d139d28847 100644 --- a/nixpkgs/pkgs/tools/package-management/nixops/generic.nix +++ b/nixpkgs/pkgs/tools/package-management/nixops/generic.nix @@ -46,7 +46,7 @@ python2Packages.buildPythonApplication { ''; meta = { - homepage = https://github.com/NixOS/nixops; + homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix b/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix index f63fe868e011..cf633a65ca53 100644 --- a/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -17,7 +17,7 @@ buildGoPackage rec { }; meta = with lib; { - homepage = https://github.com/kamilchm/nixops-dns/; + homepage = "https://github.com/kamilchm/nixops-dns/"; description = "DNS server for resolving NixOps machines"; license = licenses.mit; maintainers = with maintainers; [ kamilchm sorki ]; diff --git a/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix index 9f54d82d3cd2..d8811b2a7e2f 100644 --- a/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; - homepage = https://github.com/Mic92/nixpkgs-review; + homepage = "https://github.com/Mic92/nixpkgs-review"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/nixpkgs/pkgs/tools/package-management/nixui/default.nix b/nixpkgs/pkgs/tools/package-management/nixui/default.nix index 131a3bb5fddc..12bf229580f6 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; meta = { description = "NodeWebkit user interface for Nix"; - homepage = https://github.com/matejc/nixui; + homepage = "https://github.com/matejc/nixui"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix index 25eaac8f2b7d..f822bdb53332 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix @@ -98,11 +98,11 @@ in buildInputs = globalBuildInputs; meta = { description = "nix-env frontend written with Polymer"; - homepage = https://github.com/matejc/nixui; + homepage = "https://github.com/matejc/nixui"; license = "Apache-2.0"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/tools/package-management/nox/default.nix b/nixpkgs/pkgs/tools/package-management/nox/default.nix index 673fc89e98db..bf98f5400b8e 100644 --- a/nixpkgs/pkgs/tools/package-management/nox/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nox/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - homepage = https://github.com/madjar/nox; + homepage = "https://github.com/madjar/nox"; description = "Tools to make nix nicer to use"; maintainers = [ lib.maintainers.madjar ]; license = lib.licenses.mit; diff --git a/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix b/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix index 1c97757ff8a6..373ebbeb02f8 100644 --- a/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix +++ b/nixpkgs/pkgs/tools/package-management/opkg-utils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Helper scripts for use with the opkg package manager"; - homepage = http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/; + homepage = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/nixpkgs/pkgs/tools/package-management/opkg/default.nix index 1aae0290d5a7..c097674135c7 100644 --- a/nixpkgs/pkgs/tools/package-management/opkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/opkg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; - homepage = https://git.yoctoproject.org/cgit/cgit.cgi/opkg/; + homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix index dc69ae457dcd..05877979e9c5 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python3, sqlite , gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive -# TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false , enableBashCompletion ? false, bash-completion ? null @@ -23,7 +22,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib polkit python3 gobject-introspection ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; - propagatedBuildInputs = [ sqlite nix boost ]; + propagatedBuildInputs = + [ sqlite boost ] + ++ lib.optional enableNixBackend nix; nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { a common set of abstractions that can be used by standard GUI and text mode package managers. ''; - homepage = http://www.packagekit.org/; + homepage = "http://www.packagekit.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; diff --git a/nixpkgs/pkgs/tools/package-management/pacman/default.nix b/nixpkgs/pkgs/tools/package-management/pacman/default.nix index cdd0c83574af..3ca55ddbbf29 100644 --- a/nixpkgs/pkgs/tools/package-management/pacman/default.nix +++ b/nixpkgs/pkgs/tools/package-management/pacman/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple library-based package manager"; - homepage = https://www.archlinux.org/pacman/; + homepage = "https://www.archlinux.org/pacman/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ mt-caret ]; diff --git a/nixpkgs/pkgs/tools/package-management/protontricks/default.nix b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix index c2bdf327124d..fe7f41c4d08a 100644 --- a/nixpkgs/pkgs/tools/package-management/protontricks/default.nix +++ b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix @@ -45,7 +45,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; - homepage = https://github.com/Matoking/protontricks; + homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ metadark ]; diff --git a/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/nixpkgs/pkgs/tools/package-management/rpm/default.nix index 05d293b5bf12..fdcf9832e667 100644 --- a/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.rpm.org/; + homepage = "http://www.rpm.org/"; license = licenses.gpl2; description = "The RPM Package Manager"; maintainers = with maintainers; [ copumpkin ]; diff --git a/nixpkgs/pkgs/tools/package-management/xbps/default.nix b/nixpkgs/pkgs/tools/package-management/xbps/default.nix index 0322faa4c88b..108b64bd8b2f 100644 --- a/nixpkgs/pkgs/tools/package-management/xbps/default.nix +++ b/nixpkgs/pkgs/tools/package-management/xbps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xbps"; - version = "0.59"; + version = "0.59.1"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "0m00h1f004gsa998cr93b4zmsn4162983d360pzpd3hfi3qzan5d"; + sha256 = "0pab3xf97y4wqlyrb92zxd3cfsrbnlx6pssbw4brgwcxccw9jrhy"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/nixpkgs/pkgs/tools/security/2fa/default.nix b/nixpkgs/pkgs/tools/security/2fa/default.nix index c4ba7b67dc71..cf14ec124024 100644 --- a/nixpkgs/pkgs/tools/security/2fa/default.nix +++ b/nixpkgs/pkgs/tools/security/2fa/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://rsc.io/2fa; + homepage = "https://rsc.io/2fa"; description = "Two-factor authentication on the command line"; platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/nixpkgs/pkgs/tools/security/acsccid/default.nix b/nixpkgs/pkgs/tools/security/acsccid/default.nix index 80fa0e2dc478..5b79b3db705b 100644 --- a/nixpkgs/pkgs/tools/security/acsccid/default.nix +++ b/nixpkgs/pkgs/tools/security/acsccid/default.nix @@ -1,4 +1,16 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb, libiconv }: +{ stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, gettext +, flex +, perl +, pkgconfig +, pcsclite +, libusb1 +, libiconv +}: stdenv.mkDerivation rec { version = "1.1.8"; @@ -11,11 +23,28 @@ stdenv.mkDerivation rec { sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3"; }; - doCheck = true; + nativeBuildInputs = [ + pkgconfig + autoconf + automake + libtool + gettext + flex + perl + ]; + + buildInputs = [ + pcsclite + libusb1 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + configureFlags = [ + "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" + ]; + + doCheck = true; postPatch = '' sed -e s_/bin/echo_echo_g -i src/Makefile.am @@ -29,7 +58,6 @@ stdenv.mkDerivation rec { autoheader automake --force-missing --add-missing autoconf - configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/security/afl/qemu.nix b/nixpkgs/pkgs/tools/security/afl/qemu.nix index b841ccb93d3c..3af44763a8a6 100644 --- a/nixpkgs/pkgs/tools/security/afl/qemu.nix +++ b/nixpkgs/pkgs/tools/security/afl/qemu.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://www.qemu.org/; + homepage = "http://www.qemu.org/"; description = "Fork of QEMU with AFL instrumentation support"; license = licenses.gpl2Plus; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/nixpkgs/pkgs/tools/security/age/default.nix b/nixpkgs/pkgs/tools/security/age/default.nix index 0448faf53b76..c8b4f069f795 100644 --- a/nixpkgs/pkgs/tools/security/age/default.nix +++ b/nixpkgs/pkgs/tools/security/age/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "age"; - version = "1.0.0-beta2"; + version = "unstable-2020-03-25"; goPackagePath = "github.com/FiloSottile/age"; - modSha256 = "0kwdwhkxgqjd8h1p7pm4h4xidp2vk840h1j4qya4qz8bjf9vskl9"; + modSha256 = "00yhn1894ni8bvkqm1vr0rqkky52pkhvdzbi2sqx3czlgb5ibw3h"; subPackages = [ "cmd/age" @@ -14,13 +14,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; - rev = "v${version}"; - sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq"; + rev = "f0f8092d60bb96737fa096c29ec6d8adb5810390"; + sha256 = "079kfc8d1pr39hr4qnx48kviyzwg4p8m4pz0bdkypns4aq8ppbfk"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/security/aide/default.nix b/nixpkgs/pkgs/tools/security/aide/default.nix index ea14d89c45c6..116ada633c6f 100644 --- a/nixpkgs/pkgs/tools/security/aide/default.nix +++ b/nixpkgs/pkgs/tools/security/aide/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://aide.sourceforge.net/; + homepage = "http://aide.sourceforge.net/"; description = "A file and directory integrity checker"; license = licenses.free; maintainers = [ maintainers.tstrobel ]; diff --git a/nixpkgs/pkgs/tools/security/apg/default.nix b/nixpkgs/pkgs/tools/security/apg/default.nix index db490c7822f8..1dcdeae832d5 100644 --- a/nixpkgs/pkgs/tools/security/apg/default.nix +++ b/nixpkgs/pkgs/tools/security/apg/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { * Ability to enforce remote users to use only allowed type of password generation ''; - homepage = http://www.adel.nursat.kz/apg/; + homepage = "http://www.adel.nursat.kz/apg/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index 580cf7585c92..ee5fa924cb6f 100644 --- a/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/yishilin14/asc-key-to-qr-code-gif; + homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif"; description = "Convert ASCII-armored PGP keys to animated QR code"; platforms = platforms.linux; maintainers = with maintainers; [ asymmetric ]; diff --git a/nixpkgs/pkgs/tools/security/aws-okta/default.nix b/nixpkgs/pkgs/tools/security/aws-okta/default.nix index 71732f26934b..fe7d5e69f4d5 100644 --- a/nixpkgs/pkgs/tools/security/aws-okta/default.nix +++ b/nixpkgs/pkgs/tools/security/aws-okta/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { license = licenses.mit; maintainers = [maintainers.imalsogreg]; platforms = platforms.all; - homepage = https://github.com/segmentio/aws-okta; + homepage = "https://github.com/segmentio/aws-okta"; downloadPage = "https://github.com/segmentio/aws-okta"; }; } diff --git a/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix index b745a2c872e7..f72c916acf99 100644 --- a/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix +++ b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ fgaz ]; - homepage = https://github.com/lanzz/bash-supergenpass; + homepage = "https://github.com/lanzz/bash-supergenpass"; }; } diff --git a/nixpkgs/pkgs/tools/security/bettercap/default.nix b/nixpkgs/pkgs/tools/security/bettercap/default.nix index d0cda57e2d06..0560f91b22b7 100644 --- a/nixpkgs/pkgs/tools/security/bettercap/default.nix +++ b/nixpkgs/pkgs/tools/security/bettercap/default.nix @@ -1,29 +1,35 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libpcap, libnfnetlink, libnetfilter_queue, libusb1 }: +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, libpcap +, libnfnetlink +, libnetfilter_queue +, libusb1 +}: -buildGoPackage rec { +buildGoModule rec { pname = "bettercap"; - version = "2.26.1"; - - goPackagePath = "github.com/bettercap/bettercap"; + version = "2.27"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "10qsknyzfpzfpm4gp98jwvw6qmkmx23nw88sbnpl2rlr725l560c"; + sha256 = "18hwz9m16pxlb7wp78iqmdi0kimrx3h05fs0zhzm8qhzancq8alf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; + modSha256 = "1qhmrjb3fvw6maxrl7hb3bizrw6szhwx6s2g59p5pj3dz4x8jajn"; - goDeps = ./deps.nix; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A man in the middle tool"; longDescription = '' BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more. - '' ; - homepage = https://www.bettercap.org/; + ''; + homepage = "https://www.bettercap.org/"; license = with licenses; gpl3; maintainers = with maintainers; [ y0no ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/security/bettercap/deps.nix b/nixpkgs/pkgs/tools/security/bettercap/deps.nix deleted file mode 100644 index 12aeb1918c6e..000000000000 --- a/nixpkgs/pkgs/tools/security/bettercap/deps.nix +++ /dev/null @@ -1,534 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/adrianmo/go-nmea"; - fetch = { - type = "git"; - url = "https://github.com/adrianmo/go-nmea"; - rev = "v1.1.0"; - sha256 = "167iwpwdwfbyghqfrzdfvfpvsmj92x7qqy6sx6yngdw21wd0m44f"; - }; - } - { - goPackagePath = "github.com/antchfx/jsonquery"; - fetch = { - type = "git"; - url = "https://github.com/antchfx/jsonquery"; - rev = "v1.0.0"; - sha256 = "04xk7ib059xzl1y87ah41q7vzl3xp99mq8nyccx8hlsng1nc0haw"; - }; - } - { - goPackagePath = "github.com/antchfx/xpath"; - fetch = { - type = "git"; - url = "https://github.com/antchfx/xpath"; - rev = "v1.1.0"; - sha256 = "0bgin15841q009yxbyqfqk5b2yk2f4a1mswjkgiqxgarmql0mpsy"; - }; - } - { - goPackagePath = "github.com/bettercap/gatt"; - fetch = { - type = "git"; - url = "https://github.com/bettercap/gatt"; - rev = "569d3d9372bb"; - sha256 = "0ncg6wd4wkr12l4bs7vyyrd08imyd5y1vdyp7f9shjq9nzv3rzcz"; - }; - } - { - goPackagePath = "github.com/bettercap/nrf24"; - fetch = { - type = "git"; - url = "https://github.com/bettercap/nrf24"; - rev = "aa37e6d0e0eb"; - sha256 = "1y6ffcj94hk7slajqw3lqpdxzx6iqpj2i2zpsvggg6kfaa1iklnj"; - }; - } - { - goPackagePath = "github.com/bettercap/readline"; - fetch = { - type = "git"; - url = "https://github.com/bettercap/readline"; - rev = "9cec905dd291"; - sha256 = "1lsnyckg2l78hz4la8dhwvjsyff706khw10nxds5afzl4mrih3vn"; - }; - } - { - goPackagePath = "github.com/bettercap/recording"; - fetch = { - type = "git"; - url = "https://github.com/bettercap/recording"; - rev = "3ce1dcf032e3"; - sha256 = "1arh12iz15anyrqr4q496lpd0gx5nf2cwyr5rv17rawqqz8ydg23"; - }; - } - { - goPackagePath = "github.com/chifflier/nfqueue-go"; - fetch = { - type = "git"; - url = "https://github.com/chifflier/nfqueue-go"; - rev = "61ca646babef"; - sha256 = "1i1q2xl86f3s9x3j2ffxprwqhcrkh4w23hh4ib7jksxvaq36v33l"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/elazarl/goproxy"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/goproxy"; - rev = "473e67f1d7d2"; - sha256 = "1xsrdlcgl088phanm81pskym2ry8z1nizvq3lsq0c7cvzb6mrw4p"; - }; - } - { - goPackagePath = "github.com/evilsocket/islazy"; - fetch = { - type = "git"; - url = "https://github.com/evilsocket/islazy"; - rev = "v1.10.4"; - sha256 = "1ayc4di6584yajybh724mcmng069q38j1dpljgi8fhsyhb4sila3"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "e7a84e9525fe"; - sha256 = "1v6vjklq06wqddv46ihajahaj1slv0imgaivlxr8bsx59i90js5q"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "v17.0.0"; - sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/google/gopacket"; - fetch = { - type = "git"; - url = "https://github.com/google/gopacket"; - rev = "v1.1.17"; - sha256 = "192af5z18nnafn35gdy4wahlx6ggbhlnxzlm1yvxjxawfwnilidn"; - }; - } - { - goPackagePath = "github.com/google/gousb"; - fetch = { - type = "git"; - url = "https://github.com/google/gousb"; - rev = "18f4c1d8a750"; - sha256 = "1i7ffkq395x0v1186j9bhfgy67wlq6s840xkyx8wn87w55yd05rh"; - }; - } - { - goPackagePath = "github.com/google/renameio"; - fetch = { - type = "git"; - url = "https://github.com/google/renameio"; - rev = "v0.1.0"; - sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.7.3"; - sha256 = "0vr38zdad3zgg7q7nn24knl8axngj7cgmlwa93m17yhsnlvqi531"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.1"; - sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; - }; - } - { - goPackagePath = "github.com/hashicorp/mdns"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/mdns"; - rev = "v1.0.1"; - sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j"; - }; - } - { - goPackagePath = "github.com/inconshreveable/go-vhost"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/go-vhost"; - rev = "06d84117953b"; - sha256 = "0wliilsybm7xf5h685a23rsm8bnlhkr332pkdkhf32q16sr1a9rk"; - }; - } - { - goPackagePath = "github.com/jpillora/go-tld"; - fetch = { - type = "git"; - url = "https://github.com/jpillora/go-tld"; - rev = "f16ca3b7b383"; - sha256 = "19v8bj14w0lcvysaw84klf5dg6ka351ixz9r6cd9mksdd80nvzcq"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/kr/binarydist"; - fetch = { - type = "git"; - url = "https://github.com/kr/binarydist"; - rev = "v0.1.0"; - sha256 = "0hz1yqlxmkdib8xsdkkvn4ian4i69jmfapadim9fhj632d6jpi7w"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/malfunkt/iprange"; - fetch = { - type = "git"; - url = "https://github.com/malfunkt/iprange"; - rev = "v0.9.0"; - sha256 = "0gv5w678r74jval675xp0y1hzpf7mm5m9apa1rz9krxc9zd0ycr8"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.4"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.10"; - sha256 = "0jf4hwfwd2cpxrlyv0jzcia809q2bjw7y1m3ciaj2s8lj2jqyf6r"; - }; - } - { - goPackagePath = "github.com/mdlayher/dhcp6"; - fetch = { - type = "git"; - url = "https://github.com/mdlayher/dhcp6"; - rev = "2a67805d7d0b"; - sha256 = "0xn7canpik3lrz73dcz4jzapq1bfxpnashvjvnvshcpa2n1lh8yw"; - }; - } - { - goPackagePath = "github.com/mgutz/ansi"; - fetch = { - type = "git"; - url = "https://github.com/mgutz/ansi"; - rev = "9520e82c474b"; - sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j"; - }; - } - { - goPackagePath = "github.com/mgutz/logxi"; - fetch = { - type = "git"; - url = "https://github.com/mgutz/logxi"; - rev = "aebf8a7d67ab"; - sha256 = "1f8sqibkzz9wfplvvblz9s0xvvmhkd2af8ghcsmjw8818gcrzsqx"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.22"; - sha256 = "1iv9jznakz8f5swiir0z4zilr9ypavnsc0g4zi1r0vad6npy7zfl"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "15f95af6e78d"; - sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-charset"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-charset"; - rev = "2471d30d28b4"; - sha256 = "1cmkhwkqx1smnsvrr9ah2x5qav0i6vdiq8x4j8j812xspfl69zwx"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.3.0"; - sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/tarm/serial"; - fetch = { - type = "git"; - url = "https://github.com/tarm/serial"; - rev = "98f6abe2eb07"; - sha256 = "1yj4jiv2f3x3iawxdflrlmdan0k9xsbnccgc9yz658rmif1ag3pb"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "4bf6d317e70e"; - sha256 = "19lg1ly3j31anx92p0hynic1gjk417wwxphfdrb2cq1c19kj3r17"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "da9a3fd4c582"; - sha256 = "0iavs400534jn7drmdphx0f18vgg060p2r59xw5d85ji1l5rin1l"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "727590c5006e"; - sha256 = "0891pfmc73hyr6hrsq1mkk3lasxa8fz4vlnljnzz6yihmhz9ab6a"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2ca718005c18"; - sha256 = "1nl4cw8vrfigab0hij86vl2mmhfmyim69r7vy5qk2v60g8frvgxg"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a985d3407aa7"; - sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/errgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/errgo.v2"; - rev = "v2.1.0"; - sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "v0.0.0-2019.2.1"; - sha256 = "1frpy4pl9yp6j00mjj2yss3k8hip0cc7b5i5mz61n3dlw0kga9z1"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/nixpkgs/pkgs/tools/security/bitwarden/default.nix index 71f39eaf2ee9..f2abc376cd27 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.17.0"; + x86_64-linux = "1.17.2"; }.${system} or ""; sha256 = { - x86_64-linux = "01azgz1wka32z2jjdnbdyzm8fbrb34ifwirmjbvfw37yia28sd72"; + x86_64-linux = "0v7lrwj3sdypnqayknwg0cg9c2gfsxbjic5wswkfxljy652x8izx"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix b/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix index cd71ea99fecb..6accefa58a4f 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.14"; + version = "1.14.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "1ck0l0167kw1i5fjn507g4d18x2krbpk2ks0lnw9vzg0bwnzzwwd"; + sha256 = "10fi5vvckmdbjvlg6mlaqh2dsm33sbkq1z1b6gmz8qjbijc8i7gw"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "0cgk61dmc057p82g0apd4sx6a8vhvcipxikrdb0hds4frhqsr6i8"; + cargoSha256 = "1p8wpndj1aydhcjl15z3xhjf52a0l5rh5cy9qs6w4776crya2jjr"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix b/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix index 0ce9d43f967a..43d8d3a9b118 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.12.0e"; + version = "2.13.2"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1jy3c5ywlplrjsy37i90x5s8k0i5n1mn8y0fyl074s807glqaxbf"; + sha256 = "1000iqjr670imm1dlw9r003d8psp5sq0m0p62sjnll7wnycd805r"; }; buildCommand = '' diff --git a/nixpkgs/pkgs/tools/security/bmrsa/11.nix b/nixpkgs/pkgs/tools/security/bmrsa/11.nix index 47851fbfa053..c7d4c4d01741 100644 --- a/nixpkgs/pkgs/tools/security/bmrsa/11.nix +++ b/nixpkgs/pkgs/tools/security/bmrsa/11.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "RSA utility"; - homepage = http://bmrsa.sourceforge.net/; + homepage = "http://bmrsa.sourceforge.net/"; license = licenses.gpl1; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/security/browserpass/default.nix b/nixpkgs/pkgs/tools/security/browserpass/default.nix index 966383163e60..a02d04e1333e 100644 --- a/nixpkgs/pkgs/tools/security/browserpass/default.nix +++ b/nixpkgs/pkgs/tools/security/browserpass/default.nix @@ -46,7 +46,7 @@ buildGoModule rec { meta = with lib; { description = "Browserpass native client app"; - homepage = https://github.com/browserpass/browserpass-native; + homepage = "https://github.com/browserpass/browserpass-native"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs infinisil ]; diff --git a/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock index 28cbcf5a9a66..107e425bc579 100644 --- a/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock @@ -13,4 +13,4 @@ DEPENDENCIES bundler-audit BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/security/bundler-audit/default.nix b/nixpkgs/pkgs/tools/security/bundler-audit/default.nix index 3712c129cf65..6bcb341a8343 100644 --- a/nixpkgs/pkgs/tools/security/bundler-audit/default.nix +++ b/nixpkgs/pkgs/tools/security/bundler-audit/default.nix @@ -20,7 +20,7 @@ bundlerEnv rec { - Prints advisory information. - Does not require a network connection. ''; - homepage = https://github.com/rubysec/bundler-audit; + homepage = "https://github.com/rubysec/bundler-audit"; license = licenses.gpl3Plus; maintainers = with maintainers; [ primeos nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/ccid/default.nix b/nixpkgs/pkgs/tools/security/ccid/default.nix index 8d0b3a89a348..b9cffc7f769d 100644 --- a/nixpkgs/pkgs/tools/security/ccid/default.nix +++ b/nixpkgs/pkgs/tools/security/ccid/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ccid drivers for pcsclite"; - homepage = https://ccid.apdu.fr/; + homepage = "https://ccid.apdu.fr/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/security/ccrypt/default.nix b/nixpkgs/pkgs/tools/security/ccrypt/default.nix index 77a15e2f27c7..a3210b2a5987 100644 --- a/nixpkgs/pkgs/tools/security/ccrypt/default.nix +++ b/nixpkgs/pkgs/tools/security/ccrypt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ccrypt-1.11"; src = fetchurl { - url = mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz; + url = "mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz"; sha256 = "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; meta = { - homepage = http://ccrypt.sourceforge.net/; + homepage = "http://ccrypt.sourceforge.net/"; description = "Utility for encrypting and decrypting files and streams with AES-256"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/security/certmgr/default.nix b/nixpkgs/pkgs/tools/security/certmgr/default.nix index 4f48522e613f..be3f891cc8bb 100644 --- a/nixpkgs/pkgs/tools/security/certmgr/default.nix +++ b/nixpkgs/pkgs/tools/security/certmgr/default.nix @@ -18,7 +18,7 @@ let inherit patches; meta = with stdenv.lib; { - homepage = https://cfssl.org/; + homepage = "https://cfssl.org/"; description = "Cloudflare's certificate manager"; platforms = platforms.linux; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/tools/security/cfssl/default.nix b/nixpkgs/pkgs/tools/security/cfssl/default.nix index 8d8497f6cb94..6d4238de7001 100644 --- a/nixpkgs/pkgs/tools/security/cfssl/default.nix +++ b/nixpkgs/pkgs/tools/security/cfssl/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { ]; meta = with stdenv.lib; { - homepage = https://cfssl.org/; + homepage = "https://cfssl.org/"; description = "Cloudflare's PKI and TLS toolkit"; license = licenses.bsd2; maintainers = with maintainers; [ mbrgm ]; diff --git a/nixpkgs/pkgs/tools/security/chaps/default.nix b/nixpkgs/pkgs/tools/security/chaps/default.nix index c8ee95069682..decc9ba31268 100644 --- a/nixpkgs/pkgs/tools/security/chaps/default.nix +++ b/nixpkgs/pkgs/tools/security/chaps/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PKCS #11 implementation based on trusted platform module (TPM)"; - homepage = https://www.chromium.org/developers/design-documents/chaps-technical-design; + homepage = "https://www.chromium.org/developers/design-documents/chaps-technical-design"; maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/security/chipsec/default.nix b/nixpkgs/pkgs/tools/security/chipsec/default.nix index 7d7456309899..387fa4d750bd 100644 --- a/nixpkgs/pkgs/tools/security/chipsec/default.nix +++ b/nixpkgs/pkgs/tools/security/chipsec/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf , kernel ? null, withDriver ? false }: pythonPackages.buildPythonApplication rec { - name = "chipsec-${version}"; - version = "1.4.7"; + pname = "chipsec"; + version = "1.4.9"; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "11qi4m4hqkylf1wd7f921r0p7xg5prpmfkmb7l9nn7sb95zz0sjr"; + sha256 = "1p6w8294w5z2f4jwc22mqaggv5qajvmf9iifv7fl7wdz3wsvskrk"; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { Mac OS X and UEFI shell. ''; license = licenses.gpl2; - homepage = https://github.com/chipsec/chipsec; + homepage = "https://github.com/chipsec/chipsec"; maintainers = with maintainers; [ johnazoidberg ]; platforms = if withDriver then [ "x86_64-linux" ] else platforms.all; }; diff --git a/nixpkgs/pkgs/tools/security/chkrootkit/default.nix b/nixpkgs/pkgs/tools/security/chkrootkit/default.nix index 1d85ba0b5669..864d73aaa972 100644 --- a/nixpkgs/pkgs/tools/security/chkrootkit/default.nix +++ b/nixpkgs/pkgs/tools/security/chkrootkit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Locally checks for signs of a rootkit"; - homepage = http://www.chkrootkit.org/; + homepage = "http://www.chkrootkit.org/"; license = licenses.bsd2; platforms = with platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/security/chntpw/default.nix b/nixpkgs/pkgs/tools/security/chntpw/default.nix index 5a037090801a..0a44c463eb70 100644 --- a/nixpkgs/pkgs/tools/security/chntpw/default.nix +++ b/nixpkgs/pkgs/tools/security/chntpw/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pogostick.net/~pnh/ntpasswd/; + homepage = "http://pogostick.net/~pnh/ntpasswd/"; description = "An utility to reset the password of any user that has a valid local account on a Windows system"; maintainers = with stdenv.lib.maintainers; [ deepfire ]; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix b/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix index 09c62d4b61a1..19dd9e9819af 100644 --- a/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix +++ b/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "chrome-token-signing"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "open-eid"; repo = "chrome-token-signing"; rev = "v${version}"; - sha256 = "1gh4gm0krz8m5vgwkjzg9al82rrrrsikzjh180jy7ha808ib2drw"; + sha256 = "0fqgci4336fbnd944zx9w37d5ky7i27n6wvlp5zv3hj955ldbh7g"; }; buildInputs = [ qmake pcsclite pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/security/clamav/default.nix b/nixpkgs/pkgs/tools/security/clamav/default.nix index 6cb2eaa7d33e..e1ea241c7fd7 100644 --- a/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.clamav.net; + homepage = "https://www.clamav.net"; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom robberer qknight fpletz globin ]; diff --git a/nixpkgs/pkgs/tools/security/cowpatty/default.nix b/nixpkgs/pkgs/tools/security/cowpatty/default.nix index 0fb9ed58997f..7d58de8553b3 100644 --- a/nixpkgs/pkgs/tools/security/cowpatty/default.nix +++ b/nixpkgs/pkgs/tools/security/cowpatty/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Offline dictionary attack against WPA/WPA2 networks"; license = licenses.gpl2; - homepage = https://www.willhackforsushi.com/?page_id=50; + homepage = "https://www.willhackforsushi.com/?page_id=50"; maintainers = with maintainers; [ nico202 ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/security/crackxls/default.nix b/nixpkgs/pkgs/tools/security/crackxls/default.nix index 04b7b5695b55..e861d70f7252 100644 --- a/nixpkgs/pkgs/tools/security/crackxls/default.nix +++ b/nixpkgs/pkgs/tools/security/crackxls/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.4"; src = fetchgit { - url = https://github.com/GavinSmith0123/crackxls2003.git; + url = "https://github.com/GavinSmith0123/crackxls2003.git"; rev = "refs/tags/v${version}"; sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/GavinSmith0123/crackxls2003/; + homepage = "https://github.com/GavinSmith0123/crackxls2003/"; description = "Used to break the encryption on old Microsoft Excel and Microsoft Word files"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/security/crunch/default.nix b/nixpkgs/pkgs/tools/security/crunch/default.nix index 259ee38c68f7..b53ead1c8527 100644 --- a/nixpkgs/pkgs/tools/security/crunch/default.nix +++ b/nixpkgs/pkgs/tools/security/crunch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wordlist generator"; - homepage = https://sourceforge.net/projects/crunch-wordlist/; + homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = platforms.unix; maintainers = with maintainers; [ lethalman lnl7 ]; }; diff --git a/nixpkgs/pkgs/tools/security/ctmg/default.nix b/nixpkgs/pkgs/tools/security/ctmg/default.nix index 104a615542bd..a30523c3bbc1 100644 --- a/nixpkgs/pkgs/tools/security/ctmg/default.nix +++ b/nixpkgs/pkgs/tools/security/ctmg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An encrypted container manager for Linux using cryptsetup"; - homepage = https://git.zx2c4.com/ctmg/about/; + homepage = "https://git.zx2c4.com/ctmg/about/"; license = licenses.isc; maintainers = with maintainers; [ mrVanDalo ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/diceware/default.nix b/nixpkgs/pkgs/tools/security/diceware/default.nix index dcd7e853564a..f32d63cfc10d 100644 --- a/nixpkgs/pkgs/tools/security/diceware/default.nix +++ b/nixpkgs/pkgs/tools/security/diceware/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { meta = with lib; { description = "Generates passphrases by concatenating words randomly picked from wordlists"; - homepage = https://github.com/ulif/diceware; + homepage = "https://github.com/ulif/diceware"; license = licenses.gpl3; maintainers = with maintainers; [ asymmetric ]; }; diff --git a/nixpkgs/pkgs/tools/security/ecdsatool/default.nix b/nixpkgs/pkgs/tools/security/ecdsatool/default.nix index 0e57a5bab884..524f38982cc4 100644 --- a/nixpkgs/pkgs/tools/security/ecdsatool/default.nix +++ b/nixpkgs/pkgs/tools/security/ecdsatool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Create and manipulate ECC NISTP256 keypairs."; - homepage = https://github.com/kaniini/ecdsatool/; + homepage = "https://github.com/kaniini/ecdsatool/"; license = with licenses; [free]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/security/ecdsautils/default.nix b/nixpkgs/pkgs/tools/security/ecdsautils/default.nix index 13280e3226d9..f5ead317f4ec 100644 --- a/nixpkgs/pkgs/tools/security/ecdsautils/default.nix +++ b/nixpkgs/pkgs/tools/security/ecdsautils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; - homepage = https://github.com/tcatm/ecdsautils/; + homepage = "https://github.com/tcatm/ecdsautils/"; license = with licenses; [ mit bsd2 ]; maintainers = with maintainers; [ andir ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/eid-mw/default.nix b/nixpkgs/pkgs/tools/security/eid-mw/default.nix index 13ab56aaa9a2..cad5bb244f99 100644 --- a/nixpkgs/pkgs/tools/security/eid-mw/default.nix +++ b/nixpkgs/pkgs/tools/security/eid-mw/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; - homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; + homepage = "http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/"; license = licenses.lgpl3; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. diff --git a/nixpkgs/pkgs/tools/security/enchive/default.nix b/nixpkgs/pkgs/tools/security/enchive/default.nix index 7e45ab76ed0b..3c7d3144d3b2 100644 --- a/nixpkgs/pkgs/tools/security/enchive/default.nix +++ b/nixpkgs/pkgs/tools/security/enchive/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted personal archives"; - homepage = https://github.com/skeeto/enchive; + homepage = "https://github.com/skeeto/enchive"; license = stdenv.lib.licenses.unlicense; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/nixpkgs/pkgs/tools/security/encryptr/default.nix b/nixpkgs/pkgs/tools/security/encryptr/default.nix index 01855ee3e5b4..b4c2bef2cf40 100644 --- a/nixpkgs/pkgs/tools/security/encryptr/default.nix +++ b/nixpkgs/pkgs/tools/security/encryptr/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://spideroak.com/solutions/encryptr; + homepage = "https://spideroak.com/solutions/encryptr"; description = "Free, private and secure password management tool and e-wallet"; license = licenses.unfree; maintainers = with maintainers; [ guillaumekoenig ]; diff --git a/nixpkgs/pkgs/tools/security/enpass/default.nix b/nixpkgs/pkgs/tools/security/enpass/default.nix index 6e61f0541225..370282d02d06 100644 --- a/nixpkgs/pkgs/tools/security/enpass/default.nix +++ b/nixpkgs/pkgs/tools/security/enpass/default.nix @@ -14,7 +14,7 @@ let data = all_data.${system_map.${stdenv.hostPlatform.system} or (throw "Unsupported platform")}; - baseUrl = http://repo.sinew.in; + baseUrl = "http://repo.sinew.in"; # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ @@ -51,7 +51,7 @@ let meta = { description = "a well known password manager"; - homepage = https://www.enpass.io/; + homepage = "https://www.enpass.io/"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux"]; }; diff --git a/nixpkgs/pkgs/tools/security/fail2ban/default.nix b/nixpkgs/pkgs/tools/security/fail2ban/default.nix index 39017d09886e..6377e829aa65 100644 --- a/nixpkgs/pkgs/tools/security/fail2ban/default.nix +++ b/nixpkgs/pkgs/tools/security/fail2ban/default.nix @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://www.fail2ban.org/; + homepage = "https://www.fail2ban.org/"; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lovek323 fpletz ]; diff --git a/nixpkgs/pkgs/tools/security/fcrackzip/default.nix b/nixpkgs/pkgs/tools/security/fcrackzip/default.nix index d923e81ae826..15510f7b7096 100644 --- a/nixpkgs/pkgs/tools/security/fcrackzip/default.nix +++ b/nixpkgs/pkgs/tools/security/fcrackzip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "zip password cracker, similar to fzc, zipcrack and others"; - homepage = http://oldhome.schmorp.de/marc/fcrackzip.html; + homepage = "http://oldhome.schmorp.de/marc/fcrackzip.html"; license = licenses.gpl2; maintainers = with maintainers; [ nico202 ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/security/fpm2/default.nix b/nixpkgs/pkgs/tools/security/fpm2/default.nix index b6669358f7f9..3d082523f6fa 100644 --- a/nixpkgs/pkgs/tools/security/fpm2/default.nix +++ b/nixpkgs/pkgs/tools/security/fpm2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; - homepage = https://als.regnet.cz/fpm2/; + homepage = "https://als.regnet.cz/fpm2/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ hce ]; diff --git a/nixpkgs/pkgs/tools/security/fprintd/default.nix b/nixpkgs/pkgs/tools/security/fprintd/default.nix index 41a00306f695..b119a6ed29ff 100644 --- a/nixpkgs/pkgs/tools/security/fprintd/default.nix +++ b/nixpkgs/pkgs/tools/security/fprintd/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://fprint.freedesktop.org/; + homepage = "https://fprint.freedesktop.org/"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/fprot/default.nix b/nixpkgs/pkgs/tools/security/fprot/default.nix index 3fff99a6ce10..12b47694db3c 100644 --- a/nixpkgs/pkgs/tools/security/fprot/default.nix +++ b/nixpkgs/pkgs/tools/security/fprot/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "6.2.1"; src = fetchurl { - url = http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz; + url = "http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz"; sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5"; }; @@ -33,10 +33,10 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.f-prot.com; + homepage = "http://www.f-prot.com"; description = "A popular proprietary antivirus program"; license = licenses.unfree; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/tools/security/fwknop/default.nix b/nixpkgs/pkgs/tools/security/fwknop/default.nix index a9f69c8b96e1..0f1c37aa7975 100644 --- a/nixpkgs/pkgs/tools/security/fwknop/default.nix +++ b/nixpkgs/pkgs/tools/security/fwknop/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { fwknop stands for the "FireWall KNock OPerator", and implements an authorization scheme called Single Packet Authorization (SPA). ''; - homepage = https://www.cipherdyne.org/fwknop/; + homepage = "https://www.cipherdyne.org/fwknop/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix b/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix index 89900d27bd27..15b8820bfd55 100644 --- a/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix +++ b/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${path} ''; meta = with stdenv.lib; { - homepage = https://github.com/mcepl/gen-oath-safe; + homepage = "https://github.com/mcepl/gen-oath-safe"; description = "Script for generating HOTP/TOTP keys (and QR code)"; platforms = platforms.unix; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/security/gencfsm/default.nix b/nixpkgs/pkgs/tools/security/gencfsm/default.nix index 63d1bab89d7f..e56c9e20fd43 100644 --- a/nixpkgs/pkgs/tools/security/gencfsm/default.nix +++ b/nixpkgs/pkgs/tools/security/gencfsm/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libertyzero.com/GEncfsM/; - downloadPage = https://launchpad.net/gencfsm/; + homepage = "http://www.libertyzero.com/GEncfsM/"; + downloadPage = "https://launchpad.net/gencfsm/"; description = "EncFS manager and mounter with GNOME3 integration"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/ghidra/default.nix b/nixpkgs/pkgs/tools/security/ghidra/default.nix index b3773725e6e9..d31e1f2c2758 100644 --- a/nixpkgs/pkgs/tools/security/ghidra/default.nix +++ b/nixpkgs/pkgs/tools/security/ghidra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, lib, makeWrapper, autoPatchelfHook +{ stdenv, fetchzip, lib, makeWrapper, autoPatchelfHook , openjdk11, pam, makeDesktopItem, icoutils }: let @@ -16,23 +16,22 @@ in stdenv.mkDerivation { - name = "ghidra-9.1"; + name = "ghidra-9.1.2"; - src = fetchurl { - url = https://ghidra-sre.org/ghidra_9.1_PUBLIC_20191023.zip; - sha256 = "0pl7s59008gvgwz4mxp7rz3xr3vaa12a6s5zvx2yr9jxx3gk1l99"; + src = fetchzip { + url = "https://ghidra-sre.org/ghidra_9.1.2_PUBLIC_20200212.zip"; + sha256 = "0j48pijypg44bw06azbrgfqjkigb13ljfdxib70sxwyqia3vkbbm"; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook - unzip + icoutils ]; buildInputs = [ stdenv.cc.cc.lib pam - icoutils ]; dontStrip = true; @@ -42,7 +41,7 @@ in stdenv.mkDerivation { mkdir -p "${pkg_path}" "$out/share/applications" cp -a * "${pkg_path}" ln -s ${desktopItem}/share/applications/* $out/share/applications - + icotool -x "${pkg_path}/support/ghidra.ico" rm ghidra_4_40x40x32.png for f in ghidra_*.png; do diff --git a/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix b/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix index a559039d95ac..c2f6da9812f7 100644 --- a/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix +++ b/nixpkgs/pkgs/tools/security/gnome-keysign/default.nix @@ -82,9 +82,9 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK/GNOME application to use GnuPG for signing other peoples’ keys"; - homepage = https://wiki.gnome.org/Apps/Keysign; + homepage = "https://wiki.gnome.org/Apps/Keysign"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix b/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix index 940a5b9a0535..de5234961d25 100644 --- a/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnulib ]; meta = with lib; { - homepage = https://www.gnu.org/software/gnu-pw-mgr/; + homepage = "https://www.gnu.org/software/gnu-pw-mgr/"; description = "A password manager designed to make it easy to reconstruct difficult passwords"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index bc7cff99dc23..4d6b97c7192e 100644 --- a/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gnupg-pkcs11 is a project to implement a BSD-licensed smart-card daemon to enable the use of PKCS#11 tokens with GnuPG. ''; - homepage = http://gnupg-pkcs11.sourceforge.net/; + homepage = "http://gnupg-pkcs11.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ lschuermann philandstuff ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/gnupg/1.nix b/nixpkgs/pkgs/tools/security/gnupg/1.nix index 3b916378bf52..20ecd7c92fb2 100644 --- a/nixpkgs/pkgs/tools/security/gnupg/1.nix +++ b/nixpkgs/pkgs/tools/security/gnupg/1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://gnupg.org; + homepage = "https://gnupg.org"; description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; longDescription = '' diff --git a/nixpkgs/pkgs/tools/security/gnupg/20.nix b/nixpkgs/pkgs/tools/security/gnupg/20.nix index ef348e388342..ea9001607526 100644 --- a/nixpkgs/pkgs/tools/security/gnupg/20.nix +++ b/nixpkgs/pkgs/tools/security/gnupg/20.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://gnupg.org; + homepage = "https://gnupg.org"; description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; longDescription = '' diff --git a/nixpkgs/pkgs/tools/security/gnupg/22.nix b/nixpkgs/pkgs/tools/security/gnupg/22.nix index 1d10b50ce6f5..86339b34b03e 100644 --- a/nixpkgs/pkgs/tools/security/gnupg/22.nix +++ b/nixpkgs/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.19"; + version = "2.2.20"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "1h6yx6sdpz3lf9gdppgxqcf73baynr8gflmh43286fkgw3058994"; + sha256 = "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gnupg.org; + homepage = "https://gnupg.org"; description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; longDescription = '' diff --git a/nixpkgs/pkgs/tools/security/gobuster/default.nix b/nixpkgs/pkgs/tools/security/gobuster/default.nix index c9348b2f23aa..c3426bee965b 100644 --- a/nixpkgs/pkgs/tools/security/gobuster/default.nix +++ b/nixpkgs/pkgs/tools/security/gobuster/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv -, Security +, lib }: buildGoModule rec { @@ -17,9 +16,7 @@ buildGoModule rec { modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; homepage = "https://github.com/OJ/gobuster"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/security/gopass/default.nix b/nixpkgs/pkgs/tools/security/gopass/default.nix index 41a0d6eb7a5a..8af24bf7ab52 100644 --- a/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -38,7 +38,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; - homepage = https://www.gopass.pw/; + homepage = "https://www.gopass.pw/"; license = licenses.mit; maintainers = with maintainers; [ andir ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix b/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix index 1ba650f5af75..975976c6a3c1 100644 --- a/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix +++ b/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Password Gorilla is a Tk based password manager"; - homepage = https://github.com/zdia/gorilla/wiki; + homepage = "https://github.com/zdia/gorilla/wiki"; maintainers = [ stdenv.lib.maintainers.namore ]; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/security/gpgstats/default.nix b/nixpkgs/pkgs/tools/security/gpgstats/default.nix index c3a14f62c766..80153b857c4f 100644 --- a/nixpkgs/pkgs/tools/security/gpgstats/default.nix +++ b/nixpkgs/pkgs/tools/security/gpgstats/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { longDescription = '' GPGstats calculates statistics on the keys in your key-ring. ''; - homepage = http://www.vanheusden.com/gpgstats/; + homepage = "http://www.vanheusden.com/gpgstats/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/haka/default.nix b/nixpkgs/pkgs/tools/security/haka/default.nix index bfac54d2d860..9468ee2843bd 100644 --- a/nixpkgs/pkgs/tools/security/haka/default.nix +++ b/nixpkgs/pkgs/tools/security/haka/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files"; - homepage = http://www.haka-security.org/; + homepage = "http://www.haka-security.org/"; license = stdenv.lib.licenses.mpl20; maintainers = [ stdenv.lib.maintainers.tvestelind ]; platforms = [ "x86_64-linux" "i686-linux" ]; # fails on aarch64 diff --git a/nixpkgs/pkgs/tools/security/hash_extender/default.nix b/nixpkgs/pkgs/tools/security/hash_extender/default.nix index 30ba2fb30872..6efa780e1cd3 100644 --- a/nixpkgs/pkgs/tools/security/hash_extender/default.nix +++ b/nixpkgs/pkgs/tools/security/hash_extender/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to automate hash length extension attacks"; - homepage = https://github.com/iagox86/hash_extender; + homepage = "https://github.com/iagox86/hash_extender"; license = licenses.bsd3; maintainers = with maintainers; [ geistesk ]; }; diff --git a/nixpkgs/pkgs/tools/security/hashcash/default.nix b/nixpkgs/pkgs/tools/security/hashcash/default.nix index a28822ecd951..bb8fba33e1d4 100644 --- a/nixpkgs/pkgs/tools/security/hashcash/default.nix +++ b/nixpkgs/pkgs/tools/security/hashcash/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Proof-of-work algorithm used as spam and denial-of-service counter measure"; - homepage = http://hashcash.org; + homepage = "http://hashcash.org"; license = licenses.gpl2; maintainers = with maintainers; [ kisonecat ]; }; diff --git a/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix b/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix index 50508cfc4941..7dcfff038a8d 100644 --- a/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix +++ b/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small utilities that are useful in advanced password cracking"; - homepage = https://github.com/hashcat/hashcat-utils; + homepage = "https://github.com/hashcat/hashcat-utils"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ fadenb ]; diff --git a/nixpkgs/pkgs/tools/security/hashcat/default.nix b/nixpkgs/pkgs/tools/security/hashcat/default.nix index 72a13c0f259e..c1fd84b64527 100644 --- a/nixpkgs/pkgs/tools/security/hashcat/default.nix +++ b/nixpkgs/pkgs/tools/security/hashcat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast password cracker"; - homepage = https://hashcat.net/hashcat/; + homepage = "https://hashcat.net/hashcat/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ kierdavis zimbatm ]; diff --git a/nixpkgs/pkgs/tools/security/haveged/default.nix b/nixpkgs/pkgs/tools/security/haveged/default.nix index c47331f1bcb9..c676a173092d 100644 --- a/nixpkgs/pkgs/tools/security/haveged/default.nix +++ b/nixpkgs/pkgs/tools/security/haveged/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { of haveged is directed towards improving overall reliability and adaptability while minimizing the barriers to using haveged for other tasks. ''; - homepage = http://www.issihosts.com/haveged/; + homepage = "http://www.issihosts.com/haveged/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.domenkozar ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix b/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix new file mode 100644 index 000000000000..f1c2cee9f3a6 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + pname = "hxcdumptool"; + version = "6.0.5"; + + src = fetchFromGitHub { + owner = "ZerBea"; + repo = "hcxdumptool"; + rev = version; + sha256 = "0rh19lblz8wp8q2x123nlwvxq1pjq9zw12w18z83v2l2knjbc524"; + }; + + buildInputs = [ openssl ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ZerBea/hcxdumptool"; + description = "Small tool to capture packets from wlan devices"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ danielfullmer ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/hcxtools/default.nix b/nixpkgs/pkgs/tools/security/hcxtools/default.nix index 8e70e0def41c..84517ce2bd8b 100644 --- a/nixpkgs/pkgs/tools/security/hcxtools/default.nix +++ b/nixpkgs/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "5.3.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "1pqvxncpcnwxs89imma01ry30bz7cjifm8wz1s80yclkxxf80php"; + sha256 = "0r7pjz89chgb7zl2pqgw3zb1z8cgwp0nxmqvmkv0jn1m9dw3f44f"; }; buildInputs = [ curl openssl zlib ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for capturing wlan traffic and conversion to hashcat and John the Ripper formats"; - homepage = https://github.com/ZerBea/hcxtools; + homepage = "https://github.com/ZerBea/hcxtools"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ dywedir ]; diff --git a/nixpkgs/pkgs/tools/security/hologram/default.nix b/nixpkgs/pkgs/tools/security/hologram/default.nix index e6c375599a92..910bcc522e7f 100644 --- a/nixpkgs/pkgs/tools/security/hologram/default.nix +++ b/nixpkgs/pkgs/tools/security/hologram/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/AdRoll/hologram/; + homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops."; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix b/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix index e2e01fbb921c..5e1d460a4634 100644 --- a/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IBM's Software TPM 2.0, an implementation of the TCG TPM 2.0 specification"; - homepage = https://sourceforge.net/projects/ibmswtpm2/; + homepage = "https://sourceforge.net/projects/ibmswtpm2/"; platforms = platforms.linux; maintainers = with maintainers; [ delroth ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/security/ifdnfc/default.nix b/nixpkgs/pkgs/tools/security/ifdnfc/default.nix index 5ec66a5b98cc..bab6527f4153 100644 --- a/nixpkgs/pkgs/tools/security/ifdnfc/default.nix +++ b/nixpkgs/pkgs/tools/security/ifdnfc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { Supports the pn533 smart-card reader chip which is for example used in the SCM SCL3711. ''; - homepage = https://github.com/nfc-tools/ifdnfc; + homepage = "https://github.com/nfc-tools/ifdnfc"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ makefu ]; diff --git a/nixpkgs/pkgs/tools/security/john/default.nix b/nixpkgs/pkgs/tools/security/john/default.nix index 17e02e736dc4..f47728b8ba2a 100644 --- a/nixpkgs/pkgs/tools/security/john/default.nix +++ b/nixpkgs/pkgs/tools/security/john/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "John the Ripper password cracker"; license = licenses.gpl2; - homepage = https://github.com/magnumripper/JohnTheRipper/; + homepage = "https://github.com/magnumripper/JohnTheRipper/"; maintainers = with maintainers; [ offline matthewbauer ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/security/keybase/default.nix b/nixpkgs/pkgs/tools/security/keybase/default.nix index 6f2eaf577011..2d8957a9d540 100644 --- a/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -32,7 +32,7 @@ buildGoPackage rec { buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { - homepage = https://www.keybase.io/; + homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service."; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ carlsverre np rvolosatovs filalex77 ]; diff --git a/nixpkgs/pkgs/tools/security/keybase/gui.nix b/nixpkgs/pkgs/tools/security/keybase/gui.nix index 0a5855b20605..9c34d78aee8e 100644 --- a/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/nixpkgs/pkgs/tools/security/keybase/gui.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.keybase.io/; + homepage = "https://www.keybase.io/"; description = "The Keybase official GUI"; platforms = platforms.linux; maintainers = with maintainers; [ rvolosatovs puffnfresh np filalex77 ]; diff --git a/nixpkgs/pkgs/tools/security/knockknock/default.nix b/nixpkgs/pkgs/tools/security/knockknock/default.nix index ce7663b18cf9..9478bb4ca237 100644 --- a/nixpkgs/pkgs/tools/security/knockknock/default.nix +++ b/nixpkgs/pkgs/tools/security/knockknock/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, python2Packages, hping }: - -python2Packages.buildPythonApplication rec { +let rev = "bf14bbff"; - name = "knockknock-r${rev}"; +in python2Packages.buildPythonApplication rec { + pname = "knockknock-r"; + version = rev; src = fetchFromGitHub { inherit rev; diff --git a/nixpkgs/pkgs/tools/security/kpcli/default.nix b/nixpkgs/pkgs/tools/security/kpcli/default.nix index 9d4c590efa1e..f56bd59cd9af 100644 --- a/nixpkgs/pkgs/tools/security/kpcli/default.nix +++ b/nixpkgs/pkgs/tools/security/kpcli/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Use this program to access and manage your KeePass 1.x or 2.x databases from a Unix-like command line. ''; license = licenses.artistic1; - homepage = http://kpcli.sourceforge.net; + homepage = "http://kpcli.sourceforge.net"; platforms = platforms.all; maintainers = [ maintainers.j-keck ]; }; diff --git a/nixpkgs/pkgs/tools/security/krunner-pass/default.nix b/nixpkgs/pkgs/tools/security/krunner-pass/default.nix index 57174148160d..7904235b86a4 100644 --- a/nixpkgs/pkgs/tools/security/krunner-pass/default.nix +++ b/nixpkgs/pkgs/tools/security/krunner-pass/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch; + url = "https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch"; sha256 = "098dqnal57994p51p2srfzg4lgcd6ybp29h037llr9cdv02hdxvl"; name = "fix_build.patch"; }) @@ -35,7 +35,7 @@ mkDerivation rec { meta = with lib; { description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; - homepage = https://github.com/akermu/krunner-pass; + homepage = "https://github.com/akermu/krunner-pass"; license = licenses.gpl3; maintainers = with maintainers; [ ysndr ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/kwalletcli/default.nix b/nixpkgs/pkgs/tools/security/kwalletcli/default.nix index 9356e2f53f94..d03de5f7cfc2 100644 --- a/nixpkgs/pkgs/tools/security/kwalletcli/default.nix +++ b/nixpkgs/pkgs/tools/security/kwalletcli/default.nix @@ -42,7 +42,7 @@ mkDerivation rec { meta = with lib; { description = "Command-Line Interface to the KDE Wallet"; - homepage = https://www.mirbsd.org/kwalletcli.htm; + homepage = "https://www.mirbsd.org/kwalletcli.htm"; license = licenses.miros; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix b/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix index 76732170079c..0d59c34ee9a3 100644 --- a/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Stateless password manager"; - homepage = https://lesspass.com; + homepage = "https://lesspass.com"; maintainers = with maintainers; [ jasoncarr ]; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/tools/security/libacr38u/default.nix b/nixpkgs/pkgs/tools/security/libacr38u/default.nix index 248fbe008fc7..45d0279099fd 100644 --- a/nixpkgs/pkgs/tools/security/libacr38u/default.nix +++ b/nixpkgs/pkgs/tools/security/libacr38u/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { The package is based on the debian package libacr38u. ''; - homepage = https://www.acs.com.hk; + homepage = "https://www.acs.com.hk"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ berce ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix b/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix index 17861ac2da60..01e9a3847920 100644 --- a/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix +++ b/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { the ModSecurity SecRules format and apply them to HTTP content provided by your application via Connectors. ''; - homepage = https://modsecurity.org/; + homepage = "https://modsecurity.org/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; diff --git a/nixpkgs/pkgs/tools/security/logkeys/default.nix b/nixpkgs/pkgs/tools/security/logkeys/default.nix index f06ce2f246a4..f3ea25d71601 100644 --- a/nixpkgs/pkgs/tools/security/logkeys/default.nix +++ b/nixpkgs/pkgs/tools/security/logkeys/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A GNU/Linux keylogger that works!"; license = licenses.gpl3; - homepage = https://github.com/kernc/logkeys; + homepage = "https://github.com/kernc/logkeys"; maintainers = with maintainers; [mikoim offline]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/security/masscan/default.nix b/nixpkgs/pkgs/tools/security/masscan/default.nix index f6f9e0df655a..297d13ef9f95 100644 --- a/nixpkgs/pkgs/tools/security/masscan/default.nix +++ b/nixpkgs/pkgs/tools/security/masscan/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast scan of the Internet"; - homepage = https://github.com/robertdavidgraham/masscan; + homepage = "https://github.com/robertdavidgraham/masscan"; license = licenses.agpl3; platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/nixpkgs/pkgs/tools/security/mbox/default.nix b/nixpkgs/pkgs/tools/security/mbox/default.nix index 1ef282b8b6eb..7292ac6785f6 100644 --- a/nixpkgs/pkgs/tools/security/mbox/default.nix +++ b/nixpkgs/pkgs/tools/security/mbox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; - homepage = http://pdos.csail.mit.edu/mbox/; + homepage = "http://pdos.csail.mit.edu/mbox/"; maintainers = with maintainers; [ ehmry ]; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/security/meo/default.nix b/nixpkgs/pkgs/tools/security/meo/default.nix index d10c16599643..54b96917623a 100644 --- a/nixpkgs/pkgs/tools/security/meo/default.nix +++ b/nixpkgs/pkgs/tools/security/meo/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "meo-20121113"; src = fetchhg { - url = http://oss.stamfest.net/hg/meo; + url = "http://oss.stamfest.net/hg/meo"; rev = "b48e5f16cff8"; sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only; + homepage = "http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only"; description = "Tools to use cryptography for things like four-eyes principles"; license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 2eaf8aa6c715..17d160c8dcb0 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -362,4 +362,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/security/metasploit/default.nix b/nixpkgs/pkgs/tools/security/metasploit/default.nix index 31d45c30db73..54da89a99b55 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Metasploit Framework - a collection of exploits"; - homepage = https://github.com/rapid7/metasploit-framework/wiki; + homepage = "https://github.com/rapid7/metasploit-framework/wiki"; platforms = platforms.unix; license = licenses.bsd3; maintainers = [ maintainers.makefu ]; diff --git a/nixpkgs/pkgs/tools/security/mfcuk/default.nix b/nixpkgs/pkgs/tools/security/mfcuk/default.nix index a23e29175615..59908f2a9ce5 100644 --- a/nixpkgs/pkgs/tools/security/mfcuk/default.nix +++ b/nixpkgs/pkgs/tools/security/mfcuk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MiFare Classic Universal toolKit"; license = licenses.gpl2; - homepage = https://github.com/nfc-tools/mfcuk; + homepage = "https://github.com/nfc-tools/mfcuk"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/security/mfoc/default.nix b/nixpkgs/pkgs/tools/security/mfoc/default.nix index 1ae18e343537..fb622ad82496 100644 --- a/nixpkgs/pkgs/tools/security/mfoc/default.nix +++ b/nixpkgs/pkgs/tools/security/mfoc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mifare Classic Offline Cracker"; license = licenses.gpl2; - homepage = https://github.com/nfc-tools/mfoc; + homepage = "https://github.com/nfc-tools/mfoc"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/security/minisign/default.nix b/nixpkgs/pkgs/tools/security/minisign/default.nix index 15ee2446922b..ed226994a31e 100644 --- a/nixpkgs/pkgs/tools/security/minisign/default.nix +++ b/nixpkgs/pkgs/tools/security/minisign/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { necessarily private) file transfer, e.g., of software artefacts. minisign is similar to and compatible with OpenBSD's signify. ''; - homepage = https://jedisct1.github.io/minisign/; + homepage = "https://jedisct1.github.io/minisign/"; license = licenses.isc; maintainers = with maintainers; [ joachifm ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/mkp224o/default.nix b/nixpkgs/pkgs/tools/security/mkp224o/default.nix index 7585fdf22e1a..5640debf124a 100644 --- a/nixpkgs/pkgs/tools/security/mkp224o/default.nix +++ b/nixpkgs/pkgs/tools/security/mkp224o/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Vanity address generator for tor onion v3 (ed25519) hidden services"; - homepage = http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/; + homepage = "http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/"; license = licenses.cc0; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; diff --git a/nixpkgs/pkgs/tools/security/mkpasswd/default.nix b/nixpkgs/pkgs/tools/security/mkpasswd/default.nix index 3d30fef02e29..b88852966ee1 100644 --- a/nixpkgs/pkgs/tools/security/mkpasswd/default.nix +++ b/nixpkgs/pkgs/tools/security/mkpasswd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = "make install-mkpasswd"; meta = with stdenv.lib; { - homepage = https://packages.qa.debian.org/w/whois.html; + homepage = "https://packages.qa.debian.org/w/whois.html"; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; maintainers = with maintainers; [ cstrahan fpletz ]; diff --git a/nixpkgs/pkgs/tools/security/mkrand/default.nix b/nixpkgs/pkgs/tools/security/mkrand/default.nix index bb9c932d19e3..54934b7111a9 100644 --- a/nixpkgs/pkgs/tools/security/mkrand/default.nix +++ b/nixpkgs/pkgs/tools/security/mkrand/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A Digital Random Bit Generator"; longDescription = "MKRAND is a utility for generating random information."; - homepage = https://github.com/mknight-tag/MKRAND/; + homepage = "https://github.com/mknight-tag/MKRAND/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/tools/security/mktemp/default.nix b/nixpkgs/pkgs/tools/security/mktemp/default.nix index 71bdd3af55de..0732adecc45b 100644 --- a/nixpkgs/pkgs/tools/security/mktemp/default.nix +++ b/nixpkgs/pkgs/tools/security/mktemp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz; + url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz"; sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f"; }; meta = with stdenv.lib; { description = "Simple tool to make temporary file handling in shells scripts safe and simple"; - homepage = https://www.mktemp.org; + homepage = "https://www.mktemp.org"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/security/modsecurity/default.nix b/nixpkgs/pkgs/tools/security/modsecurity/default.nix index 2a9e41ac0fa9..b9b696c17be6 100644 --- a/nixpkgs/pkgs/tools/security/modsecurity/default.nix +++ b/nixpkgs/pkgs/tools/security/modsecurity/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source, cross-platform web application firewall (WAF)"; license = licenses.asl20; - homepage = https://www.modsecurity.org/; + homepage = "https://www.modsecurity.org/"; maintainers = with maintainers; [offline]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/nixpkgs/pkgs/tools/security/monkeysphere/default.nix b/nixpkgs/pkgs/tools/security/monkeysphere/default.nix index 1e585136d887..4b1f75698871 100644 --- a/nixpkgs/pkgs/tools/security/monkeysphere/default.nix +++ b/nixpkgs/pkgs/tools/security/monkeysphere/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://web.monkeysphere.info/; + homepage = "http://web.monkeysphere.info/"; description = "Leverage the OpenPGP web of trust for SSH and TLS authentication"; longDescription = '' The Monkeysphere project's goal is to extend OpenPGP's web of diff --git a/nixpkgs/pkgs/tools/security/mpw/default.nix b/nixpkgs/pkgs/tools/security/mpw/default.nix index 4cff17ef8495..9d25daf29a69 100644 --- a/nixpkgs/pkgs/tools/security/mpw/default.nix +++ b/nixpkgs/pkgs/tools/security/mpw/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A stateless password management solution"; - homepage = https://masterpasswordapp.com/; + homepage = "https://masterpasswordapp.com/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/security/nasty/default.nix b/nixpkgs/pkgs/tools/security/nasty/default.nix index d45861cf50e1..7f423860100b 100644 --- a/nixpkgs/pkgs/tools/security/nasty/default.nix +++ b/nixpkgs/pkgs/tools/security/nasty/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { in case you forget or lost it. It is mostly a proof-of-concept: with a different implementation this program could be at least 100x faster. ''; - homepage = http://www.vanheusden.com/nasty/; + homepage = "http://www.vanheusden.com/nasty/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/neopg/default.nix b/nixpkgs/pkgs/tools/security/neopg/default.nix index c58772346eea..4f4f660e20f4 100644 --- a/nixpkgs/pkgs/tools/security/neopg/default.nix +++ b/nixpkgs/pkgs/tools/security/neopg/default.nix @@ -7,7 +7,7 @@ , curl , gettext , pkgconfig -, libusb +, libusb1 , gnutls }: stdenv.mkDerivation rec { @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake gettext pkgconfig ]; - buildInputs = [ cmake sqlite botan2 boost curl gettext libusb gnutls ]; + buildInputs = [ sqlite botan2 boost curl libusb1 gnutls ]; doCheck = true; checkTarget = "test"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://neopg.io/; + homepage = "https://neopg.io/"; description = "Modern replacement for GnuPG 2"; license = licenses.gpl3; longDescription = '' diff --git a/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix b/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix index 48df486ef0a4..a4936d763b6c 100644 --- a/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix +++ b/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { access the extra functionality of a Nitrokey Storage or Nitrokey Pro. See https://www.nitrokey.com/ for more information. ''; - homepage = https://github.com/Nitrokey/nitrokey-app; - repositories.git = https://github.com/Nitrokey/nitrokey-app.git; + homepage = "https://github.com/Nitrokey/nitrokey-app"; + repositories.git = "https://github.com/Nitrokey/nitrokey-app.git"; license = licenses.gpl3; maintainers = with maintainers; [ kaiha fpletz ]; }; diff --git a/nixpkgs/pkgs/tools/security/nmap/default.nix b/nixpkgs/pkgs/tools/security/nmap/default.nix index f88c533d71d3..bd543154494c 100644 --- a/nixpkgs/pkgs/tools/security/nmap/default.nix +++ b/nixpkgs/pkgs/tools/security/nmap/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = { description = "A free and open source utility for network discovery and security auditing"; - homepage = http://www.nmap.org; + homepage = "http://www.nmap.org"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice fpletz ]; diff --git a/nixpkgs/pkgs/tools/security/notary/default.nix b/nixpkgs/pkgs/tools/security/notary/default.nix index d1e2ee58e483..4f0b5f2c9548 100644 --- a/nixpkgs/pkgs/tools/security/notary/default.nix +++ b/nixpkgs/pkgs/tools/security/notary/default.nix @@ -58,7 +58,7 @@ buildGoPackage rec { integrity of the received content. ''; license = licenses.asl20; - homepage = https://github.com/theupdateframework/notary; + homepage = "https://github.com/theupdateframework/notary"; maintainers = with maintainers; [ vdemeester ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/security/nsjail/default.nix b/nixpkgs/pkgs/tools/security/nsjail/default.nix index f1335a1ad1d7..27712e4d42f5 100644 --- a/nixpkgs/pkgs/tools/security/nsjail/default.nix +++ b/nixpkgs/pkgs/tools/security/nsjail/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; - homepage = http://nsjail.com/; + homepage = "http://nsjail.com/"; license = licenses.asl20; maintainers = with maintainers; [ bosu c0bw3b ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/nwipe/default.nix b/nixpkgs/pkgs/tools/security/nwipe/default.nix index b2ead19a2011..c72ada867614 100644 --- a/nixpkgs/pkgs/tools/security/nwipe/default.nix +++ b/nixpkgs/pkgs/tools/security/nwipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: stdenv.mkDerivation rec { - version = "0.27"; + version = "0.28"; pname = "nwipe"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; rev = "v${version}"; - sha256 = "1rfqv5nxb20g7rfcmqaxwkbz5v294ak0kfsndncx3m4m1791fw04"; + sha256 = "1aw905lmn1vm6klqn3q7445dwmwbjhcmwnkygpq9rddacgig1gdx"; }; nativeBuildInputs = [ automake autoconf pkgconfig ]; buildInputs = [ ncurses parted ]; diff --git a/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix index d462101e92ea..22327c6a38f0 100644 --- a/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix +++ b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Components for building one-time password authentication systems"; - homepage = https://www.nongnu.org/oath-toolkit/; + homepage = "https://www.nongnu.org/oath-toolkit/"; platforms = with platforms; linux ++ darwin; }; } diff --git a/nixpkgs/pkgs/tools/security/omapd/default.nix b/nixpkgs/pkgs/tools/security/omapd/default.nix index baea02402d9f..8ed23864ced5 100644 --- a/nixpkgs/pkgs/tools/security/omapd/default.nix +++ b/nixpkgs/pkgs/tools/security/omapd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/omapd/; + homepage = "https://code.google.com/archive/p/omapd/"; description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; license = licenses.gpl3; maintainers = [ maintainers.tstrobel ]; diff --git a/nixpkgs/pkgs/tools/security/onesixtyone/default.nix b/nixpkgs/pkgs/tools/security/onesixtyone/default.nix new file mode 100644 index 000000000000..4eed52b07f0e --- /dev/null +++ b/nixpkgs/pkgs/tools/security/onesixtyone/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "onesixtyone"; + version = "unstable-2019-12-26"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "onesixtyone"; + rev = "9ce1dcdad73d45c8694086a4f90d7713be1cbdd7"; + sha256 = "111nxn4pcbx6p9j8cjjxv1j1s7dgf7f4dix8acsmahwbpzinzkg3"; + }; + + buildPhase = '' + $CC -o onesixtyone onesixtyone.c + ''; + + installPhase = '' + install -D onesixtyone $out/bin/onesixtyone + ''; + + meta = with stdenv.lib; { + description = "Fast SNMP Scanner"; + homepage = "https://github.com/trailofbits/onesixtyone"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.fishi0x01 ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/security/onioncircuits/default.nix b/nixpkgs/pkgs/tools/security/onioncircuits/default.nix index 5a9f10127481..0eb0f7b401ee 100644 --- a/nixpkgs/pkgs/tools/security/onioncircuits/default.nix +++ b/nixpkgs/pkgs/tools/security/onioncircuits/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://tails.boum.org; + homepage = "https://tails.boum.org"; description = "GTK application to display Tor circuits and streams"; license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; diff --git a/nixpkgs/pkgs/tools/security/open-ecard/default.nix b/nixpkgs/pkgs/tools/security/open-ecard/default.nix index 98f2e56e7497..bac036e67900 100644 --- a/nixpkgs/pkgs/tools/security/open-ecard/default.nix +++ b/nixpkgs/pkgs/tools/security/open-ecard/default.nix @@ -13,7 +13,7 @@ let sha256 = "0rc862lx3y6sw87r1v5xjmqqpysyr1x6yqhycqmcdrwz0j3wykrr"; }; logo = fetchurl { - url = https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg; + url = "https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg"; sha256 = "0rpmyv10vjx2yfpm03mqliygcww8af2wnrnrppmsazdplksaxkhs"; }; }; @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client side implementation of the eCard-API-Framework (BSI TR-03112) and related international standards, such as ISO/IEC 24727"; - homepage = https://www.openecard.org/; + homepage = "https://www.openecard.org/"; license = licenses.gpl3; maintainers = with maintainers; [ sephalon ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/opencryptoki/default.nix b/nixpkgs/pkgs/tools/security/opencryptoki/default.nix index 1d506928a52a..1eb4aab66b47 100644 --- a/nixpkgs/pkgs/tools/security/opencryptoki/default.nix +++ b/nixpkgs/pkgs/tools/security/opencryptoki/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PKCS#11 implementation for Linux"; - homepage = https://github.com/opencryptoki/opencryptoki; + homepage = "https://github.com/opencryptoki/opencryptoki"; license = licenses.cpl10; maintainers = [ maintainers.tstrobel ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/opensc/default.nix b/nixpkgs/pkgs/tools/security/opensc/default.nix index 315cd1c8c285..103345abf61b 100644 --- a/nixpkgs/pkgs/tools/security/opensc/default.nix +++ b/nixpkgs/pkgs/tools/security/opensc/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of libraries and utilities to access smart cards"; - homepage = https://github.com/OpenSC/OpenSC/wiki; + homepage = "https://github.com/OpenSC/OpenSC/wiki"; license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = [ maintainers.erictapen ]; diff --git a/nixpkgs/pkgs/tools/security/ossec/default.nix b/nixpkgs/pkgs/tools/security/ossec/default.nix index 2b52099e70b3..285e275a81f7 100644 --- a/nixpkgs/pkgs/tools/security/ossec/default.nix +++ b/nixpkgs/pkgs/tools/security/ossec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ossec-client-2.6"; src = fetchurl { - url = https://www.ossec.net/files/ossec-hids-2.6.tar.gz; + url = "https://www.ossec.net/files/ossec-hids-2.6.tar.gz"; sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; }; @@ -32,7 +32,7 @@ yes meta = { description = "Open source host-based instrusion detection system"; - homepage = https://www.ossec.net; + homepage = "https://www.ossec.net"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/security/pamtester/default.nix b/nixpkgs/pkgs/tools/security/pamtester/default.nix index 21f58ef517ee..a1055dadc6ca 100644 --- a/nixpkgs/pkgs/tools/security/pamtester/default.nix +++ b/nixpkgs/pkgs/tools/security/pamtester/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility program to test the PAM facility"; - homepage = http://pamtester.sourceforge.net/; + homepage = "http://pamtester.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/security/pass/default.nix b/nixpkgs/pkgs/tools/security/pass/default.nix index 54a8f4de7d7b..46dfafa81519 100644 --- a/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/nixpkgs/pkgs/tools/security/pass/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchurl, buildEnv , coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps -, qrencode , makeWrapper +, qrencode , makeWrapper, pass, symlinkJoin , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin @@ -23,131 +23,136 @@ let env = extensions: let - selected = extensions passExtensions + selected = [ pass ] ++ extensions passExtensions ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb; in buildEnv { name = "pass-extensions-env"; paths = selected; - buildInputs = concatMap (x: x.buildInputs) selected; - }; - - generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { - version = "1.7.3"; - pname = "password-store"; + buildInputs = [ makeWrapper ] ++ concatMap (x: x.buildInputs) selected; - src = fetchurl { - url = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz"; - sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"; - }; + postBuild = '' + files=$(find $out/bin/ -type f -exec readlink -f {} \;) + rm $out/bin + mkdir $out/bin - patches = [ ./set-correct-program-name-for-sleep.patch ] - ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch - # TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next - # version bump. - ++ stdenv.lib.optional waylandSupport ./clip-wayland-support.patch; + for i in $files; do + ln -sf $i $out/bin/$(basename $i) + done - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ extensionsEnv ]; + wrapProgram $out/bin/pass \ + --set SYSTEM_EXTENSION_DIR "$out/lib/password-store/extensions" + ''; + }; +in - installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; +stdenv.mkDerivation rec { + version = "1.7.3"; + pname = "password-store"; - postInstall = '' - # Install Emacs Mode. NOTE: We can't install the necessary - # dependencies (s.el and f.el) here. The user has to do this - # himself. - mkdir -p "$out/share/emacs/site-lisp" - cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + optionalString x11Support '' - cp "contrib/dmenu/passmenu" "$out/bin/" - ''; + src = fetchurl { + url = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz"; + sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"; + }; - wrapperPath = with stdenv.lib; makeBinPath ([ - coreutils - getopt - git - gnupg - gnused - tree - which - qrencode - procps - ] ++ optional stdenv.isDarwin openssl - ++ ifEnable x11Support [ dmenu xclip xdotool ] - ++ optional waylandSupport wl-clipboard); - - postFixup = '' - # Link extensions env - rmdir $out/lib/password-store/extensions - ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/. - for f in ${extensionsEnv}/share/man/man1/*.1.gz; do - ln -s $f $out/share/man/man1/ - done - - # Fix program name in --help - substituteInPlace $out/bin/pass \ - --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass" - - # Ensure all dependencies are in PATH - wrapProgram $out/bin/pass \ - --prefix PATH : "${wrapperPath}" - '' + stdenv.lib.optionalString x11Support '' - # We just wrap passmenu with the same PATH as pass. It doesn't - # need all the tools in there but it doesn't hurt either. - wrapProgram $out/bin/passmenu \ - --prefix PATH : "$out/bin:${wrapperPath}" - ''; + patches = [ + ./set-correct-program-name-for-sleep.patch + ./extension-dir.patch + ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch + # TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next + # version bump. + ++ stdenv.lib.optional waylandSupport ./clip-wayland-support.patch; + + nativeBuildInputs = [ makeWrapper ]; + + installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; + + postInstall = '' + # Install Emacs Mode. NOTE: We can't install the necessary + # dependencies (s.el and f.el) here. The user has to do this + # himself. + mkdir -p "$out/share/emacs/site-lisp" + cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" + '' + optionalString x11Support '' + cp "contrib/dmenu/passmenu" "$out/bin/" + ''; + + wrapperPath = with stdenv.lib; makeBinPath ([ + coreutils + getopt + git + gnupg + gnused + tree + which + qrencode + procps + ] ++ optional stdenv.isDarwin openssl + ++ ifEnable x11Support [ dmenu xclip xdotool ] + ++ optional waylandSupport wl-clipboard); + + postFixup = '' + # Fix program name in --help + substituteInPlace $out/bin/pass \ + --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass" + + # Ensure all dependencies are in PATH + wrapProgram $out/bin/pass \ + --prefix PATH : "${wrapperPath}" + '' + stdenv.lib.optionalString x11Support '' + # We just wrap passmenu with the same PATH as pass. It doesn't + # need all the tools in there but it doesn't hurt either. + wrapProgram $out/bin/passmenu \ + --prefix PATH : "$out/bin:${wrapperPath}" + ''; + + # Turn "check" into "installcheck", since we want to test our pass, + # not the one before the fixup. + postPatch = '' + patchShebangs tests + + substituteInPlace src/password-store.sh \ + --replace "@out@" "$out" + + # the turning + sed -i -e 's@^PASS=.*''$@PASS=$out/bin/pass@' \ + -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ + -e '/which gpg/ d' \ + tests/setup.sh + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # 'pass edit' uses hdid, which is not available from the sandbox. + rm -f tests/t0200-edit-tests.sh + rm -f tests/t0010-generate-tests.sh + rm -f tests/t0020-show-tests.sh + rm -f tests/t0050-mv-tests.sh + rm -f tests/t0100-insert-tests.sh + rm -f tests/t0300-reencryption.sh + rm -f tests/t0400-grep.sh + ''; + + doCheck = false; + + doInstallCheck = true; + installCheckInputs = [ git ]; + installCheckTarget = "test"; + + passthru = { + extensions = passExtensions; + withExtensions = env; + }; - # Turn "check" into "installcheck", since we want to test our pass, - # not the one before the fixup. - postPatch = '' - patchShebangs tests - - # the turning - sed -i -e 's@^PASS=.*''$@PASS=$out/bin/pass@' \ - -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ - -e '/which gpg/ d' \ - tests/setup.sh - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # 'pass edit' uses hdid, which is not available from the sandbox. - rm -f tests/t0200-edit-tests.sh - rm -f tests/t0010-generate-tests.sh - rm -f tests/t0020-show-tests.sh - rm -f tests/t0050-mv-tests.sh - rm -f tests/t0100-insert-tests.sh - rm -f tests/t0300-reencryption.sh - rm -f tests/t0400-grep.sh + meta = with stdenv.lib; { + description = "Stores, retrieves, generates, and synchronizes passwords securely"; + homepage = "https://www.passwordstore.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ma27 ]; + platforms = platforms.unix; + + longDescription = '' + pass is a very simple password store that keeps passwords inside gpg2 + encrypted files inside a simple directory tree residing at + ~/.password-store. The pass utility provides a series of commands for + manipulating the password store, allowing the user to add, remove, edit, + synchronize, generate, and manipulate passwords. ''; - - doCheck = false; - - doInstallCheck = true; - installCheckInputs = [ git ]; - installCheckTarget = "test"; - - passthru = { - extensions = passExtensions; - } // extraPassthru; - - meta = with stdenv.lib; { - description = "Stores, retrieves, generates, and synchronizes passwords securely"; - homepage = https://www.passwordstore.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ]; - platforms = platforms.unix; - - longDescription = '' - pass is a very simple password store that keeps passwords inside gpg2 - encrypted files inside a simple directory tree residing at - ~/.password-store. The pass utility provides a series of commands for - manipulating the password store, allowing the user to add, remove, edit, - synchronize, generate, and manipulate passwords. - ''; - }; }; - -in - -generic (env (_: [])) { - withExtensions = extensions: generic (env extensions) {}; } diff --git a/nixpkgs/pkgs/tools/security/pass/extension-dir.patch b/nixpkgs/pkgs/tools/security/pass/extension-dir.patch new file mode 100644 index 000000000000..028da31c4617 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/pass/extension-dir.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile b/Makefile +index eac2291..1b1df0a 100644 +--- a/Makefile ++++ b/Makefile +@@ -46,12 +46,12 @@ install: install-common + @install -v -d "$(DESTDIR)$(LIBDIR)/password-store" && install -m 0644 -v "$(PLATFORMFILE)" "$(DESTDIR)$(LIBDIR)/password-store/platform.sh" + @install -v -d "$(DESTDIR)$(LIBDIR)/password-store/extensions" + @install -v -d "$(DESTDIR)$(BINDIR)/" +- @trap 'rm -f src/.pass' EXIT; sed 's:.*PLATFORM_FUNCTION_FILE.*:source "$(LIBDIR)/password-store/platform.sh":;s:^SYSTEM_EXTENSION_DIR=.*:SYSTEM_EXTENSION_DIR="$(LIBDIR)/password-store/extensions":' src/password-store.sh > src/.pass && \ ++ @trap 'rm -f src/.pass' EXIT; sed 's:.*PLATFORM_FUNCTION_FILE.*:source "$(LIBDIR)/password-store/platform.sh":;' src/password-store.sh > src/.pass && \ + install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v src/.pass "$(DESTDIR)$(BINDIR)/pass" + else + install: install-common + @install -v -d "$(DESTDIR)$(LIBDIR)/password-store/extensions" +- @trap 'rm -f src/.pass' EXIT; sed '/PLATFORM_FUNCTION_FILE/d;s:^SYSTEM_EXTENSION_DIR=.*:SYSTEM_EXTENSION_DIR="$(LIBDIR)/password-store/extensions":' src/password-store.sh > src/.pass && \ ++ @trap 'rm -f src/.pass' EXIT; sed '/PLATFORM_FUNCTION_FILE/d;' src/password-store.sh > src/.pass && \ + install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v src/.pass "$(DESTDIR)$(BINDIR)/pass" + endif + +diff --git a/src/password-store.sh b/src/password-store.sh +index 68551a4..2f3b5b7 100755 +--- a/src/password-store.sh ++++ b/src/password-store.sh +@@ -656,7 +656,7 @@ cmd_extension_or_show() { + fi + } + +-SYSTEM_EXTENSION_DIR="" ++SYSTEM_EXTENSION_DIR="${SYSTEM_EXTENSION_DIR:-@out@/lib/password-store/extensions}" + cmd_extension() { + check_sneaky_paths "$1" + local user_extension system_extension extension diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/audit.nix b/nixpkgs/pkgs/tools/security/pass/extensions/audit.nix deleted file mode 100644 index ca5ca855337f..000000000000 --- a/nixpkgs/pkgs/tools/security/pass/extensions/audit.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }: - -let - pythonEnv = pythonPackages.python.withPackages (p: [ p.requests ]); - -in stdenv.mkDerivation rec { - pname = "pass-audit"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "roddhjav"; - repo = "pass-audit"; - rev = "v${version}"; - sha256 = "0v0db8bzpcaa7zqz17syn3c78mgvw4mpg8qg1gh5rmbjsjfxw6sm"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ pythonEnv ]; - - patchPhase = '' - sed -i -e "s|/usr/lib|$out/lib|" audit.bash - sed -i -e 's|$0|${pass}/bin/pass|' audit.bash - ''; - - dontBuild = true; - - installFlags = [ "PREFIX=$(out)" ]; - - postFixup = '' - wrapProgram $out/lib/password-store/extensions/audit.bash \ - --prefix PATH : "${pythonEnv}/bin" \ - --run "export PREFIX" - ''; - - meta = with stdenv.lib; { - description = "Pass extension for auditing your password repository."; - homepage = https://github.com/roddhjav/pass-audit; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch b/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch new file mode 100644 index 000000000000..36faf3140ccd --- /dev/null +++ b/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch @@ -0,0 +1,175 @@ +From 37c2b4d2940476555aeec20fe1e5e3fa0492a94e Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 15 Mar 2020 19:58:53 +0100 +Subject: [PATCH] Make it possible to run the tests offline + +Helpful when developing without network access, also makes sure that +the test actually depend on the API's data like number of breaches +(which will change in time). +--- + tests/commons.py | 25 +++++++++++++++++++++++++ + tests/test_audit.py | 8 +++++--- + tests/test_pass_audit.py | 10 +++++++++- + tests/test_pwned.py | 8 +++++--- + 4 files changed, 44 insertions(+), 7 deletions(-) + +diff --git a/tests/commons.py b/tests/commons.py +index 13c4cb1..4f1ecd8 100644 +--- a/tests/commons.py ++++ b/tests/commons.py +@@ -56,3 +56,28 @@ class TestPass(TestBase): + for path in self.store.list(root): + data[path] = self.store.show(path) + return data ++ ++ ++def mock_request(*args, **kwargs): ++ class MockResponse: ++ def __init__(self): ++ data = [ ++ "D5EE0CB1A41071812CCED2F1930E6E1A5D2:2", ++ "2DC183F740EE76F27B78EB39C8AD972A757:52579", ++ "CF164D7A51A1FD864B1BF9E1CE8A3EC171B:4", ++ "D0B910E7A3028703C0B30039795E908CEB2:7", ++ "AD6438836DBE526AA231ABDE2D0EEF74D42:3", ++ "EBAB0A7CE978E0194608B572E4F9404AA21:3", ++ "17727EAB0E800E62A776C76381DEFBC4145:120", ++ "5370372AC65308F03F6ED75EC6068C8E1BE:1386", ++ "1E4C9B93F3F0682250B6CF8331B7EE68FD8:3730471", ++ "437FAA5A7FCE15D1DDCB9EAEAEA377667B8:123422", ++ "944C22589AC652B0F47918D58CA0CDCCB63:411" ++ ] ++ ++ self.text = "\r\n".join(data) ++ ++ def raise_for_status(self): ++ pass ++ ++ return MockResponse() +diff --git a/tests/test_audit.py b/tests/test_audit.py +index d8c7a9a..5e0a9cf 100644 +--- a/tests/test_audit.py ++++ b/tests/test_audit.py +@@ -17,12 +17,13 @@ + # + + from .. import pass_audit +-from tests.commons import TestPass +- ++from tests.commons import TestPass, mock_request ++from unittest import mock + + class TestPassAudit(TestPass): + passwords_nb = 7 + ++ @mock.patch('requests.get', mock_request) + def test_password_notpwned(self): + """Testing: pass audit for password not breached with K-anonymity method.""" + data = self._getdata("Password/notpwned") +@@ -30,9 +31,10 @@ class TestPassAudit(TestPass): + breached = audit.password() + self.assertTrue(len(breached) == 0) + ++ @mock.patch('requests.get', mock_request) + def test_password_pwned(self): + """Testing: pass audit for password breached with K-anonymity method.""" +- ref_counts = [51259, 3, 114, 1352, 3645804, 78773, 396] ++ ref_counts = [52579, 3, 120, 1386, 3730471, 123422, 411] + data = self._getdata("Password/pwned") + audit = pass_audit.PassAudit(data) + breached = audit.password() +diff --git a/tests/test_pass_audit.py b/tests/test_pass_audit.py +index 4c10f87..2c949f7 100644 +--- a/tests/test_pass_audit.py ++++ b/tests/test_pass_audit.py +@@ -19,7 +19,8 @@ + import os + + from .. import pass_audit +-from tests.commons import TestPass ++from tests.commons import TestPass, mock_request ++from unittest import mock + + + class TestPassAuditCMD(TestPass): +@@ -47,6 +48,7 @@ class TestPassAuditCMD(TestPass): + cmd = ['--not-an-option', '-q'] + self._passaudit(cmd, 2) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_StoreNotInitialized(self): + """Testing: store not initialized.""" + cmd = ['Password/', '-v'] +@@ -56,6 +58,7 @@ class TestPassAuditCMD(TestPass): + os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), + os.path.join(self.store.prefix, '.gpg-id')) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_InvalidID(self): + """Testing: invalid user ID.""" + os.rename(os.path.join(self.store.prefix, '.gpg-id'), +@@ -66,26 +69,31 @@ class TestPassAuditCMD(TestPass): + os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), + os.path.join(self.store.prefix, '.gpg-id')) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_NotAFile(self): + """Testing: pass audit not_a_file.""" + cmd = ['not_a_file'] + self._passaudit(cmd, 1) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_passwords_notpwned(self): + """Testing: pass audit Password/notpwned.""" + cmd = ['Password/notpwned'] + self._passaudit(cmd) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_passwords_pwned(self): + """Testing: pass audit Password/pwned.""" + cmd = ['Password/pwned'] + self._passaudit(cmd) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_passwords_good(self): + """Testing: pass audit Password/good.""" + cmd = ['Password/good'] + self._passaudit(cmd) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_passwords_all(self): + """Testing: pass audit .""" + cmd = [''] +diff --git a/tests/test_pwned.py b/tests/test_pwned.py +index 5ce6bc6..c28939a 100644 +--- a/tests/test_pwned.py ++++ b/tests/test_pwned.py +@@ -17,7 +17,8 @@ + # + + from .. import pass_audit +-from tests.commons import TestPass ++from tests.commons import TestPass, mock_request ++from unittest import mock + + + class TestPwnedAPI(TestPass): +@@ -25,12 +26,13 @@ class TestPwnedAPI(TestPass): + def setUp(self): + self.api = pass_audit.PwnedAPI() + ++ @mock.patch('requests.get', mock_request) + def test_password_range(self): + """Testing: https://api.haveibeenpwned.com/range API.""" + prefix = '21BD1' + Hash = '21BD12DC183F740EE76F27B78EB39C8AD972A757' + hashes, counts = self.api.password_range(prefix) + self.assertIn(Hash, hashes) +- self.assertTrue(counts[hashes.index(Hash)] == 51259) ++ self.assertTrue(counts[hashes.index(Hash)] == 52579) + self.assertTrue(len(hashes) == len(counts)) +- self.assertTrue(len(hashes) == 527) ++ self.assertTrue(len(hashes) == 11) +-- +2.25.0 + diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch b/nixpkgs/pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch new file mode 100644 index 000000000000..5703f3c1f652 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch @@ -0,0 +1,28 @@ +From 8f76b32946430737f97f2702afd828b09536afd2 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 15 Mar 2020 20:10:11 +0100 +Subject: [PATCH 2/2] Fix audit.bash setup + +This sets PASSWORD_STORE_DIR (needed by the python-code) to +PASSWORD_STORE_DIR and properly falls back to `~/.password-store` if +it's not set. +--- + audit.bash | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/audit.bash b/audit.bash +index 7a973dc..c40ff76 100755 +--- a/audit.bash ++++ b/audit.bash +@@ -17,7 +17,7 @@ + # + + cmd_audit() { +- export PASSWORD_STORE_DIR=$PREFIX GIT_DIR PASSWORD_STORE_GPG_OPTS ++ export PASSWORD_STORE_DIR=${PASSWORD_STORE_DIR:-$HOME/.password-store} GIT_DIR PASSWORD_STORE_GPG_OPTS + export X_SELECTION CLIP_TIME PASSWORD_STORE_UMASK GENERATED_LENGTH + export CHARACTER_SET CHARACTER_SET_NO_SYMBOLS EXTENSIONS PASSWORD_STORE_KEY + export PASSWORD_STORE_ENABLE_EXTENSIONS PASSWORD_STORE_SIGNING_KEY +-- +2.25.0 + diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix b/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix new file mode 100644 index 000000000000..5f8e0f7b1c60 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix @@ -0,0 +1,51 @@ +{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, gnupg }: + +let + pythonEnv = pythonPackages.python.withPackages (p: [ p.requests p.setuptools p.zxcvbn ]); + +in stdenv.mkDerivation rec { + pname = "pass-audit"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "roddhjav"; + repo = "pass-audit"; + rev = "v${version}"; + sha256 = "1mdckw0dwcnv8smp1za96y0zmdnykbkw2606v7mzfnzbz4zjdlwl"; + }; + + patches = [ + ./0001-Make-it-possible-to-run-the-tests-offline.patch + ./0002-Fix-audit.bash-setup.patch + ]; + + postPatch = '' + substituteInPlace audit.bash \ + --replace '/usr/bin/env python3' "${pythonEnv}/bin/python3" + ''; + + outputs = [ "out" "man" ]; + + buildInputs = [ pythonEnv ]; + nativeBuildInputs = [ makeWrapper ]; + + doCheck = true; + checkInputs = [ pythonPackages.green pass gnupg ]; + checkPhase = '' + ${pythonEnv}/bin/python3 setup.py green -q + ''; + + installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; + postInstall = '' + wrapProgram $out/lib/password-store/extensions/audit.bash \ + --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" + ''; + + meta = with stdenv.lib; { + description = "Pass extension for auditing your password repository."; + homepage = "https://github.com/roddhjav/pass-audit"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/default.nix b/nixpkgs/pkgs/tools/security/pass/extensions/default.nix index 6eb321229e00..1f41a6924821 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/default.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/default.nix @@ -3,7 +3,7 @@ with pkgs; { - pass-audit = callPackage ./audit.nix { + pass-audit = callPackage ./audit { pythonPackages = python3Packages; }; pass-checkup = callPackage ./checkup.nix {}; diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix b/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix index 208012e2f883..48db0094db94 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension that generates memorable passwords"; - homepage = https://github.com/congma/pass-genphrase; + homepage = "https://github.com/congma/pass-genphrase"; license = licenses.gpl3; maintainers = with maintainers; [ seqizz ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/import.nix b/nixpkgs/pkgs/tools/security/pass/extensions/import.nix index 90e3105bbd80..c2fc2cff8815 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/import.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/import.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension for importing data from existing password managers"; - homepage = https://github.com/roddhjav/pass-import; + homepage = "https://github.com/roddhjav/pass-import"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix b/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix index 4b15c3d68035..835e693c2c5c 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pass extension for managing one-time-password (OTP) tokens"; - homepage = https://github.com/tadfisher/pass-otp; + homepage = "https://github.com/tadfisher/pass-otp"; license = licenses.gpl3; maintainers = with maintainers; [ jwiegley tadfisher toonn ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix index ccb558c9b853..f5b61207de66 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension that keeps the password store encrypted inside a tomb"; - homepage = https://github.com/roddhjav/pass-tomb; + homepage = "https://github.com/roddhjav/pass-tomb"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/update.nix b/nixpkgs/pkgs/tools/security/pass/extensions/update.nix index 86563b7ff42d..5bc88d394e75 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/update.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/update.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension that provides an easy flow for updating passwords"; - homepage = https://github.com/roddhjav/pass-update; + homepage = "https://github.com/roddhjav/pass-update"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix b/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix index b188b411517b..7daf42ab6c79 100644 --- a/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix +++ b/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; - homepage = https://github.com/carnager/rofi-pass; + homepage = "https://github.com/carnager/rofi-pass"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/security/passff-host/default.nix b/nixpkgs/pkgs/tools/security/passff-host/default.nix index 59f03db0200d..0bdb04b76129 100644 --- a/nixpkgs/pkgs/tools/security/passff-host/default.nix +++ b/nixpkgs/pkgs/tools/security/passff-host/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Host app for the WebExtension PassFF"; - homepage = https://github.com/passff/passff-host; + homepage = "https://github.com/passff/passff-host"; license = licenses.gpl2; maintainers = with maintainers; [ nadrieril ]; }; diff --git a/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix b/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix index 8aadb685aa8b..cb651ff7ce15 100644 --- a/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, libusb, pcsclite }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }: stdenv.mkDerivation rec { pname = "pcsc-cyberjack"; - version = "3.99.5_SP12"; + version = "3.99.5_SP13"; src = with stdenv.lib; let splittedVer = splitString "_" version; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { tarballVersion = "${mainVer}final${spVer}"; in fetchurl { url = "http://support.reiner-sct.de/downloads/LINUX/V${version}" - + "/pcsc-cyberjack-${tarballVersion}.tar.bz2"; - sha256 = "04pkmybal56s5xnjld09vl1s1h6qf8mvhm41b758d6hi240kgp1j"; + + "/pcsc-cyberjack_${tarballVersion}.tar.gz"; + sha256 = "1lx4bfz4riz7j77sl65akyxzww0ygm63w0c1b75knr1pijlv8d3b"; }; outputs = [ "out" "tools" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb pcsclite ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libusb1 pcsclite ]; configureFlags = [ "--with-usbdropdir=${placeholder "out"}/pcsc/drivers" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "REINER SCT cyberJack USB chipcard reader user space driver"; - homepage = https://www.reiner-sct.com/; + homepage = "https://www.reiner-sct.com/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ aszlig ]; diff --git a/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix b/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix index 0302fc6fc674..b400d628fd77 100644 --- a/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SCM Microsystems SCL011 chipcard reader user space driver"; - homepage = http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630; - downloadPage = https://support.identiv.com/scl010-scl011/; + homepage = "http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630"; + downloadPage = "https://support.identiv.com/scl010-scl011/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ sephalon ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/pcsclite/default.nix b/nixpkgs/pkgs/tools/security/pcsclite/default.nix index 2141f12151fa..4e01a5792dcc 100644 --- a/nixpkgs/pkgs/tools/security/pcsclite/default.nix +++ b/nixpkgs/pkgs/tools/security/pcsclite/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; - homepage = https://pcsclite.apdu.fr/; + homepage = "https://pcsclite.apdu.fr/"; license = licenses.bsd3; platforms = with platforms; unix; }; diff --git a/nixpkgs/pkgs/tools/security/pdfcrack/default.nix b/nixpkgs/pkgs/tools/security/pdfcrack/default.nix index bf8f014bcfd1..9d05304cf2f6 100644 --- a/nixpkgs/pkgs/tools/security/pdfcrack/default.nix +++ b/nixpkgs/pkgs/tools/security/pdfcrack/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://pdfcrack.sourceforge.net/; + homepage = "http://pdfcrack.sourceforge.net/"; description = "Small command line driven tool for recovering passwords and content from PDF files"; license = with licenses; [ gpl2 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/pgpdump/default.nix b/nixpkgs/pkgs/tools/security/pgpdump/default.nix index 8bf440d2b07f..cd421224fa63 100644 --- a/nixpkgs/pkgs/tools/security/pgpdump/default.nix +++ b/nixpkgs/pkgs/tools/security/pgpdump/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pgpdump is a PGP packet visualizer which displays the packet format of OpenPGP (RFC 4880) and PGP version 2 (RFC 1991). ''; - homepage = http://www.mew.org/~kazu/proj/pgpdump/en/; + homepage = "http://www.mew.org/~kazu/proj/pgpdump/en/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/tools/security/pinentry/default.nix b/nixpkgs/pkgs/tools/security/pinentry/default.nix index 87edc914131d..e6d07888d1dd 100644 --- a/nixpkgs/pkgs/tools/security/pinentry/default.nix +++ b/nixpkgs/pkgs/tools/security/pinentry/default.nix @@ -90,7 +90,7 @@ pinentryMkDerivation rec { passthru = { flavors = enabledFlavors; }; meta = with stdenv.lib; { - homepage = http://gnupg.org/aegypten2/; + homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG’s interface to passphrase input"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/security/pinentry/mac.nix b/nixpkgs/pkgs/tools/security/pinentry/mac.nix index 25fa180c48b9..1c3b87cd9f02 100644 --- a/nixpkgs/pkgs/tools/security/pinentry/mac.nix +++ b/nixpkgs/pkgs/tools/security/pinentry/mac.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Pinentry for GPG on Mac"; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://github.com/GPGTools/pinentry-mac; + homepage = "https://github.com/GPGTools/pinentry-mac"; platforms = stdenv.lib.platforms.darwin; }; } diff --git a/nixpkgs/pkgs/tools/security/pius/default.nix b/nixpkgs/pkgs/tools/security/pius/default.nix index 6d2b5569a0d4..f1b4d80a3554 100644 --- a/nixpkgs/pkgs/tools/security/pius/default.nix +++ b/nixpkgs/pkgs/tools/security/pius/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication { buildInputs = [ perl ]; meta = { - homepage = https://www.phildev.net/pius/; + homepage = "https://www.phildev.net/pius/"; description = "PGP Individual UID Signer (PIUS), quickly and easily sign UIDs on a set of PGP keys"; diff --git a/nixpkgs/pkgs/tools/security/prey/default.nix b/nixpkgs/pkgs/tools/security/prey/default.nix index 2c03183fa96e..c66756012311 100644 --- a/nixpkgs/pkgs/tools/security/prey/default.nix +++ b/nixpkgs/pkgs/tools/security/prey/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://preyproject.com; + homepage = "https://preyproject.com"; description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/security/proxmark3/default.nix b/nixpkgs/pkgs/tools/security/proxmark3/default.nix index e717558a24da..304ba041b46d 100644 --- a/nixpkgs/pkgs/tools/security/proxmark3/default.nix +++ b/nixpkgs/pkgs/tools/security/proxmark3/default.nix @@ -35,7 +35,7 @@ let meta = with stdenv.lib; { description = "Client for proxmark3, powerful general purpose RFID tool"; - homepage = http://www.proxmark.org; + homepage = "http://www.proxmark.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz ]; }; diff --git a/nixpkgs/pkgs/tools/security/pwgen/default.nix b/nixpkgs/pkgs/tools/security/pwgen/default.nix index 79e8fb071b37..a63e40b744e8 100644 --- a/nixpkgs/pkgs/tools/security/pwgen/default.nix +++ b/nixpkgs/pkgs/tools/security/pwgen/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "pwgen-2.08"; src = fetchurl { - url = https://github.com/tytso/pwgen/archive/v2.08.tar.gz; + url = "https://github.com/tytso/pwgen/archive/v2.08.tar.gz"; sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; }; diff --git a/nixpkgs/pkgs/tools/security/pyrit/default.nix b/nixpkgs/pkgs/tools/security/pyrit/default.nix new file mode 100644 index 000000000000..93ae86416e13 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/pyrit/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }: + +let + version = "2019-12-13"; + src = fetchFromGitHub { + owner = "JPaulMora"; + repo = "Pyrit"; + rev = "f0f1913c645b445dd391fb047b812b5ba511782c"; + sha256 = "1npkvngc4g3g6mpjip2wwhvcd4a75jy3dbddxhxhzrrz4p7259gr"; + }; + + cpyrit_opencl = python2Packages.buildPythonPackage { + pname = "cpyrit-opencl"; + inherit version; + + src = "${src}/modules/cpyrit_opencl"; + + buildInputs = [ opencl-headers ocl-icd openssl zlib ]; + + postInstall = let + python = python2Packages.python; + in '' + # pyrit uses "import _cpyrit_cuda" so put the output in the root site-packages + mv $out/lib/${python.libPrefix}/site-packages/cpyrit/_cpyrit_opencl.so $out/lib/${python.libPrefix}/site-packages/ + ''; + }; +in +python2Packages.buildPythonApplication rec { + pname = "pyrit"; + inherit version src; + + buildInputs = [ openssl zlib libpcap ]; + propagatedBuildInputs = [ cpyrit_opencl ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/JPaulMora/Pyrit"; + description = "GPGPU-driven WPA/WPA2-PSK key cracker"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ danielfullmer ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/radamsa/default.nix b/nixpkgs/pkgs/tools/security/radamsa/default.nix index 7a78233dbced..b1d6400f2d0d 100644 --- a/nixpkgs/pkgs/tools/security/radamsa/default.nix +++ b/nixpkgs/pkgs/tools/security/radamsa/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "A general purpose fuzzer"; longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; - homepage = https://gitlab.com/akihe/radamsa; + homepage = "https://gitlab.com/akihe/radamsa"; maintainers = [ stdenv.lib.maintainers.markWot ]; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/tools/security/rarcrack/default.nix b/nixpkgs/pkgs/tools/security/rarcrack/default.nix index 68e5df809377..9749d8251688 100644 --- a/nixpkgs/pkgs/tools/security/rarcrack/default.nix +++ b/nixpkgs/pkgs/tools/security/rarcrack/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { This program uses bruteforce algorithm to find correct password. You can specify wich characters will be used in password generations. Warning: Please don't use this program for any illegal things! ''; - homepage = https://github.com/jaredsburrows/Rarcrack; + homepage = "https://github.com/jaredsburrows/Rarcrack"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/security/ripasso/cursive.nix b/nixpkgs/pkgs/tools/security/ripasso/cursive.nix index 70c4ee864b64..c8a55d3f397f 100644 --- a/nixpkgs/pkgs/tools/security/ripasso/cursive.nix +++ b/nixpkgs/pkgs/tools/security/ripasso/cursive.nix @@ -16,9 +16,9 @@ buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gpgme python3 ]; buildInputs = [ - ncurses python3 openssl libgpgerror gpgme xorg.libxcb + ncurses openssl libgpgerror gpgme xorg.libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; preFixup = '' diff --git a/nixpkgs/pkgs/tools/security/rng-tools/default.nix b/nixpkgs/pkgs/tools/security/rng-tools/default.nix index bd289200fe80..16952e6dabb4 100644 --- a/nixpkgs/pkgs/tools/security/rng-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/rng-tools/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { description = "A random number generator daemon"; - homepage = https://github.com/nhorman/rng-tools; + homepage = "https://github.com/nhorman/rng-tools"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ johnazoidberg c0bw3b ]; diff --git a/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 811b95d25245..4373abdb9a4b 100644 --- a/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, libobjc, Foundation, IOKit }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "saml2aws"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "15zxi64s1hgpm3rxk0m7z5363jc7h80g91bfx8vg7nw680lday4w"; + sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc"; }; - modSha256 = "0qxf2i06spjig3ynixh3xmbxpghh222jhfqcg71i4i79x4ycp5wx"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Foundation IOKit ]; + modSha256 = "1kcj5065yy52p1jy4fad5lsz3y4spqc40k1qsirm53qqixhrhvag"; subPackages = [ "." "cmd/saml2aws" ]; diff --git a/nixpkgs/pkgs/tools/security/sbsigntool/default.nix b/nixpkgs/pkgs/tools/security/sbsigntool/default.nix index e0e2896f6ffc..1a42ddf8beca 100644 --- a/nixpkgs/pkgs/tools/security/sbsigntool/default.nix +++ b/nixpkgs/pkgs/tools/security/sbsigntool/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tools for maintaining UEFI signature databases"; - homepage = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases; + homepage = "http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases"; maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; # Broken on i686 license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/security/scallion/default.nix b/nixpkgs/pkgs/tools/security/scallion/default.nix index e419232641b6..1395b8e10617 100644 --- a/nixpkgs/pkgs/tools/security/scallion/default.nix +++ b/nixpkgs/pkgs/tools/security/scallion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl, ocl-icd }: +{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl_1_0_2, ocl-icd }: stdenv.mkDerivation rec { version = "2.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share cp scallion/bin/Debug/* $out/share/ makeWrapper ${mono}/bin/mono $out/bin/scallion \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ocl-icd ]} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \ --add-flags $out/share/scallion.exe ''; diff --git a/nixpkgs/pkgs/tools/security/scrypt/default.nix b/nixpkgs/pkgs/tools/security/scrypt/default.nix index 66313b536499..018bc44b1443 100644 --- a/nixpkgs/pkgs/tools/security/scrypt/default.nix +++ b/nixpkgs/pkgs/tools/security/scrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Encryption utility"; - homepage = https://www.tarsnap.com/scrypt.html; + homepage = "https://www.tarsnap.com/scrypt.html"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/nixpkgs/pkgs/tools/security/seccure/default.nix b/nixpkgs/pkgs/tools/security/seccure/default.nix index 686ef36f863c..e0f01f4f2c41 100644 --- a/nixpkgs/pkgs/tools/security/seccure/default.nix +++ b/nixpkgs/pkgs/tools/security/seccure/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://point-at-infinity.org/seccure/; + homepage = "http://point-at-infinity.org/seccure/"; description = "Zero-configuration elliptic curve cryptography utility"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl3; diff --git a/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/nixpkgs/pkgs/tools/security/secp256k1/default.nix index 7189032454d6..b5e92a354541 100644 --- a/nixpkgs/pkgs/tools/security/secp256k1/default.nix +++ b/nixpkgs/pkgs/tools/security/secp256k1/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { Bitcoin Core. This library is a work in progress and is being used to research best practices. Use at your own risk. ''; - homepage = https://github.com/bitcoin-core/secp256k1; + homepage = "https://github.com/bitcoin-core/secp256k1"; license = with licenses; [ mit ]; maintainers = with maintainers; [ chris-martin ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/security/sedutil/default.nix b/nixpkgs/pkgs/tools/security/sedutil/default.nix index 9edd9745326e..4877a8adfcef 100644 --- a/nixpkgs/pkgs/tools/security/sedutil/default.nix +++ b/nixpkgs/pkgs/tools/security/sedutil/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DTA sedutil Self encrypting drive software"; - homepage = https://www.drivetrust.com; + homepage = "https://www.drivetrust.com"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/security/sequoia/default.nix b/nixpkgs/pkgs/tools/security/sequoia/default.nix index fe0b13bbb973..e6081fbf472d 100644 --- a/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - sha256 = "1l6isis0ddb0b306z3cv2f5qz2bhw5pmf42shnrxzg7778dnmwhw"; + sha256 = "0iwzi2ylrwz56s77cd4vcf89ig6ipy4w6kp2pfwqvd2d00x54dhk"; }; - cargoSha256 = "0cfi42wx93yc9yib9lpxl6ph991ra39yfhw1lr16z2qzzbzj2b1j"; + cargoSha256 = "0jsmvs6hr9mhapz3a74wpfgkjkq3w10014j3z30bm659mxqrknha"; nativeBuildInputs = [ pkgconfig @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { llvmPackages.libclang llvmPackages.clang ensureNewerSourcesForZipFilesHook + capnproto ] ++ lib.optionals pythonSupport [ pythonPackages.setuptools ] ; @@ -41,9 +42,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite nettle - capnproto - ] - ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] + ] ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ] ; diff --git a/nixpkgs/pkgs/tools/security/shc/default.nix b/nixpkgs/pkgs/tools/security/shc/default.nix index 18814eb7fa8f..3705d2c7ed1a 100644 --- a/nixpkgs/pkgs/tools/security/shc/default.nix +++ b/nixpkgs/pkgs/tools/security/shc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://neurobin.org/projects/softwares/unix/shc/; + homepage = "https://neurobin.org/projects/softwares/unix/shc/"; description = "Shell Script Compiler"; platforms = stdenv.lib.platforms.linux; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/security/signify/default.nix b/nixpkgs/pkgs/tools/security/signify/default.nix index 22604a3f70ba..3ec260a7c0c5 100644 --- a/nixpkgs/pkgs/tools/security/signify/default.nix +++ b/nixpkgs/pkgs/tools/security/signify/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { OpenBSDs signing tool, which uses the Ed25519 public key signature system for fast signing and verification of messages using small public keys. ''; - homepage = https://www.tedunangst.com/flak/post/signify; + homepage = "https://www.tedunangst.com/flak/post/signify"; license = licenses.isc; maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/signing-party/default.nix b/nixpkgs/pkgs/tools/security/signing-party/default.nix index ea487fed2a1d..91d3ea356df3 100644 --- a/nixpkgs/pkgs/tools/security/signing-party/default.nix +++ b/nixpkgs/pkgs/tools/security/signing-party/default.nix @@ -192,7 +192,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://salsa.debian.org/signing-party-team/signing-party; + homepage = "https://salsa.debian.org/signing-party-team/signing-party"; description = "A collection of several projects relating to OpenPGP"; longDescription = '' This is a collection of several projects relating to OpenPGP. diff --git a/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix b/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix index 16056f9a59e0..2a360b4321c5 100644 --- a/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix +++ b/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' A simple library for using the TPM chip to secure SSH keys. ''; - homepage = https://github.com/ThomasHabets/simple-tpm-pk11; + homepage = "https://github.com/ThomasHabets/simple-tpm-pk11"; license = licenses.asl20; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/sn0int/default.nix b/nixpkgs/pkgs/tools/security/sn0int/default.nix new file mode 100644 index 000000000000..9e9cbe2bb3a5 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/sn0int/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, rustPlatform, + libsodium, libseccomp, sqlite, pkgconfig }: + +rustPlatform.buildRustPackage rec { + pname = "sn0int"; + version = "0.18.2"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0b21b0ryq03zrhqailg2iajirn30l358aj3k44lfnravr4h9zwkj"; + }; + + cargoSha256 = "1pvn0sc325b5fh29m2l6cack4qfssa4lp3zhyb1qzkb3fmw3lgcy"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libsodium libseccomp sqlite ]; + + # One of the dependencies (chrootable-https) tries to read "/etc/resolv.conf" + # in "checkPhase", hence fails in sandbox of "nix". + doCheck = false; + + meta = with lib; { + description = "Semi-automatic OSINT framework and package manager"; + homepage = "https://github.com/kpcyrd/sn0int"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/security/softhsm/default.nix b/nixpkgs/pkgs/tools/security/softhsm/default.nix index 94642700c336..5cc7dbac5da5 100644 --- a/nixpkgs/pkgs/tools/security/softhsm/default.nix +++ b/nixpkgs/pkgs/tools/security/softhsm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/var"; meta = with stdenv.lib; { - homepage = https://www.opendnssec.org/softhsm; + homepage = "https://www.opendnssec.org/softhsm"; description = "Cryptographic store accessible through a PKCS #11 interface"; license = licenses.bsd2; maintainers = [ maintainers.leenaars ]; diff --git a/nixpkgs/pkgs/tools/security/sops/default.nix b/nixpkgs/pkgs/tools/security/sops/default.nix index d028b9787dba..8aa2e219e7df 100644 --- a/nixpkgs/pkgs/tools/security/sops/default.nix +++ b/nixpkgs/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "sops"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - meta = with stdenv.lib; { homepage = "https://github.com/mozilla/sops"; description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; diff --git a/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix b/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix index 656efbf390cb..4d58095c43b1 100644 --- a/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Spectre & Meltdown vulnerability/mitigation checker for Linux"; - homepage = https://github.com/speed47/spectre-meltdown-checker; + homepage = "https://github.com/speed47/spectre-meltdown-checker"; license = licenses.gpl3; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/srm/default.nix b/nixpkgs/pkgs/tools/security/srm/default.nix index 9782d00267f5..853ad4f280a2 100644 --- a/nixpkgs/pkgs/tools/security/srm/default.nix +++ b/nixpkgs/pkgs/tools/security/srm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { provide drop in security for users who wish to prevent recovery of deleted information, even if the machine is compromised. ''; - homepage = http://srm.sourceforge.net; + homepage = "http://srm.sourceforge.net"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/sshguard/default.nix b/nixpkgs/pkgs/tools/security/sshguard/default.nix index a196fe9ca47a..bad1c9fd16d5 100644 --- a/nixpkgs/pkgs/tools/security/sshguard/default.nix +++ b/nixpkgs/pkgs/tools/security/sshguard/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { SSHGuard can read log messages from various input sources. Log messages are parsed, line-by-line, for recognized patterns. If an attack, such as several login failures within a few seconds, is detected, the offending IP is blocked. ''; - homepage = https://sshguard.net; + homepage = "https://sshguard.net"; license = licenses.bsd3; maintainers = with maintainers; [ sargon ]; platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd; diff --git a/nixpkgs/pkgs/tools/security/sshuttle/default.nix b/nixpkgs/pkgs/tools/security/sshuttle/default.nix index 0e0e8c7ad753..4d0ae5e051d0 100644 --- a/nixpkgs/pkgs/tools/security/sshuttle/default.nix +++ b/nixpkgs/pkgs/tools/security/sshuttle/default.nix @@ -2,12 +2,12 @@ , coreutils, iptables, nettools, openssh, procps }: python3Packages.buildPythonApplication rec { - name = "sshuttle-${version}"; + pname = "sshuttle"; version = "0.78.5"; - src = fetchurl { + src = python3Packages.fetchPypi { + inherit pname version; sha256 = "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8"; - url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; }; patches = [ ./sudo.patch ]; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/sshuttle/sshuttle/; + homepage = "https://github.com/sshuttle/sshuttle/"; description = "Transparent proxy server that works as a poor man's VPN"; longDescription = '' Forward connections over SSH, without requiring administrator access to the diff --git a/nixpkgs/pkgs/tools/security/sslscan/default.nix b/nixpkgs/pkgs/tools/security/sslscan/default.nix index 15ac376d72a7..68efa7a17d1f 100644 --- a/nixpkgs/pkgs/tools/security/sslscan/default.nix +++ b/nixpkgs/pkgs/tools/security/sslscan/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; - homepage = https://github.com/rbsec/sslscan; + homepage = "https://github.com/rbsec/sslscan"; license = licenses.gpl3; maintainers = with maintainers; [ fpletz globin ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/security/ssss/default.nix b/nixpkgs/pkgs/tools/security/ssss/default.nix index 157e007c534a..bd7de72e6bec 100644 --- a/nixpkgs/pkgs/tools/security/ssss/default.nix +++ b/nixpkgs/pkgs/tools/security/ssss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ssss-0.5"; src = fetchurl { - url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz; + url = "http://point-at-infinity.org/ssss/ssss-0.5.tar.gz"; sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Shamir Secret Sharing Scheme"; - homepage = http://point-at-infinity.org/ssss/; + homepage = "http://point-at-infinity.org/ssss/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; }; diff --git a/nixpkgs/pkgs/tools/security/steghide/default.nix b/nixpkgs/pkgs/tools/security/steghide/default.nix index 7a759c3c3336..5ac40e0a0474 100644 --- a/nixpkgs/pkgs/tools/security/steghide/default.nix +++ b/nixpkgs/pkgs/tools/security/steghide/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://steghide.sourceforge.net/; + homepage = "http://steghide.sourceforge.net/"; description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/step-cli/default.nix b/nixpkgs/pkgs/tools/security/step-cli/default.nix index 0ecd3bc82532..d696b560f6dc 100644 --- a/nixpkgs/pkgs/tools/security/step-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/step-cli/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; - homepage = https://smallstep.com/cli/; + homepage = "https://smallstep.com/cli/"; license = licenses.asl20; maintainers = with maintainers; [ xfix ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/tools/security/stoken/default.nix b/nixpkgs/pkgs/tools/security/stoken/default.nix index d6375bee6495..22dc5e476e7f 100644 --- a/nixpkgs/pkgs/tools/security/stoken/default.nix +++ b/nixpkgs/pkgs/tools/security/stoken/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software Token for Linux/UNIX"; - homepage = https://github.com/cernekee/stoken; + homepage = "https://github.com/cernekee/stoken"; license = licenses.lgpl21Plus; maintainers = [ ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/security/sudo/default.nix b/nixpkgs/pkgs/tools/security/sudo/default.nix index 842509888b41..e05374575d24 100644 --- a/nixpkgs/pkgs/tools/security/sudo/default.nix +++ b/nixpkgs/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.8.31"; + version = "1.8.31p1"; src = fetchurl { - url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz"; - sha256 = "0ks5mm9hda5idivncyfpiz4lrd8fv0dpmsl711788k7f7ixdka3y"; + url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; + sha256 = "1n0mdmgcs92af34xxsnsh1arrngymhdmwd9srjgjbk65q7xzsg67"; }; prePatch = '' @@ -72,9 +72,9 @@ stdenv.mkDerivation rec { providing an audit trail of the commands and their arguments. ''; - homepage = https://www.sudo.ws/; + homepage = "https://www.sudo.ws/"; - license = https://www.sudo.ws/sudo/license.html; + license = "https://www.sudo.ws/sudo/license.html"; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/nixpkgs/pkgs/tools/security/super/default.nix b/nixpkgs/pkgs/tools/security/super/default.nix index 716973a3e2e7..73321fd618e3 100644 --- a/nixpkgs/pkgs/tools/security/super/default.nix +++ b/nixpkgs/pkgs/tools/security/super/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; patches = [ - (fetchpatch { url = https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch; + (fetchpatch { url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; }) ]; diff --git a/nixpkgs/pkgs/tools/security/tboot/default.nix b/nixpkgs/pkgs/tools/security/tboot/default.nix index 062bf40b7d6d..38f467fb441f 100644 --- a/nixpkgs/pkgs/tools/security/tboot/default.nix +++ b/nixpkgs/pkgs/tools/security/tboot/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; - homepage = https://sourceforge.net/projects/tboot/; + homepage = "https://sourceforge.net/projects/tboot/"; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix b/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix index 86a65a060280..a6eb09fd2c5f 100644 --- a/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix +++ b/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://tcpcrypt.org/; + homepage = "http://tcpcrypt.org/"; description = "Fast TCP encryption"; platforms = platforms.all; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/tools/security/tor/default.nix b/nixpkgs/pkgs/tools/security/tor/default.nix index 0ef45bd5337e..215ab63328fc 100644 --- a/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/nixpkgs/pkgs/tools/security/tor/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.torproject.org/"; - repositories.git = https://git.torproject.org/git/tor; + repositories.git = "https://git.torproject.org/git/tor"; description = "Anonymizing overlay network"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/security/tor/torsocks.nix b/nixpkgs/pkgs/tools/security/tor/torsocks.nix index 8681d80c2ed3..2ce4c9806eb3 100644 --- a/nixpkgs/pkgs/tools/security/tor/torsocks.nix +++ b/nixpkgs/pkgs/tools/security/tor/torsocks.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper to safely torify applications"; - homepage = https://github.com/dgoulet/torsocks; - repositories.git = https://git.torproject.org/torsocks.git; + homepage = "https://github.com/dgoulet/torsocks"; + repositories.git = "https://git.torproject.org/torsocks.git"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ]; diff --git a/nixpkgs/pkgs/tools/security/tpm-luks/default.nix b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix index 94d833ca7462..fc1931fa4ba2 100644 --- a/nixpkgs/pkgs/tools/security/tpm-luks/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "LUKS key storage in TPM NVRAM"; - homepage = https://github.com/shpedoikal/tpm-luks/; + homepage = "https://github.com/shpedoikal/tpm-luks/"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix index f7526ac7225d..a652867a0d09 100644 --- a/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { for TPM based attestation using the TPM quote mechanism. The manual page for tpm_quote_tools provides a usage overview. ''; - homepage = http://tpmquotetools.sourceforge.net/; + homepage = "http://tpmquotetools.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/tpm-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm-tools/default.nix index e546cc5a10fb..5e0b4e6d94f4 100644 --- a/nixpkgs/pkgs/tools/security/tpm-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = https://sources.debian.org/data/main/t/tpm-tools/1.3.9.1-0.1/debian/patches/05-openssl1.1_fix_data_mgmt.patch; + url = "https://sources.debian.org/data/main/t/tpm-tools/1.3.9.1-0.1/debian/patches/05-openssl1.1_fix_data_mgmt.patch"; sha256 = "161yysw4wgy3spsz6p1d0ib0h5pnrqm8bdh1l71c4hz6a6wpcyxj"; }) ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { application enablement of Trusted Computing using a Trusted Platform Module (TPM), similar to a smart card environment. ''; - homepage = https://sourceforge.net/projects/trousers/files/tpm-tools/; + homepage = "https://sourceforge.net/projects/trousers/files/tpm-tools/"; license = licenses.cpl10; maintainers = [ maintainers.ak ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix b/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix index 84dafca4e0c4..fbebde2e7bf6 100644 --- a/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "TPM2 resource manager, accessible via D-Bus"; - homepage = https://github.com/tpm2-software/tpm2-tools; + homepage = "https://github.com/tpm2-software/tpm2-tools"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ lschuermann ]; diff --git a/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix index 9600326cd557..06826173e340 100644 --- a/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line tools that provide access to a TPM 2.0 compatible device"; - homepage = https://github.com/tpm2-software/tpm2-tools; + homepage = "https://github.com/tpm2-software/tpm2-tools"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ delroth ]; diff --git a/nixpkgs/pkgs/tools/security/trousers/default.nix b/nixpkgs/pkgs/tools/security/trousers/default.nix index a38c011d7a49..2cc702cf6f2f 100644 --- a/nixpkgs/pkgs/tools/security/trousers/default.nix +++ b/nixpkgs/pkgs/tools/security/trousers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Trusted computing software stack"; - homepage = http://trousers.sourceforge.net/; + homepage = "http://trousers.sourceforge.net/"; license = licenses.bsd3; maintainers = [ maintainers.ak ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 9492f2bb6eac..a02059703664 100644 --- a/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -30,7 +30,7 @@ in doCheck = false; meta = { - homepage = https://github.com/dxa4481/truffleHog; + homepage = "https://github.com/dxa4481/truffleHog"; description = "Searches through git repositories for high entropy strings and secrets, digging deep into commit history"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ bhipple ]; diff --git a/nixpkgs/pkgs/tools/security/vault/default.nix b/nixpkgs/pkgs/tools/security/vault/default.nix index ff4d6f014930..54be477cfe2c 100644 --- a/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1scwclkpb7v5pcx1afgjqrfgcp0c1bd9gqvwdmjbpfcyxv1f032d"; + sha256 = "13ycg9shara4ycbi79wj28z6nimnsqgisbf35ca3q9w066ac0ja2"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index 6e2ab221c42f..6b14a834330d 100644 --- a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.vaultproject.io; + homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ]; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/tools/security/volatility/default.nix b/nixpkgs/pkgs/tools/security/volatility/default.nix index bc8f1ce52c1d..8cf904c39c5f 100644 --- a/nixpkgs/pkgs/tools/security/volatility/default.nix +++ b/nixpkgs/pkgs/tools/security/volatility/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; meta = with stdenv.lib; { - homepage = https://www.volatilityfoundation.org/; + homepage = "https://www.volatilityfoundation.org/"; description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/security/wipe/default.nix b/nixpkgs/pkgs/tools/security/wipe/default.nix index 25c7921d34c8..6b84803d2c46 100644 --- a/nixpkgs/pkgs/tools/security/wipe/default.nix +++ b/nixpkgs/pkgs/tools/security/wipe/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Secure file wiping utility"; - homepage = http://wipe.sourceforge.net/; + homepage = "http://wipe.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock b/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock index 7a29a18b7c33..f3ece99b3656 100644 --- a/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock @@ -56,4 +56,4 @@ DEPENDENCIES wpscan BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/security/yara/default.nix b/nixpkgs/pkgs/tools/security/yara/default.nix index e09e1e694083..a470ad11caff 100644 --- a/nixpkgs/pkgs/tools/security/yara/default.nix +++ b/nixpkgs/pkgs/tools/security/yara/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The pattern matching swiss knife for malware researchers"; - homepage = http://Virustotal.github.io/yara/; + homepage = "http://Virustotal.github.io/yara/"; license = licenses.asl20; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/tools/security/zmap/default.nix b/nixpkgs/pkgs/tools/security/zmap/default.nix index f98b4295e9e6..ef36b21641bc 100644 --- a/nixpkgs/pkgs/tools/security/zmap/default.nix +++ b/nixpkgs/pkgs/tools/security/zmap/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; meta = with stdenv.lib; { - homepage = https://zmap.io/; + homepage = "https://zmap.io/"; license = licenses.asl20; description = "Fast single packet network scanner designed for Internet-wide network surveys"; maintainers = with maintainers; [ ma27 ]; diff --git a/nixpkgs/pkgs/tools/security/zzuf/default.nix b/nixpkgs/pkgs/tools/security/zzuf/default.nix index dc2cfe81746a..5dab990e22f7 100644 --- a/nixpkgs/pkgs/tools/security/zzuf/default.nix +++ b/nixpkgs/pkgs/tools/security/zzuf/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Transparent application input fuzzer."; - homepage = http://caca.zoy.org/wiki/zzuf; + homepage = "http://caca.zoy.org/wiki/zzuf"; license = licenses.wtfpl; platforms = platforms.linux; maintainers = with maintainers; [ lihop ]; diff --git a/nixpkgs/pkgs/tools/system/acct/default.nix b/nixpkgs/pkgs/tools/system/acct/default.nix index 669c91adf10d..dd4eb0d5d2b8 100644 --- a/nixpkgs/pkgs/tools/system/acct/default.nix +++ b/nixpkgs/pkgs/tools/system/acct/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/acct/; + homepage = "https://www.gnu.org/software/acct/"; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/acpica-tools/default.nix b/nixpkgs/pkgs/tools/system/acpica-tools/default.nix index a1c7527c46a4..583bbd2ebd94 100644 --- a/nixpkgs/pkgs/tools/system/acpica-tools/default.nix +++ b/nixpkgs/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "acpica-tools"; - version = "20200110"; + version = "20200326"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1cb6aa6acrixmdzvj9vv4qs9lmlsbkd27pjlz14i1kq1x3xn0gwx"; + sha256 = "1zr2sziiy5jvwgmxpgy2imzsmmb6hlncfd816i7qxrixg2ag7ycr"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/nixpkgs/pkgs/tools/system/actkbd/default.nix b/nixpkgs/pkgs/tools/system/actkbd/default.nix index 501311e96724..706b3700a415 100644 --- a/nixpkgs/pkgs/tools/system/actkbd/default.nix +++ b/nixpkgs/pkgs/tools/system/actkbd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { release events. ''; license = licenses.gpl2; - homepage = http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/; + homepage = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/"; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/system/amtterm/default.nix b/nixpkgs/pkgs/tools/system/amtterm/default.nix index 7e92fc06b2d7..9050111fc17b 100644 --- a/nixpkgs/pkgs/tools/system/amtterm/default.nix +++ b/nixpkgs/pkgs/tools/system/amtterm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Intel AMT® SoL client + tools"; - homepage = https://www.kraxel.org/cgit/amtterm/; + homepage = "https://www.kraxel.org/cgit/amtterm/"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/at/default.nix b/nixpkgs/pkgs/tools/system/at/default.nix index fded1da861d4..278b14cd1999 100644 --- a/nixpkgs/pkgs/tools/system/at/default.nix +++ b/nixpkgs/pkgs/tools/system/at/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = ''The classical Unix `at' job scheduling command''; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://packages.qa.debian.org/at; + homepage = "https://packages.qa.debian.org/at"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/system/augeas/default.nix b/nixpkgs/pkgs/tools/system/augeas/default.nix index 08731cd6db23..338b8f8ac453 100644 --- a/nixpkgs/pkgs/tools/system/augeas/default.nix +++ b/nixpkgs/pkgs/tools/system/augeas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configuration editing tool"; license = licenses.lgpl2; - homepage = http://augeas.net/; + homepage = "http://augeas.net/"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/system/awstats/default.nix b/nixpkgs/pkgs/tools/system/awstats/default.nix index 6d191f33a64d..9da6ac59f3de 100644 --- a/nixpkgs/pkgs/tools/system/awstats/default.nix +++ b/nixpkgs/pkgs/tools/system/awstats/default.nix @@ -54,7 +54,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Real-time logfile analyzer to get advanced statistics"; - homepage = http://awstats.org; + homepage = "http://awstats.org"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/system/bar/default.nix b/nixpkgs/pkgs/tools/system/bar/default.nix index a295da844af2..32945a24bb16 100644 --- a/nixpkgs/pkgs/tools/system/bar/default.nix +++ b/nixpkgs/pkgs/tools/system/bar/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Console progress bar"; - homepage = http://clpbar.sourceforge.net/; + homepage = "http://clpbar.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.rdnetto ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/system/chase/default.nix b/nixpkgs/pkgs/tools/system/chase/default.nix index 6c48d3341ecc..c4396aad9ca6 100644 --- a/nixpkgs/pkgs/tools/system/chase/default.nix +++ b/nixpkgs/pkgs/tools/system/chase/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { longDescription = '' A commandline program that chases symbolic filesystems links to the original file ''; - homepage = https://qa.debian.org/developer.php?login=rotty%40debian.org; + homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org"; license = licenses.gpl2Plus; maintainers = [ maintainers.polyrod ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/system/clinfo/default.nix b/nixpkgs/pkgs/tools/system/clinfo/default.nix index dd6e3d4a84b8..c50bfe4a0d04 100644 --- a/nixpkgs/pkgs/tools/system/clinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/clinfo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print all known information about all available OpenCL platforms and devices in the system"; - homepage = https://github.com/Oblomov/clinfo; + homepage = "https://github.com/Oblomov/clinfo"; license = licenses.cc0; platforms = platforms.linux; maintainers = with maintainers; [ athas ]; diff --git a/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock b/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock index 583fd3b12028..ebbcd0fdb037 100644 --- a/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock +++ b/nixpkgs/pkgs/tools/system/colorls/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES colorls BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/system/colorls/default.nix b/nixpkgs/pkgs/tools/system/colorls/default.nix index 1631b9f72180..4401d841ff61 100644 --- a/nixpkgs/pkgs/tools/system/colorls/default.nix +++ b/nixpkgs/pkgs/tools/system/colorls/default.nix @@ -10,7 +10,7 @@ bundlerApp { meta = with lib; { description = "Prettified LS"; - homepage = https://github.com/athityakumar/colorls; + homepage = "https://github.com/athityakumar/colorls"; license = with licenses; mit; maintainers = with maintainers; [ lukebfox nicknovitski ]; platforms = ruby.meta.platforms; diff --git a/nixpkgs/pkgs/tools/system/consul-template/default.nix b/nixpkgs/pkgs/tools/system/consul-template/default.nix index ad120dd6481e..69d5cd6bb736 100644 --- a/nixpkgs/pkgs/tools/system/consul-template/default.nix +++ b/nixpkgs/pkgs/tools/system/consul-template/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/hashicorp/consul-template/; + homepage = "https://github.com/hashicorp/consul-template/"; description = "Generic template rendering and notifications with Consul"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/tools/system/cron/default.nix b/nixpkgs/pkgs/tools/system/cron/default.nix index aa047ca4a681..9cde31205e1f 100644 --- a/nixpkgs/pkgs/tools/system/cron/default.nix +++ b/nixpkgs/pkgs/tools/system/cron/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "cron-4.1"; src = fetchurl { - url = ftp://ftp.isc.org/isc/cron/cron_4.1.shar; + url = "ftp://ftp.isc.org/isc/cron/cron_4.1.shar"; sha256 = "16n3dras4b1jh7g958nz1k54pl9pg5fwb3fvjln8z67varvq6if4"; }; diff --git a/nixpkgs/pkgs/tools/system/ctop/default.nix b/nixpkgs/pkgs/tools/system/ctop/default.nix index b9ea0c04aa85..4f492def1624 100644 --- a/nixpkgs/pkgs/tools/system/ctop/default.nix +++ b/nixpkgs/pkgs/tools/system/ctop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ctop"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Top-like interface for container metrics"; homepage = "https://ctop.sh/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/system/daemon/default.nix b/nixpkgs/pkgs/tools/system/daemon/default.nix index 76f53b55f3db..fb06247f9843 100644 --- a/nixpkgs/pkgs/tools/system/daemon/default.nix +++ b/nixpkgs/pkgs/tools/system/daemon/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "daemon-0.6.4"; src = fetchurl { - url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz; + url = "http://libslack.org/daemon/download/daemon-0.6.4.tar.gz"; sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/system/daemonize/default.nix b/nixpkgs/pkgs/tools/system/daemonize/default.nix index 205b693dd924..a8685189b61c 100644 --- a/nixpkgs/pkgs/tools/system/daemonize/default.nix +++ b/nixpkgs/pkgs/tools/system/daemonize/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Runs a command as a Unix daemon"; - homepage = http://software.clapper.org/daemonize/; + homepage = "http://software.clapper.org/daemonize/"; license = licenses.bsd3; platforms = with platforms; linux ++ freebsd ++ darwin; }; diff --git a/nixpkgs/pkgs/tools/system/das_watchdog/default.nix b/nixpkgs/pkgs/tools/system/das_watchdog/default.nix index 29767c879ffb..8c1a5657991c 100644 --- a/nixpkgs/pkgs/tools/system/das_watchdog/default.nix +++ b/nixpkgs/pkgs/tools/system/das_watchdog/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/kmatheussen/das_watchdog; + homepage = "https://github.com/kmatheussen/das_watchdog"; description = "A general watchdog for the linux operating system"; longDescription = '' It should run in the background at all times to ensure a realtime process diff --git a/nixpkgs/pkgs/tools/system/datefudge/default.nix b/nixpkgs/pkgs/tools/system/datefudge/default.nix index 63aa563bfa0c..839e14a20d8a 100644 --- a/nixpkgs/pkgs/tools/system/datefudge/default.nix +++ b/nixpkgs/pkgs/tools/system/datefudge/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { different by pre-loading a small library which modifies the time, gettimeofday and clock_gettime system calls. ''; - homepage = https://packages.qa.debian.org/d/datefudge.html; + homepage = "https://packages.qa.debian.org/d/datefudge.html"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/nixpkgs/pkgs/tools/system/dcfldd/default.nix b/nixpkgs/pkgs/tools/system/dcfldd/default.nix index 240cc36f7266..9ea7b485b96b 100644 --- a/nixpkgs/pkgs/tools/system/dcfldd/default.nix +++ b/nixpkgs/pkgs/tools/system/dcfldd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An enhanced version of GNU dd"; - homepage = http://dcfldd.sourceforge.net/; + homepage = "http://dcfldd.sourceforge.net/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/system/ddrescueview/default.nix b/nixpkgs/pkgs/tools/system/ddrescueview/default.nix index 466232e2bf77..838873b7557f 100644 --- a/nixpkgs/pkgs/tools/system/ddrescueview/default.nix +++ b/nixpkgs/pkgs/tools/system/ddrescueview/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to graphically examine ddrescue mapfiles"; - homepage = https://sourceforge.net/projects/ddrescueview/; + homepage = "https://sourceforge.net/projects/ddrescueview/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/nixpkgs/pkgs/tools/system/ddrutility/default.nix b/nixpkgs/pkgs/tools/system/ddrutility/default.nix index 54bf6fbaf42b..bb24076ce7c8 100644 --- a/nixpkgs/pkgs/tools/system/ddrutility/default.nix +++ b/nixpkgs/pkgs/tools/system/ddrutility/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of utilities for hard drive data rescue"; - homepage = https://sourceforge.net/projects/ddrutility/; + homepage = "https://sourceforge.net/projects/ddrutility/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/nixpkgs/pkgs/tools/system/dfc/default.nix b/nixpkgs/pkgs/tools/system/dfc/default.nix index 8575d971898a..415b647befa0 100644 --- a/nixpkgs/pkgs/tools/system/dfc/default.nix +++ b/nixpkgs/pkgs/tools/system/dfc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext ]; meta = { - homepage = https://projects.gw-computing.net/projects/dfc; + homepage = "https://projects.gw-computing.net/projects/dfc"; description = "Displays file system space usage using graphs and colors"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [qknight]; diff --git a/nixpkgs/pkgs/tools/system/di/default.nix b/nixpkgs/pkgs/tools/system/di/default.nix index 3aef366ea066..239544d20a6d 100644 --- a/nixpkgs/pkgs/tools/system/di/default.nix +++ b/nixpkgs/pkgs/tools/system/di/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Disk information utility; displays everything 'df' does and more"; - homepage = https://gentoo.com/di/; + homepage = "https://gentoo.com/di/"; license = licenses.zlib; updateWalker = true; maintainers = with maintainers; [ manveru ]; diff --git a/nixpkgs/pkgs/tools/system/dog/default.nix b/nixpkgs/pkgs/tools/system/dog/default.nix index 8bb84c562b64..5063e3555bb1 100644 --- a/nixpkgs/pkgs/tools/system/dog/default.nix +++ b/nixpkgs/pkgs/tools/system/dog/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://lwn.net/Articles/421072/; + homepage = "http://lwn.net/Articles/421072/"; description = "cat replacement"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight ]; diff --git a/nixpkgs/pkgs/tools/system/efibootmgr/default.nix b/nixpkgs/pkgs/tools/system/efibootmgr/default.nix index a24873248497..3323ac248974 100644 --- a/nixpkgs/pkgs/tools/system/efibootmgr/default.nix +++ b/nixpkgs/pkgs/tools/system/efibootmgr/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; - homepage = https://github.com/rhboot/efibootmgr; + homepage = "https://github.com/rhboot/efibootmgr"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/envconsul/default.nix b/nixpkgs/pkgs/tools/system/envconsul/default.nix index c2f5556cec67..09175f14609f 100644 --- a/nixpkgs/pkgs/tools/system/envconsul/default.nix +++ b/nixpkgs/pkgs/tools/system/envconsul/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/hashicorp/envconsul/; + homepage = "https://github.com/hashicorp/envconsul/"; description = "Read and set environmental variables for processes from Consul"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/tools/system/evemu/default.nix b/nixpkgs/pkgs/tools/system/evemu/default.nix index 1ba2b78e8609..02f92a198909 100644 --- a/nixpkgs/pkgs/tools/system/evemu/default.nix +++ b/nixpkgs/pkgs/tools/system/evemu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # We could have downloaded a release tarball from cgit, but it changes hash # each time it is downloaded :/ src = fetchgit { - url = git://git.freedesktop.org/git/evemu; + url = "git://git.freedesktop.org/git/evemu"; rev = "refs/tags/v${version}"; sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah"; }; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; - homepage = https://www.freedesktop.org/wiki/Evemu/; - repositories.git = git://git.freedesktop.org/git/evemu; + homepage = "https://www.freedesktop.org/wiki/Evemu/"; + repositories.git = "git://git.freedesktop.org/git/evemu"; license = licenses.gpl2; maintainers = [ maintainers.amorsillo ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/facter/default.nix b/nixpkgs/pkgs/tools/system/facter/default.nix index 89c79be2ce3c..d6f7a782824d 100644 --- a/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/nixpkgs/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.8"; + version = "3.14.9"; src = fetchFromGitHub { - sha256 = "1rq28sg1yqyx2xpbhb8hj18ar5pva2rwz7v3ylg8kq112cnlngyh"; + sha256 = "1c8g4fg8c9x816xx3m33njfn9h6ksl8g4rmc20y39v1y9jn72vxk"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/nixpkgs/pkgs/tools/system/fakechroot/default.nix b/nixpkgs/pkgs/tools/system/fakechroot/default.nix index 77ba6689b0d4..fc74644ab032 100644 --- a/nixpkgs/pkgs/tools/system/fakechroot/default.nix +++ b/nixpkgs/pkgs/tools/system/fakechroot/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; meta = with stdenv.lib; { - homepage = https://github.com/dex4er/fakechroot; + homepage = "https://github.com/dex4er/fakechroot"; description = "Give a fake chroot environment through LD_PRELOAD"; license = licenses.lgpl21; maintainers = with maintainers; [offline]; diff --git a/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/nixpkgs/pkgs/tools/system/fakeroot/default.nix index 934b74dd3846..c5765609a278 100644 --- a/nixpkgs/pkgs/tools/system/fakeroot/default.nix +++ b/nixpkgs/pkgs/tools/system/fakeroot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://salsa.debian.org/clint/fakeroot; + homepage = "https://salsa.debian.org/clint/fakeroot"; description = "Give a fake root environment through LD_PRELOAD"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/system/fcron/default.nix b/nixpkgs/pkgs/tools/system/fcron/default.nix index 3dd84aa8a9cc..59daac89bd44 100644 --- a/nixpkgs/pkgs/tools/system/fcron/default.nix +++ b/nixpkgs/pkgs/tools/system/fcron/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description="A command scheduler with extended capabilities over cron and anacron"; - homepage = http://fcron.free.fr; + homepage = "http://fcron.free.fr"; license = licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/tools/system/fdisk/default.nix b/nixpkgs/pkgs/tools/system/fdisk/default.nix index 0aea3ced3b52..423b00bd5439 100644 --- a/nixpkgs/pkgs/tools/system/fdisk/default.nix +++ b/nixpkgs/pkgs/tools/system/fdisk/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/fdisk/; + homepage = "https://www.gnu.org/software/fdisk/"; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock index 8fa9a213ab28..a2a7824f7aa8 100644 --- a/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock +++ b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES foreman BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/system/foreman/default.nix b/nixpkgs/pkgs/tools/system/foreman/default.nix index e97d71f5c84a..ce2f20176290 100644 --- a/nixpkgs/pkgs/tools/system/foreman/default.nix +++ b/nixpkgs/pkgs/tools/system/foreman/default.nix @@ -7,7 +7,7 @@ bundlerEnv { meta = with lib; { description = "Process manager for applications with multiple components"; - homepage = https://github.com/ddollar/foreman; + homepage = "https://github.com/ddollar/foreman"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; platforms = ruby.meta.platforms; diff --git a/nixpkgs/pkgs/tools/system/foremost/default.nix b/nixpkgs/pkgs/tools/system/foremost/default.nix index be33f45ca9dc..96c54513ef1b 100644 --- a/nixpkgs/pkgs/tools/system/foremost/default.nix +++ b/nixpkgs/pkgs/tools/system/foremost/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { look at the data structures of a given file format allowing for a more reliable and faster recovery. ''; - homepage = http://foremost.sourceforge.net/; + homepage = "http://foremost.sourceforge.net/"; license = licenses.publicDomain; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/system/freeipmi/default.nix b/nixpkgs/pkgs/tools/system/freeipmi/default.nix index b057c80c74ec..e51f554ea0fa 100644 --- a/nixpkgs/pkgs/tools/system/freeipmi/default.nix +++ b/nixpkgs/pkgs/tools/system/freeipmi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { info. ''; - homepage = https://www.gnu.org/software/freeipmi/; + homepage = "https://www.gnu.org/software/freeipmi/"; downloadPage = "https://www.gnu.org/software/freeipmi/download.html"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/system/gdmap/default.nix b/nixpkgs/pkgs/tools/system/gdmap/default.nix index 4adc81608293..6fdfd6e71909 100644 --- a/nixpkgs/pkgs/tools/system/gdmap/default.nix +++ b/nixpkgs/pkgs/tools/system/gdmap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { - homepage = http://gdmap.sourceforge.net; + homepage = "http://gdmap.sourceforge.net"; description = "Recursive rectangle map of disk usage"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/gohai/default.nix b/nixpkgs/pkgs/tools/system/gohai/default.nix index c0dd2c89d2f1..48c68f8d2f2c 100644 --- a/nixpkgs/pkgs/tools/system/gohai/default.nix +++ b/nixpkgs/pkgs/tools/system/gohai/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { license = licenses.mit; maintainers = [ maintainers.tazjin ]; platforms = platforms.unix; - repositories.git = git://github.com/DataDog/gohai.git; + repositories.git = "git://github.com/DataDog/gohai.git"; longDescription = '' Gohai is a tool which collects an inventory of system diff --git a/nixpkgs/pkgs/tools/system/gotop/default.nix b/nixpkgs/pkgs/tools/system/gotop/default.nix index daf9ce58c911..44ef60c70f38 100644 --- a/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gotop"; - version = "3.0.0"; - - goPackagePath = "github.com/cjbassi/gotop"; + version = "3.5.0"; src = fetchFromGitHub { - owner = "cjbassi"; + owner = "xxxserxxx"; repo = pname; - rev = version; - sha256 = "1kndj5qjaqgizjakh642fay2i0i1jmfjlk1p01gnjbh2b0yzvj1r"; + rev = "v${version}"; + sha256 = "01a2y2604dh2zfy5f2fxr306id0fbq0df91fpz2m8w7rpaszd6xr"; }; + modSha256 = "1gbpxq2vyshln97gij5y9qsjyf3mkwfqwwhikc0cck3mnwiv87dd"; + meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; - homepage = https://github.com/cjbassi/gotop; + homepage = "https://github.com/xxxserxxx/gotop"; license = licenses.agpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/system/gptfdisk/default.nix b/nixpkgs/pkgs/tools/system/gptfdisk/default.nix index 72d9d70ed8bb..613f63c3f044 100644 --- a/nixpkgs/pkgs/tools/system/gptfdisk/default.nix +++ b/nixpkgs/pkgs/tools/system/gptfdisk/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; license = licenses.gpl2; - homepage = https://www.rodsbooks.com/gdisk/; + homepage = "https://www.rodsbooks.com/gdisk/"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/system/gt5/default.nix b/nixpkgs/pkgs/tools/system/gt5/default.nix index ea121b0e43c9..61d25f414bbd 100644 --- a/nixpkgs/pkgs/tools/system/gt5/default.nix +++ b/nixpkgs/pkgs/tools/system/gt5/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; - homepage = http://gt5.sourceforge.net/; + homepage = "http://gt5.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/system/hardinfo/default.nix b/nixpkgs/pkgs/tools/system/hardinfo/default.nix index 6c5019847ff3..fd8fb08cf293 100644 --- a/nixpkgs/pkgs/tools/system/hardinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/hardinfo/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hardinfo.org/; + homepage = "http://hardinfo.org/"; description = "Display information about your hardware and operating system"; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor ]; diff --git a/nixpkgs/pkgs/tools/system/hardlink/default.nix b/nixpkgs/pkgs/tools/system/hardlink/default.nix index d1d2b7a3e769..c0c6aa72d3ba 100644 --- a/nixpkgs/pkgs/tools/system/hardlink/default.nix +++ b/nixpkgs/pkgs/tools/system/hardlink/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Consolidate duplicate files via hardlinks"; - homepage = https://pagure.io/hardlink; - repositories.git = https://src.fedoraproject.org/cgit/rpms/hardlink.git; + homepage = "https://pagure.io/hardlink"; + repositories.git = "https://src.fedoraproject.org/cgit/rpms/hardlink.git"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock index 259c2e170b0e..918df753a382 100644 --- a/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock +++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES hiera-eyaml BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix b/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix index 33d97aa7d6b6..be6fb1c7462a 100644 --- a/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix +++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix @@ -9,7 +9,7 @@ bundlerEnv { meta = with lib; { description = "Per-value asymmetric encryption of sensitive data for Hiera"; - homepage = https://github.com/TomPoulton/hiera-eyaml; + homepage = "https://github.com/TomPoulton/hiera-eyaml"; license = licenses.mit; maintainers = with maintainers; [ benley nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/system/honcho/default.nix b/nixpkgs/pkgs/tools/system/honcho/default.nix index fcdcc23961b5..eb96c3f46132 100644 --- a/nixpkgs/pkgs/tools/system/honcho/default.nix +++ b/nixpkgs/pkgs/tools/system/honcho/default.nix @@ -43,7 +43,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A Python clone of Foreman, a tool for managing Procfile-based applications"; license = licenses.mit; - homepage = https://github.com/nickstenning/honcho; + homepage = "https://github.com/nickstenning/honcho"; maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/system/htop/default.nix b/nixpkgs/pkgs/tools/system/htop/default.nix index 1b68273a5700..c9adf5377e23 100644 --- a/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/nixpkgs/pkgs/tools/system/htop/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; - homepage = https://hisham.hm/htop/; + homepage = "https://hisham.hm/htop/"; license = licenses.gpl2Plus; platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; maintainers = with maintainers; [ rob relrod ]; diff --git a/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/nixpkgs/pkgs/tools/system/hwinfo/default.nix index 048af14efb15..b8bbe09fcb73 100644 --- a/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.68"; + version = "21.69"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "0x63rkyl16918l8yf0azy2lyxaqy8nc6iafid89acvxn32j146rg"; + sha256 = "01lmxyqhx092ahbls7z9gwgmsinlqcv8zb7xvklbwyhzy5c02fxx"; }; patchPhase = '' @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hardware detection tool from openSUSE"; license = licenses.gpl2; - homepage = https://github.com/openSUSE/hwinfo; + homepage = "https://github.com/openSUSE/hwinfo"; maintainers = with maintainers; [ bobvanderlinden ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/system/idle3tools/default.nix b/nixpkgs/pkgs/tools/system/idle3tools/default.nix index d1631776d393..fa5234d8cbc3 100644 --- a/nixpkgs/pkgs/tools/system/idle3tools/default.nix +++ b/nixpkgs/pkgs/tools/system/idle3tools/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://idle3-tools.sourceforge.net/; + homepage = "http://idle3-tools.sourceforge.net/"; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/system/illum/default.nix b/nixpkgs/pkgs/tools/system/illum/default.nix index 767fccbd3882..41fce9b9b912 100644 --- a/nixpkgs/pkgs/tools/system/illum/default.nix +++ b/nixpkgs/pkgs/tools/system/illum/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/jmesmon/illum; + homepage = "https://github.com/jmesmon/illum"; description = "Daemon that wires button presses to screen backlight level"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.dancek ]; diff --git a/nixpkgs/pkgs/tools/system/incron/default.nix b/nixpkgs/pkgs/tools/system/incron/default.nix index 2afbed2f9bb2..4b5709e62270 100644 --- a/nixpkgs/pkgs/tools/system/incron/default.nix +++ b/nixpkgs/pkgs/tools/system/incron/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cron-like daemon which handles filesystem events."; - homepage = https://github.com/ar-/incron; + homepage = "https://github.com/ar-/incron"; license = licenses.gpl2; maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/ioping/default.nix b/nixpkgs/pkgs/tools/system/ioping/default.nix index 6acd41046ceb..7b65739c1a8d 100644 --- a/nixpkgs/pkgs/tools/system/ioping/default.nix +++ b/nixpkgs/pkgs/tools/system/ioping/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.gpl3Plus; - homepage = https://github.com/koct9i/ioping; + homepage = "https://github.com/koct9i/ioping"; }; } diff --git a/nixpkgs/pkgs/tools/system/iops/default.nix b/nixpkgs/pkgs/tools/system/iops/default.nix index 7e6854afe627..cf34cb115f14 100644 --- a/nixpkgs/pkgs/tools/system/iops/default.nix +++ b/nixpkgs/pkgs/tools/system/iops/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Iops lets you measure how many I/O operations per second a storage device can perform. Usefull for determing e.g. the best RAID-setting of your storage device. ''; - homepage = http://www.vanheusden.com/iops/; + homepage = "http://www.vanheusden.com/iops/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; # build problems on Darwin diff --git a/nixpkgs/pkgs/tools/system/ior/default.nix b/nixpkgs/pkgs/tools/system/ior/default.nix index 6217f601121c..6015e60afba5 100644 --- a/nixpkgs/pkgs/tools/system/ior/default.nix +++ b/nixpkgs/pkgs/tools/system/ior/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - homepage = https://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/; + homepage = "https://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/"; description = "Parallel file system I/O performance test"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/ipmitool/default.nix b/nixpkgs/pkgs/tools/system/ipmitool/default.nix index 2b6479198c97..b5da2db67fe8 100644 --- a/nixpkgs/pkgs/tools/system/ipmitool/default.nix +++ b/nixpkgs/pkgs/tools/system/ipmitool/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = with lib; { description = ''Command-line interface to IPMI-enabled devices''; license = licenses.bsd3; - homepage = https://sourceforge.net/projects/ipmitool/; + homepage = "https://sourceforge.net/projects/ipmitool/"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; }; diff --git a/nixpkgs/pkgs/tools/system/journalwatch/default.nix b/nixpkgs/pkgs/tools/system/journalwatch/default.nix index e0aaee31217c..b41196b85c91 100644 --- a/nixpkgs/pkgs/tools/system/journalwatch/default.nix +++ b/nixpkgs/pkgs/tools/system/journalwatch/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "journalwatch is a tool to find error messages in the systemd journal."; - homepage = https://github.com/The-Compiler/journalwatch; + homepage = "https://github.com/The-Compiler/journalwatch"; license = licenses.gpl3Plus; maintainers = with maintainers; [ florianjacob ]; }; diff --git a/nixpkgs/pkgs/tools/system/jump/default.nix b/nixpkgs/pkgs/tools/system/jump/default.nix index 3aa0cb242a94..bc2adb22c4fa 100644 --- a/nixpkgs/pkgs/tools/system/jump/default.nix +++ b/nixpkgs/pkgs/tools/system/jump/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { navigational habits by keeping track of the directories you visit. It strives to give you the best directory for the shortest search term. ''; - homepage = https://github.com/gsamokovarov/jump; + homepage = "https://github.com/gsamokovarov/jump"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ sondr3 ]; diff --git a/nixpkgs/pkgs/tools/system/kmon/default.nix b/nixpkgs/pkgs/tools/system/kmon/default.nix new file mode 100644 index 000000000000..1a4cdb9acdfe --- /dev/null +++ b/nixpkgs/pkgs/tools/system/kmon/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform, python3, libxcb }: + +rustPlatform.buildRustPackage rec { + pname = "kmon"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = pname; + rev = "v${version}"; + sha256 = "0lpwp5fzlf037bn03x1dldw8nfa5pyqi4qsqbscwn42idvs94mhx"; + }; + + cargoSha256 = "1g5k6dkv0zznh8q359n7sg9wf0gcix6m36pg9ql8wi5hnlsvg1s1"; + + nativeBuildInputs = [ python3 ]; + + buildInputs = [ libxcb ]; + + postInstall = '' + install -D man/kmon.8 -t $out/share/man/man8/ + ''; + + meta = with stdenv.lib; { + description = "Linux Kernel Manager and Activity Monitor"; + homepage = "https://github.com/orhun/kmon"; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/nixpkgs/pkgs/tools/system/krakenx/default.nix b/nixpkgs/pkgs/tools/system/krakenx/default.nix index c6866264a9b0..e5b1e3ec1c94 100644 --- a/nixpkgs/pkgs/tools/system/krakenx/default.nix +++ b/nixpkgs/pkgs/tools/system/krakenx/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Python script to control NZXT cooler Kraken X52/X62/X72"; - homepage = https://github.com/KsenijaS/krakenx; + homepage = "https://github.com/KsenijaS/krakenx"; license = licenses.gpl2; maintainers = [ maintainers.willibutz ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/ledmon/default.nix b/nixpkgs/pkgs/tools/system/ledmon/default.nix index ab11fc9e27f8..6775a4711261 100644 --- a/nixpkgs/pkgs/tools/system/ledmon/default.nix +++ b/nixpkgs/pkgs/tools/system/ledmon/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/ledmon; + homepage = "https://github.com/intel/ledmon"; description = "Enclosure LED Utilities"; platforms = platforms.linux; license = with licenses; [ gpl2 ]; diff --git a/nixpkgs/pkgs/tools/system/localtime/default.nix b/nixpkgs/pkgs/tools/system/localtime/default.nix index a12d70315d91..4dcb6afb00f1 100644 --- a/nixpkgs/pkgs/tools/system/localtime/default.nix +++ b/nixpkgs/pkgs/tools/system/localtime/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A daemon for keeping the system timezone up-to-date based on the current location"; - homepage = https://github.com/Stebalien/localtime; + homepage = "https://github.com/Stebalien/localtime"; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/tools/system/logcheck/default.nix b/nixpkgs/pkgs/tools/system/logcheck/default.nix index d51df4f408a4..71edfde9a0b3 100644 --- a/nixpkgs/pkgs/tools/system/logcheck/default.nix +++ b/nixpkgs/pkgs/tools/system/logcheck/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail. Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; - homepage = https://salsa.debian.org/debian/logcheck; + homepage = "https://salsa.debian.org/debian/logcheck"; license = licenses.gpl2; maintainers = [ maintainers.bluescreen303 ]; }; diff --git a/nixpkgs/pkgs/tools/system/lr/default.nix b/nixpkgs/pkgs/tools/system/lr/default.nix index 2ea7b11677ed..8d2febbeb8af 100644 --- a/nixpkgs/pkgs/tools/system/lr/default.nix +++ b/nixpkgs/pkgs/tools/system/lr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/chneukirchen/lr; + homepage = "https://github.com/chneukirchen/lr"; description = "List files recursively"; license = licenses.mit; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/system/lshw/default.nix b/nixpkgs/pkgs/tools/system/lshw/default.nix index 29c20ad8d534..3d1a6ace08e4 100644 --- a/nixpkgs/pkgs/tools/system/lshw/default.nix +++ b/nixpkgs/pkgs/tools/system/lshw/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://ezix.org/project/wiki/HardwareLiSter; + homepage = "https://ezix.org/project/wiki/HardwareLiSter"; description = "Provide detailed information on the hardware configuration of the machine"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom ]; diff --git a/nixpkgs/pkgs/tools/system/mcron/default.nix b/nixpkgs/pkgs/tools/system/mcron/default.nix index 1831041063b6..ca515cbdfd83 100644 --- a/nixpkgs/pkgs/tools/system/mcron/default.nix +++ b/nixpkgs/pkgs/tools/system/mcron/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { when jobs should be run. Mcron was written by Dale Mellor. ''; - homepage = https://www.gnu.org/software/mcron/; + homepage = "https://www.gnu.org/software/mcron/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/system/memtester/default.nix b/nixpkgs/pkgs/tools/system/memtester/default.nix index ff6ccb534fb9..7b065c6cfa88 100644 --- a/nixpkgs/pkgs/tools/system/memtester/default.nix +++ b/nixpkgs/pkgs/tools/system/memtester/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A userspace utility for testing the memory subsystem for faults"; - homepage = http://pyropus.ca/software/memtester/; + homepage = "http://pyropus.ca/software/memtester/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/system/minijail/default.nix b/nixpkgs/pkgs/tools/system/minijail/default.nix index 2b4d1deb9f9b..2f5adc3f4c95 100644 --- a/nixpkgs/pkgs/tools/system/minijail/default.nix +++ b/nixpkgs/pkgs/tools/system/minijail/default.nix @@ -1,45 +1,60 @@ -{ stdenv, fetchFromGitiles, libcap }: +{ stdenv, lib, fetchFromGitiles, glibc, libcap, qemu }: + +let + dumpConstants = + if stdenv.buildPlatform == stdenv.hostPlatform then "./dump_constants" + else if stdenv.hostPlatform.isAarch32 then "qemu-arm dump_constants" + else if stdenv.hostPlatform.isAarch64 then "qemu-aarch64 dump_constants" + else if stdenv.hostPlatform.isx86_64 then "qemu-x86_64 dump_constants" + else throw "Unsupported host platform"; +in stdenv.mkDerivation rec { pname = "minijail"; - version = "android-10.0.0_r9"; + version = "14"; src = fetchFromGitiles { url = "https://android.googlesource.com/platform/external/minijail"; - rev = version; - sha256 = "0gcfsyim1krrddcklydqfxl8mamaxgail2xl5qp9yclq60km8f22"; + rev = "linux-v${version}"; + sha256 = "00dq854n4zg3ca2b46f90k15n32zn2sgabi76mnq2w985k9v977n"; }; + nativeBuildInputs = + lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) qemu; buildInputs = [ libcap ]; makeFlags = [ "LIBDIR=$(out)/lib" ]; - - preConfigure = '' - substituteInPlace common.mk --replace /bin/echo echo - sed -i '/#include <asm\/siginfo.h>/ d' signal_handler.c - ''; + dumpConstantsFlags = lib.optional (stdenv.hostPlatform.libc == "glibc") + "LDFLAGS=-L${glibc.static}/lib"; postPatch = '' + substituteInPlace common.mk --replace /bin/echo echo patchShebangs platform2_preinstall.sh ''; postBuild = '' - ./platform2_preinstall.sh ${version} $out/include/chromeos + make $makeFlags $buildFlags $dumpConstantsFlags dump_constants + ${dumpConstants} > constants.json ''; installPhase = '' - mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin + ./platform2_preinstall.sh ${version} $out/include/chromeos + + mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin \ + $out/share/minijail + cp -v *.so $out/lib cp -v *.pc $out/lib/pkgconfig cp -v libminijail.h scoped_minijail.h $out/include/chromeos cp -v minijail0 $out/bin + cp -v constants.json $out/share/minijail ''; - meta = { - homepage = https://android.googlesource.com/platform/external/minijail/; + meta = with lib; { + homepage = "https://android.googlesource.com/platform/external/minijail/"; description = "Sandboxing library and application using Linux namespaces and capabilities"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [pcarrier]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ pcarrier qyliss ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/system/minijail/tools.nix b/nixpkgs/pkgs/tools/system/minijail/tools.nix new file mode 100644 index 000000000000..875ea0dbff95 --- /dev/null +++ b/nixpkgs/pkgs/tools/system/minijail/tools.nix @@ -0,0 +1,13 @@ +{ buildPythonApplication, lib, minijail }: + +buildPythonApplication { + pname = "minijail-tools"; + inherit (minijail) version src; + + meta = with lib; { + homepage = "https://android.googlesource.com/platform/external/minijail/+/refs/heads/master/tools/"; + description = "A set of tools for minijail"; + license = licenses.asl20; + inherit (minijail.meta) maintainers platforms; + }; +} diff --git a/nixpkgs/pkgs/tools/system/monit/default.nix b/nixpkgs/pkgs/tools/system/monit/default.nix index f4238e272480..7cec79ff25ea 100644 --- a/nixpkgs/pkgs/tools/system/monit/default.nix +++ b/nixpkgs/pkgs/tools/system/monit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://mmonit.com/monit/; + homepage = "http://mmonit.com/monit/"; description = "Monitoring system"; license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ raskin wmertens ]; diff --git a/nixpkgs/pkgs/tools/system/mq-cli/default.nix b/nixpkgs/pkgs/tools/system/mq-cli/default.nix index afde8b8f9d27..a29e1630116d 100644 --- a/nixpkgs/pkgs/tools/system/mq-cli/default.nix +++ b/nixpkgs/pkgs/tools/system/mq-cli/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ tazjin ]; platforms = platforms.linux; - repositories.git = git://github.com/aprilabank/mq-cli.git; + repositories.git = "git://github.com/aprilabank/mq-cli.git"; }; } diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index c4001e8c50b3..102858beced6 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.20.0"; + version = "1.21.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "0g7iv5w14wndl5iv2q81dppgwq09sm93vpnyq7p49nl7q1dsz1d6"; + sha256 = "0i0k64r8j1g02s2bi2gm0j47y52l3xli63w686ncpgmlhwmdfz65"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -36,18 +36,13 @@ in stdenv.mkDerivation rec { patches = [ ./no-files-in-etc-and-var.patch - # part of the next release - (fetchpatch { - url = "https://github.com/netdata/netdata/commit/5c992b7d92cf008ce91627efccf8644732db1f87.patch"; - sha256 = "1nvbmhy5rir4kw77dhx1qr0l0wcspakr7z7ivva1ilz1aml8nbnm"; - }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' - ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d - ln -s ${go-d-plugin.bin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin + ln -s ${go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d + ln -s ${go-d-plugin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin '' + optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ @@ -78,7 +73,7 @@ in stdenv.mkDerivation rec { meta = { description = "Real-time performance monitoring tool"; - homepage = https://my-netdata.io/; + homepage = "https://my-netdata.io/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; diff --git a/nixpkgs/pkgs/tools/system/netdata/deps.nix b/nixpkgs/pkgs/tools/system/netdata/deps.nix deleted file mode 100644 index 10d933c5a568..000000000000 --- a/nixpkgs/pkgs/tools/system/netdata/deps.nix +++ /dev/null @@ -1,534 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.2"; - sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; - }; - } - { - goPackagePath = "github.com/Wing924/ltsv"; - fetch = { - type = "git"; - url = "https://github.com/Wing924/ltsv"; - rev = "v0.3.1"; - sha256 = "05jl8myq16y847wmx6cmlxl50z86cpiv9pq4fflmac7lp4hf67m3"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a751"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "c3de453c63f4"; - sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; - }; - } - { - goPackagePath = "github.com/axiomhq/hyperloglog"; - fetch = { - type = "git"; - url = "https://github.com/axiomhq/hyperloglog"; - rev = "a4c4c47bc57f"; - sha256 = "0pwjxyhn0ms3n1q0hbqb5gz2lxb28giflkya9ck2lwfyd28y254s"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/davecgh/go-xdr"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-xdr"; - rev = "e6a2ba005892"; - sha256 = "0vifrz4iil4r7k8sz5iqlfbh80ysgs5abp2simgyhsbrkxrrsrrd"; - }; - } - { - goPackagePath = "github.com/dgryski/go-metro"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-metro"; - rev = "280f6062b5bc"; - sha256 = "1a82ksyklh1lcpgzh07ik78pgz4m0b3q921yfglafd7v0ld6xljr"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.9.0"; - sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "6a5e28554805"; - sha256 = "0q1zwabj77agp1yljqjlf31ip8c6lr25xwqlw3zzfgha81y45lv0"; - }; - } - { - goPackagePath = "github.com/influxdata/influxdb"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/influxdb"; - rev = "v1.7.6"; - sha256 = "07abzhmsgj7krmhf7jis50a4fc4w29h48nyzgvrll5lz3cax979q"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "v1.4.0"; - sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.7"; - sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.27"; - sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/netdata/go-orchestrator"; - fetch = { - type = "git"; - url = "https://github.com/netdata/go-orchestrator"; - rev = "c793edba0e8f"; - sha256 = "0bqvqdkd510yl3c9f86h6ii7r1l5sjx0x655lzgv6cahq90k3pr7"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.0.0"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "v0.2.0"; - sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.9.0"; - sha256 = "0gvfb622fjybvhwh8rjpgnz2zxrz9cdc1kzn40hk4hyqg5435w3b"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; - }; - } - { - goPackagePath = "github.com/prometheus/prometheus"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/prometheus"; - rev = "v2.5.0"; - sha256 = "07sgsmazjr5lgkbaz63qanpg536pyfb7asljz67rqz6c47ngzifp"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.2"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "github.com/vmware/govmomi"; - fetch = { - type = "git"; - url = "https://github.com/vmware/govmomi"; - rev = "v0.22.1"; - sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; - }; - } - { - goPackagePath = "github.com/vmware/vmw-guestinfo"; - fetch = { - type = "git"; - url = "https://github.com/vmware/vmw-guestinfo"; - rev = "25eff159a728"; - sha256 = "1nag33p0i6zxh25kf0hpdsc3n1agrjsncdqqj8sxd2q1zf7lhf5j"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "c90efee705ee"; - sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "aa69164e4478"; - sha256 = "1w0r52a9csj5vkhysvdx6l5v2dq1lnmvs95ffhpibypjha7lq214"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "2837fb4f24fe"; - sha256 = "01wrq33y1bjkk0kpxhs59iq7i95llhs2f8k0v5mr3f6wd46v4h5b"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "49a3e744a425"; - sha256 = "0xx4gv9wpv36crk7gv7imf5vzzs2mz7zla2q2jkck3xnzff8fw3v"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "1b5146add898"; - sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.7"; - sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; - }; - } - { - goPackagePath = "layeh.com/radius"; - fetch = { - type = "git"; - url = "https://github.com/layeh/radius"; - rev = "890bc1058917"; - sha256 = "01ncxwmlj5xjz4kd4pbp77xqqgixip492ilczk7ac0fivjcvdnb3"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix b/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix index 0e1de1bbd8e7..cada1eb65c3c 100644 --- a/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,30 +1,29 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "netdata-go.d.plugin"; - version = "0.15.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "0v732mndhgrbqiwsdndqd08pvgbvl4ffn5rqbyv7iw1dwwr08f67"; + sha256 = "15h4075lwqh58ssdgyq34jj8r4dga0sz7h18dzy4nir75p8a0s7b"; }; - goPackagePath = "github.com/netdata/go.d.plugin"; + modSha256 = "1386qhk1yr47h7qv15k0abc8mfif96pqapw0v4wrf3pl1z9mzl2n"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' - mkdir -p $bin/lib/netdata/conf.d - cp -r go/src/${goPackagePath}/config/* $bin/lib/netdata/conf.d + mkdir -p $out/lib/netdata/conf.d + cp -r config/* $out/lib/netdata/conf.d ''; - goDeps = ./deps.nix; - meta = with lib; { description = "Netdata orchestrator for data collection modules written in go"; - homepage = https://github.com/netdata/go.d.plugin; + homepage = "https://github.com/netdata/go.d.plugin"; license = licenses.gpl3; - platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; }; } diff --git a/nixpkgs/pkgs/tools/system/nq/default.nix b/nixpkgs/pkgs/tools/system/nq/default.nix index 89c84c8c9ca8..9e6522b20284 100644 --- a/nixpkgs/pkgs/tools/system/nq/default.nix +++ b/nixpkgs/pkgs/tools/system/nq/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Unix command line queue utility"; - homepage = https://github.com/chneukirchen/nq; + homepage = "https://github.com/chneukirchen/nq"; license = licenses.publicDomain; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/nixpkgs/pkgs/tools/system/nvtop/default.nix b/nixpkgs/pkgs/tools/system/nvtop/default.nix index 0e7a5d4a3111..cd9ec7c7082d 100644 --- a/nixpkgs/pkgs/tools/system/nvtop/default.nix +++ b/nixpkgs/pkgs/tools/system/nvtop/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A (h)top like like task monitor for NVIDIA GPUs"; - homepage = https://github.com/Syllo/nvtop; + homepage = "https://github.com/Syllo/nvtop"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ willibutz ]; diff --git a/nixpkgs/pkgs/tools/system/opencl-info/default.nix b/nixpkgs/pkgs/tools/system/opencl-info/default.nix index d1c3d0ec6c0c..a5013a688855 100644 --- a/nixpkgs/pkgs/tools/system/opencl-info/default.nix +++ b/nixpkgs/pkgs/tools/system/opencl-info/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool to dump OpenCL platform/device information"; - homepage = https://github.com/marchv/opencl-info; + homepage = "https://github.com/marchv/opencl-info"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/system/pciutils/default.nix b/nixpkgs/pkgs/tools/system/pciutils/default.nix index 51cfaf9f333c..e76ab496ef98 100644 --- a/nixpkgs/pkgs/tools/system/pciutils/default.nix +++ b/nixpkgs/pkgs/tools/system/pciutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; meta = with stdenv.lib; { - homepage = http://mj.ucw.cz/pciutils.html; + homepage = "http://mj.ucw.cz/pciutils.html"; description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/system/pcstat/default.nix b/nixpkgs/pkgs/tools/system/pcstat/default.nix index 5a1bad1092db..5febbcb6ef66 100644 --- a/nixpkgs/pkgs/tools/system/pcstat/default.nix +++ b/nixpkgs/pkgs/tools/system/pcstat/default.nix @@ -17,7 +17,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Page Cache stat: get page cache stats for files on Linux."; - homepage = https://github.com/tobert/pcstat; + homepage = "https://github.com/tobert/pcstat"; license = licenses.asl20; maintainers = with maintainers; [ aminechikhaoui ]; }; diff --git a/nixpkgs/pkgs/tools/system/plan9port/default.nix b/nixpkgs/pkgs/tools/system/plan9port/default.nix index 9a4a22385584..54e88f5d0699 100644 --- a/nixpkgs/pkgs/tools/system/plan9port/default.nix +++ b/nixpkgs/pkgs/tools/system/plan9port/default.nix @@ -11,17 +11,16 @@ stdenv.mkDerivation { pname = "plan9port"; - version = "2019-02-25"; + version = "2020-01-08"; src = fetchFromGitHub { owner = "9fans"; repo = "plan9port"; - rev = "047fd921744f39a82a86d9370e03f7af511e6e84"; - sha256 = "1lp17948q7vpl8rc2bf5a45bc8jqyj0s3zffmks9r25ai42vgb43"; + rev = "cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e"; + sha256 = "0gb55kj0gzx1kdhiwcrbr7xcgz1im21dyxgxhfhh6d0q9rw0c17g"; }; patches = [ - ./tmpdir.patch ./darwin-sw_vers.patch ./darwin-cfframework.patch ]; @@ -81,7 +80,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://9fans.github.io/plan9port/; + homepage = "https://9fans.github.io/plan9port/"; description = "Plan 9 from User Space"; longDescription = '' Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs @@ -90,7 +89,7 @@ stdenv.mkDerivation { license = licenses.lpl-102; maintainers = with maintainers; [ AndersonTorres bbarker ftrvxmtrx kovirobi ]; - platforms = platforms.unix; + platforms = remove "aarch64-linux" platforms.unix; }; } # TODO: investigate the mouse chording support patch diff --git a/nixpkgs/pkgs/tools/system/plan9port/tmpdir.patch b/nixpkgs/pkgs/tools/system/plan9port/tmpdir.patch deleted file mode 100644 index e8200a177a27..000000000000 --- a/nixpkgs/pkgs/tools/system/plan9port/tmpdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c762625549ff367b54bcd8281d1ce248a69b4401 Mon Sep 17 00:00:00 2001 -From: Jason Felice <jason.m.felice@gmail.com> -Date: Mon, 1 Jul 2019 15:01:21 -0400 -Subject: [PATCH] Use $TMPDIR if available - -NixOS sandboxed builds (at least on Mac) don't have access to /tmp, -and this should be better POSIX. ---- - bin/9c | 2 +- - bin/9l | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bin/9c b/bin/9c -index 3ffb716c..88c47887 100755 ---- a/bin/9c -+++ b/bin/9c -@@ -133,7 +133,7 @@ case "$tag" in - esac - - # N.B. Must use temp file to avoid pipe; pipe loses status. --xtmp=/tmp/9c.$$.$USER.out -+xtmp=${TMPDIR-/tmp}/9c.$$.$USER.out - $cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp - status=$? - quiet $xtmp -diff --git a/bin/9l b/bin/9l -index 6195815f..717a540a 100755 ---- a/bin/9l -+++ b/bin/9l -@@ -346,7 +346,7 @@ then - echo $ld -L$PLAN9/lib "$@" $libsl $extralibs $frameworks - fi - --xtmp=/tmp/9l.$$.$USER.out -+xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out" - xxout() { - sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . | - egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub' --- -2.21.0 - diff --git a/nixpkgs/pkgs/tools/system/procodile/Gemfile.lock b/nixpkgs/pkgs/tools/system/procodile/Gemfile.lock index 7989b7bf1f7f..f53a07d6657c 100644 --- a/nixpkgs/pkgs/tools/system/procodile/Gemfile.lock +++ b/nixpkgs/pkgs/tools/system/procodile/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES procodile BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/system/procodile/default.nix b/nixpkgs/pkgs/tools/system/procodile/default.nix index 3ae80a312ed6..2751601b39b9 100644 --- a/nixpkgs/pkgs/tools/system/procodile/default.nix +++ b/nixpkgs/pkgs/tools/system/procodile/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Run processes in the background (and foreground) on Mac & Linux from a Procfile (for production and/or development environments)"; - homepage = https://adam.ac/procodile; + homepage = "https://adam.ac/procodile"; license = with licenses; mit; maintainers = with maintainers; [ ravloony manveru nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/system/proot/default.nix b/nixpkgs/pkgs/tools/system/proot/default.nix index 5ff8ff95f8ae..06147df093e6 100644 --- a/nixpkgs/pkgs/tools/system/proot/default.nix +++ b/nixpkgs/pkgs/tools/system/proot/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://proot-me.github.io; + homepage = "https://proot-me.github.io"; description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/system/ps_mem/default.nix b/nixpkgs/pkgs/tools/system/ps_mem/default.nix index bde4429c4813..45a33a1adb7b 100644 --- a/nixpkgs/pkgs/tools/system/ps_mem/default.nix +++ b/nixpkgs/pkgs/tools/system/ps_mem/default.nix @@ -15,7 +15,7 @@ in pythonPackages.buildPythonApplication { meta = with stdenv.lib; { description = "A utility to accurately report the in core memory usage for a program"; - homepage = https://github.com/pixelb/ps_mem; + homepage = "https://github.com/pixelb/ps_mem"; license = licenses.lgpl21; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/psensor/default.nix b/nixpkgs/pkgs/tools/system/psensor/default.nix index 83d281642bd3..49d2747a33e1 100644 --- a/nixpkgs/pkgs/tools/system/psensor/default.nix +++ b/nixpkgs/pkgs/tools/system/psensor/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graphical hardware monitoring application for Linux"; - homepage = https://wpitchoune.net/psensor/; + homepage = "https://wpitchoune.net/psensor/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/nixpkgs/pkgs/tools/system/psstop/default.nix b/nixpkgs/pkgs/tools/system/psstop/default.nix index 4d413e60c77f..3a5ee2b05813 100644 --- a/nixpkgs/pkgs/tools/system/psstop/default.nix +++ b/nixpkgs/pkgs/tools/system/psstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; meta = with stdenv.lib; { - homepage = https://github.com/clearlinux/psstop; + homepage = "https://github.com/clearlinux/psstop"; description = "Show processes' memory usage by looking into pss"; # upstream summary license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; diff --git a/nixpkgs/pkgs/tools/system/r10k/Gemfile.lock b/nixpkgs/pkgs/tools/system/r10k/Gemfile.lock index 3ff9b6462156..9f55e273ef25 100644 --- a/nixpkgs/pkgs/tools/system/r10k/Gemfile.lock +++ b/nixpkgs/pkgs/tools/system/r10k/Gemfile.lock @@ -45,4 +45,4 @@ DEPENDENCIES r10k BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/system/r10k/default.nix b/nixpkgs/pkgs/tools/system/r10k/default.nix index 56e4e4f94fae..43d67eddf7db 100644 --- a/nixpkgs/pkgs/tools/system/r10k/default.nix +++ b/nixpkgs/pkgs/tools/system/r10k/default.nix @@ -15,7 +15,7 @@ bundlerApp { meta = with lib; { description = "Puppet environment and module deployment"; - homepage = https://github.com/puppetlabs/r10k; + homepage = "https://github.com/puppetlabs/r10k"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm manveru nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix b/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix index 73c1b4881559..92c13527c6fe 100644 --- a/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix +++ b/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Control your systemd units using rofi"; - homepage = https://github.com/IvanMalison/rofi-systemd; + homepage = "https://github.com/IvanMalison/rofi-systemd"; maintainers = with stdenv.lib.maintainers; [ imalison ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix b/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix index 64c184a61229..02462584c650 100644 --- a/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix +++ b/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Test DRAM for bit flips caused by the rowhammer problem"; - homepage = https://github.com/google/rowhammer-test; + homepage = "https://github.com/google/rowhammer-test"; license = licenses.asl20; maintainers = [ maintainers.viric ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/nixpkgs/pkgs/tools/system/runit/default.nix b/nixpkgs/pkgs/tools/system/runit/default.nix index 78306907079e..a4319fd57496 100644 --- a/nixpkgs/pkgs/tools/system/runit/default.nix +++ b/nixpkgs/pkgs/tools/system/runit/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UNIX init scheme with service supervision"; license = licenses.bsd3; - homepage = http://smarden.org/runit; + homepage = "http://smarden.org/runit"; maintainers = with maintainers; [ joachifm ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/system/s-tui/default.nix b/nixpkgs/pkgs/tools/system/s-tui/default.nix index a6816daae33a..2875bca4a2ac 100644 --- a/nixpkgs/pkgs/tools/system/s-tui/default.nix +++ b/nixpkgs/pkgs/tools/system/s-tui/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; meta = with stdenv.lib; { - homepage = https://amanusk.github.io/s-tui/; + homepage = "https://amanusk.github.io/s-tui/"; description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; diff --git a/nixpkgs/pkgs/tools/system/s6-rc/default.nix b/nixpkgs/pkgs/tools/system/s6-rc/default.nix index 95d4b376d0aa..4ddc7fbecc01 100644 --- a/nixpkgs/pkgs/tools/system/s6-rc/default.nix +++ b/nixpkgs/pkgs/tools/system/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.1.1"; - sha256 = "0lmg517l8inn7bi57q35rjd7b4jmqlmkhrbvs5ybbhinhd12qzi5"; + version = "0.5.1.2"; + sha256 = "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp"; description = "A service manager for s6-based systems"; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/s6/default.nix b/nixpkgs/pkgs/tools/system/s6/default.nix index efdf173a22c6..3ce97a9d97bd 100644 --- a/nixpkgs/pkgs/tools/system/s6/default.nix +++ b/nixpkgs/pkgs/tools/system/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.9.0.1"; - sha256 = "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0"; + version = "2.9.1.0"; + sha256 = "1xqzl2wnvcmcyhppk7mc10h1ac7fkik3i6gpyliwpf3d5i9mkqh5"; description = "skarnet.org's small & secure supervision software suite"; diff --git a/nixpkgs/pkgs/tools/system/safe-rm/default.nix b/nixpkgs/pkgs/tools/system/safe-rm/default.nix index 571f70e0756c..a9fc44e8b40d 100644 --- a/nixpkgs/pkgs/tools/system/safe-rm/default.nix +++ b/nixpkgs/pkgs/tools/system/safe-rm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool intended to prevent the accidental deletion of important files"; - homepage = https://launchpad.net/safe-rm; + homepage = "https://launchpad.net/safe-rm"; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.koral ]; diff --git a/nixpkgs/pkgs/tools/system/safecopy/default.nix b/nixpkgs/pkgs/tools/system/safecopy/default.nix index ce0779c0999c..e8db6a2fd39b 100644 --- a/nixpkgs/pkgs/tools/system/safecopy/default.nix +++ b/nixpkgs/pkgs/tools/system/safecopy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { resets and other helpful low level operations on a number of other device classes. ''; - homepage = http://safecopy.sourceforge.net; + homepage = "http://safecopy.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix index 7c90d41da18e..8dbc28d3a314 100644 --- a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix +++ b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A forensic/data recovery tool"; - homepage = https://www.sleuthkit.org/; + homepage = "https://www.sleuthkit.org/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.ipl10; diff --git a/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 077e1326f208..034564949c93 100644 --- a/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for monitoring the health of hard drives"; - homepage = https://www.smartmontools.org/; + homepage = "https://www.smartmontools.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peti Frostman ]; platforms = with platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/tools/system/socklog/default.nix b/nixpkgs/pkgs/tools/system/socklog/default.nix index 9f2cc2257472..cf7fbe5e9a13 100644 --- a/nixpkgs/pkgs/tools/system/socklog/default.nix +++ b/nixpkgs/pkgs/tools/system/socklog/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "System and kernel logging services"; - homepage = http://smarden.org/socklog/; + homepage = "http://smarden.org/socklog/"; license = licenses.publicDomain; platforms = platforms.unix; maintainers = [ maintainers.joachifm ]; diff --git a/nixpkgs/pkgs/tools/system/storebrowse/default.nix b/nixpkgs/pkgs/tools/system/storebrowse/default.nix index e3b58a50c925..4324fba87e77 100644 --- a/nixpkgs/pkgs/tools/system/storebrowse/default.nix +++ b/nixpkgs/pkgs/tools/system/storebrowse/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://viric.name/cgi-bin/storebrowse; + homepage = "http://viric.name/cgi-bin/storebrowse"; license = stdenv.lib.licenses.agpl3Plus; broken = true; }; diff --git a/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 32bb8f4f4548..6645639bcf03 100644 --- a/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.02"; + version = "0.11.07"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0vwqv3hq7h4z53ayk2c69zf60ncr0v2g0vxaci1pmxlhiz56y6md"; + sha256 = "1kyxkwn18y4161yyvxw3hd9xlzwlp270sn4gpnzvmr6rwxhr0nvh"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/system/supervise/default.nix b/nixpkgs/pkgs/tools/system/supervise/default.nix index 3834b3762f03..cbf96818f486 100644 --- a/nixpkgs/pkgs/tools/system/supervise/default.nix +++ b/nixpkgs/pkgs/tools/system/supervise/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/catern/supervise; + homepage = "https://github.com/catern/supervise"; description = "A minimal unprivileged process supervisor making use of modern Linux features"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix b/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix index 881fda241ed7..5d802dbed7e5 100644 --- a/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/balabit/syslog-ng-incubator; + homepage = "https://github.com/balabit/syslog-ng-incubator"; description = "A collection of tools and modules for syslog-ng"; license = licenses.gpl2; maintainers = []; diff --git a/nixpkgs/pkgs/tools/system/testdisk/default.nix b/nixpkgs/pkgs/tools/system/testdisk/default.nix index ad11cd2e3b65..223d1102e0d4 100644 --- a/nixpkgs/pkgs/tools/system/testdisk/default.nix +++ b/nixpkgs/pkgs/tools/system/testdisk/default.nix @@ -44,8 +44,8 @@ assert enableQt -> qwt != null; NIX_CFLAGS_COMPILE="-Wno-unused"; meta = with stdenv.lib; { - homepage = https://www.cgsecurity.org/wiki/Main_Page; - downloadPage = https://www.cgsecurity.org/wiki/TestDisk_Download; + homepage = "https://www.cgsecurity.org/wiki/Main_Page"; + downloadPage = "https://www.cgsecurity.org/wiki/TestDisk_Download"; description = "Testdisk / Photorec - Data recovery utilities"; longDescription = '' TestDisk is a powerful free data recovery software. It was primarily diff --git a/nixpkgs/pkgs/tools/system/thermald/default.nix b/nixpkgs/pkgs/tools/system/thermald/default.nix index 7afa91abf130..560985a94f33 100644 --- a/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -27,11 +27,15 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - ]; + ]; + + postInstall = '' + cp ./data/thermal-conf.xml $out/etc/thermald/ + ''; meta = with stdenv.lib; { description = "Thermal Daemon"; - homepage = https://01.org/linux-thermal-daemon; + homepage = "https://01.org/linux-thermal-daemon"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/system/thinkfan/default.nix b/nixpkgs/pkgs/tools/system/thinkfan/default.nix index f3b4ab8440e3..4edcfb63fe56 100644 --- a/nixpkgs/pkgs/tools/system/thinkfan/default.nix +++ b/nixpkgs/pkgs/tools/system/thinkfan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "thinkfan"; - version = "1.0.2"; + version = "1.1"; src = fetchFromGitHub { owner = "vmatare"; repo = "thinkfan"; rev = version; - sha256 = "107vw0962hrwva3wra9n3hxlbfzg82ldc10qssv3dspja88g8psr"; + sha256 = "1fxd1w3z65glw6y04myn7ihgswkx6sqnkky159mik4n96pfrsvr5"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/tools/system/throttled/default.nix b/nixpkgs/pkgs/tools/system/throttled/default.nix index 02ff75113824..71bb6dfb357d 100644 --- a/nixpkgs/pkgs/tools/system/throttled/default.nix +++ b/nixpkgs/pkgs/tools/system/throttled/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fix for Intel CPU throttling issues"; - homepage = https://github.com/erpalma/throttled; + homepage = "https://github.com/erpalma/throttled"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michaelpj ]; diff --git a/nixpkgs/pkgs/tools/system/tm/default.nix b/nixpkgs/pkgs/tools/system/tm/default.nix index cbb1fd88669a..390eae4de50a 100644 --- a/nixpkgs/pkgs/tools/system/tm/default.nix +++ b/nixpkgs/pkgs/tools/system/tm/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz; + url = "http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz"; sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; }; meta = with stdenv.lib; { - homepage = http://vicerveza.homeunix.net/~viric/soft/tm; + homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; description = "Terminal mixer - multiplexer for the i/o of terminal applications"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; diff --git a/nixpkgs/pkgs/tools/system/tree/default.nix b/nixpkgs/pkgs/tools/system/tree/default.nix index 0163d5502173..24d11a9c0ee8 100644 --- a/nixpkgs/pkgs/tools/system/tree/default.nix +++ b/nixpkgs/pkgs/tools/system/tree/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://mama.indstate.edu/users/ice/tree/; + homepage = "http://mama.indstate.edu/users/ice/tree/"; description = "Command to produce a depth indented directory listing"; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/system/ts/default.nix b/nixpkgs/pkgs/tools/system/ts/default.nix index 79ba7d893040..4046b3638112 100644 --- a/nixpkgs/pkgs/tools/system/ts/default.nix +++ b/nixpkgs/pkgs/tools/system/ts/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://vicerveza.homeunix.net/~viric/soft/ts; + homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; description = "Task spooler - batch queue"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; diff --git a/nixpkgs/pkgs/tools/system/tuptime/default.nix b/nixpkgs/pkgs/tools/system/tuptime/default.nix new file mode 100644 index 000000000000..acc96998952d --- /dev/null +++ b/nixpkgs/pkgs/tools/system/tuptime/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "tuptime"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "rfrail3"; + repo = "tuptime"; + rev = version; + sha256 = "0p5v1jp6bl0hjv04q3gh11q6dx9z0x61h6svcbvwp5ni0h1bkz1a"; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + mkdir -p $out/bin + install -m 755 src/tuptime $out/bin/ + + mkdir -p $out/share/man/man1 + cp src/man/tuptime.1 $out/share/man/man1/ + + # upstream only ships this, there are more scripts there... + mkdir -p $out/usr/share/doc/tuptime/contrib + cp misc/scripts/uptimed-to-tuptime.py $out/usr/share/doc/tuptime/contrib/ + ''; + + meta = with stdenv.lib; { + description = "Total uptime & downtime statistics utility"; + homepage = "https://github.com/rfrail3/tuptime"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/nixpkgs/pkgs/tools/system/undaemonize/default.nix b/nixpkgs/pkgs/tools/system/undaemonize/default.nix index 0f33a8d34c33..e82ee18b8314 100644 --- a/nixpkgs/pkgs/tools/system/undaemonize/default.nix +++ b/nixpkgs/pkgs/tools/system/undaemonize/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; meta = { description = "Tiny helper utility to force programs which insist on daemonizing themselves to run in the foreground"; - homepage = https://github.com/nickstenning/undaemonize; + homepage = "https://github.com/nickstenning/undaemonize"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.canndrew ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/uptimed/default.nix b/nixpkgs/pkgs/tools/system/uptimed/default.nix index 2e856aaf9bea..e9224977542f 100644 --- a/nixpkgs/pkgs/tools/system/uptimed/default.nix +++ b/nixpkgs/pkgs/tools/system/uptimed/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { each other. Uptimed comes with a console front-end to parse the records, which can also easily be used to show your records on a web page. ''; - homepage = https://github.com/rpodgorny/uptimed/; + homepage = "https://github.com/rpodgorny/uptimed/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/system/vbetool/default.nix b/nixpkgs/pkgs/tools/system/vbetool/default.nix index 06ae28626624..dc2ec24e594a 100644 --- a/nixpkgs/pkgs/tools/system/vbetool/default.nix +++ b/nixpkgs/pkgs/tools/system/vbetool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Video BIOS execution tool"; - homepage = http://www.codon.org.uk/~mjg59/vbetool/; + homepage = "http://www.codon.org.uk/~mjg59/vbetool/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/system/which/default.nix b/nixpkgs/pkgs/tools/system/which/default.nix index 12aac2508cbf..79a50e43ed8b 100644 --- a/nixpkgs/pkgs/tools/system/which/default.nix +++ b/nixpkgs/pkgs/tools/system/which/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/which/; + homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; platforms = platforms.all; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/system/wsmancli/default.nix b/nixpkgs/pkgs/tools/system/wsmancli/default.nix index da502946781b..79fb92d5bb2a 100644 --- a/nixpkgs/pkgs/tools/system/wsmancli/default.nix +++ b/nixpkgs/pkgs/tools/system/wsmancli/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also has several switches to allow for optional features of the WS-Management specification and Testing. ''; - downloadPage = https://github.com/Openwsman/wsmancli/releases; + downloadPage = "https://github.com/Openwsman/wsmancli/releases"; inherit (openwsman.meta) homepage license maintainers platforms; inherit version; }; diff --git a/nixpkgs/pkgs/tools/system/xe/default.nix b/nixpkgs/pkgs/tools/system/xe/default.nix index 62423ff594ff..2464f624a28e 100644 --- a/nixpkgs/pkgs/tools/system/xe/default.nix +++ b/nixpkgs/pkgs/tools/system/xe/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple xargs and apply replacement"; - homepage = https://github.com/chneukirchen/xe; + homepage = "https://github.com/chneukirchen/xe"; license = licenses.publicDomain; platforms = platforms.all; maintainers = with maintainers; [ cstrahan ]; diff --git a/nixpkgs/pkgs/tools/system/yeshup/default.nix b/nixpkgs/pkgs/tools/system/yeshup/default.nix index 42060aed295a..3242eeaeebc5 100644 --- a/nixpkgs/pkgs/tools/system/yeshup/default.nix +++ b/nixpkgs/pkgs/tools/system/yeshup/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/RhysU/yeshup; + homepage = "https://github.com/RhysU/yeshup"; platforms = platforms.linux; license = licenses.cc-by-sa-30; # From Stackoverflow answer maintainers = with maintainers; [ obadz ]; diff --git a/nixpkgs/pkgs/tools/system/ytop/default.nix b/nixpkgs/pkgs/tools/system/ytop/default.nix index 7bd97507beaf..de1678958dbb 100644 --- a/nixpkgs/pkgs/tools/system/ytop/default.nix +++ b/nixpkgs/pkgs/tools/system/ytop/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; - homepage = https://github.com/cjbassi/ytop; + homepage = "https://github.com/cjbassi/ytop"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/system/zenith/cargo-lock.patch b/nixpkgs/pkgs/tools/system/zenith/cargo-lock.patch new file mode 100644 index 000000000000..023480767b02 --- /dev/null +++ b/nixpkgs/pkgs/tools/system/zenith/cargo-lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 3f4eec6..64b1a6a 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1297,7 +1297,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "zenith" +-version = "0.8.0" ++version = "0.8.2" + dependencies = [ + "battery", + "bincode", diff --git a/nixpkgs/pkgs/tools/system/zenith/default.nix b/nixpkgs/pkgs/tools/system/zenith/default.nix new file mode 100644 index 000000000000..cdaf3a0f8ebb --- /dev/null +++ b/nixpkgs/pkgs/tools/system/zenith/default.nix @@ -0,0 +1,27 @@ +{ stdenv, rustPlatform, fetchFromGitHub, IOKit }: + +rustPlatform.buildRustPackage rec { + pname = "zenith"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "bvaisvil"; + repo = pname; + rev = version; + sha256 = "1s1l4nq4bsvi54i603faann8cp1409qa2ka7id0m38b3li8z2984"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0h6k7yf4hpfxnad46iv8gp3v3zc4x4p9yab40gr8xv8r1syf9f6g"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + + meta = with stdenv.lib; { + description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"; + homepage = "https://github.com/bvaisvil/zenith"; + license = licenses.mit; + maintainers = with maintainers; [ bbigras ]; + # doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19 + platforms = platforms.x86; + }; +} diff --git a/nixpkgs/pkgs/tools/text/a2ps/default.nix b/nixpkgs/pkgs/tools/text/a2ps/default.nix index f423bd7ea1c4..39f1b7e5bc2c 100644 --- a/nixpkgs/pkgs/tools/text/a2ps/default.nix +++ b/nixpkgs/pkgs/tools/text/a2ps/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { (page number, printing date, file name or supplied header), line numbering, symbol substitution as well as pretty printing for a wide range of programming languages. ''; - homepage = https://www.gnu.org/software/a2ps/; + homepage = "https://www.gnu.org/software/a2ps/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/agrep/default.nix b/nixpkgs/pkgs/tools/text/agrep/default.nix index 902067b3d535..c285b892b925 100644 --- a/nixpkgs/pkgs/tools/text/agrep/default.nix +++ b/nixpkgs/pkgs/tools/text/agrep/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Approximate grep for fast fuzzy string searching"; - homepage = https://www.tgries.de/agrep/; + homepage = "https://www.tgries.de/agrep/"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/text/aha/default.nix b/nixpkgs/pkgs/tools/text/aha/default.nix index 7dc07664fcef..a823f37d8d2c 100644 --- a/nixpkgs/pkgs/tools/text/aha/default.nix +++ b/nixpkgs/pkgs/tools/text/aha/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { longDescription = '' aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. ''; - homepage = https://github.com/theZiz/aha; + homepage = "https://github.com/theZiz/aha"; license = with licenses; [ lgpl2Plus mpl11 ]; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/amber/default.nix b/nixpkgs/pkgs/tools/text/amber/default.nix index 70bfaafbcec9..4afab278370c 100644 --- a/nixpkgs/pkgs/tools/text/amber/default.nix +++ b/nixpkgs/pkgs/tools/text/amber/default.nix @@ -4,22 +4,22 @@ rustPlatform.buildRustPackage rec { pname = "amber"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0k70rk19hwdlhhqm91x12xcb8r09kzpijs0xwhplrwdh86qfxymx"; + sha256 = "0pqz3spb5lmrj7w8hynmah9nrcfjsb1s0bmrr0cng9a9jx8amwzn"; }; - cargoSha256 = "0g8n3r6bdsfl1417wnss3ggnv5ywz8mx53hjglshmln40552znh3"; + cargoSha256 = "1ps70swh96xbfn4hng5krlmwvw2bwrl2liqvx9v9vy6pr86643s6"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "A code search-and-replace tool"; - homepage = https://github.com/dalance/amber; + homepage = "https://github.com/dalance/amber"; license = with licenses; [ mit ]; maintainers = [ maintainers.bdesham ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/ascii/default.nix b/nixpkgs/pkgs/tools/text/ascii/default.nix index b01ce7773e30..94ab5286f8c0 100644 --- a/nixpkgs/pkgs/tools/text/ascii/default.nix +++ b/nixpkgs/pkgs/tools/text/ascii/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interactive ASCII name and synonym chart"; - homepage = http://www.catb.org/~esr/ascii/; + homepage = "http://www.catb.org/~esr/ascii/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/text/bcat/Gemfile.lock b/nixpkgs/pkgs/tools/text/bcat/Gemfile.lock index 09108977c718..cbff494fe867 100644 --- a/nixpkgs/pkgs/tools/text/bcat/Gemfile.lock +++ b/nixpkgs/pkgs/tools/text/bcat/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES bcat BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/text/bcat/default.nix b/nixpkgs/pkgs/tools/text/bcat/default.nix index e8000f17cdeb..dffd58de44fe 100644 --- a/nixpkgs/pkgs/tools/text/bcat/default.nix +++ b/nixpkgs/pkgs/tools/text/bcat/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Pipe to browser utility"; - homepage = http://rtomayko.github.com/bcat/; + homepage = "http://rtomayko.github.com/bcat/"; license = licenses.mit; maintainers = with maintainers; [ jraygauthier nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/boxes/default.nix b/nixpkgs/pkgs/tools/text/boxes/default.nix index 8325c6c08f35..b9d54d3a9e77 100644 --- a/nixpkgs/pkgs/tools/text/boxes/default.nix +++ b/nixpkgs/pkgs/tools/text/boxes/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Boxes is a command line filter program that draws ASCII art boxes around your input text. ''; - homepage = https://boxes.thomasjensen.com; + homepage = "https://boxes.thomasjensen.com"; license = licenses.gpl2; maintainers = with maintainers; [ waiting-for-dev ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/catdocx/default.nix b/nixpkgs/pkgs/tools/text/catdocx/default.nix index adf9d17815b0..f24864f754b3 100644 --- a/nixpkgs/pkgs/tools/text/catdocx/default.nix +++ b/nixpkgs/pkgs/tools/text/catdocx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Extracts plain text from docx files"; - homepage = https://github.com/jncraton/catdocx; + homepage = "https://github.com/jncraton/catdocx"; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/cconv/default.nix b/nixpkgs/pkgs/tools/text/cconv/default.nix index 3b80af365f65..8fe400aaab25 100644 --- a/nixpkgs/pkgs/tools/text/cconv/default.nix +++ b/nixpkgs/pkgs/tools/text/cconv/default.nix @@ -13,7 +13,7 @@ let version = "0.6.3"; in meta = with stdenv.lib; { description = "A iconv based simplified-traditional chinese conversion tool"; - homepage = https://github.com/xiaoyjy/cconv; + homepage = "https://github.com/xiaoyjy/cconv"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.redfish64 ]; diff --git a/nixpkgs/pkgs/tools/text/codesearch/default.nix b/nixpkgs/pkgs/tools/text/codesearch/default.nix index 521b4c5b284f..7f706cf13765 100644 --- a/nixpkgs/pkgs/tools/text/codesearch/default.nix +++ b/nixpkgs/pkgs/tools/text/codesearch/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Fast, indexed regexp search over large file trees"; - homepage = https://github.com/google/codesearch; + homepage = "https://github.com/google/codesearch"; license = [ stdenv.lib.licenses.bsd3 ]; maintainers = [ stdenv.lib.maintainers.bennofs ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/colordiff/default.nix b/nixpkgs/pkgs/tools/text/colordiff/default.nix index 46fdf29ad46c..1ba1db1f7cb5 100644 --- a/nixpkgs/pkgs/tools/text/colordiff/default.nix +++ b/nixpkgs/pkgs/tools/text/colordiff/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; - homepage = https://www.colordiff.org/; + homepage = "https://www.colordiff.org/"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/nixpkgs/pkgs/tools/text/convertlit/default.nix b/nixpkgs/pkgs/tools/text/convertlit/default.nix index ffc2dc1c4d5c..a947ef98a689 100644 --- a/nixpkgs/pkgs/tools/text/convertlit/default.nix +++ b/nixpkgs/pkgs/tools/text/convertlit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "convertlit-1.8"; src = fetchzip { - url = http://www.convertlit.com/convertlit18src.zip; + url = "http://www.convertlit.com/convertlit18src.zip"; sha256 = "182nsin7qscgbw2h92m0zadh3h8q410h5cza6v486yjfvla3dxjx"; stripRoot = false; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.convertlit.com/; + homepage = "http://www.convertlit.com/"; description = "A tool for converting Microsoft Reader ebooks to more open formats"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/copyright-update/default.nix b/nixpkgs/pkgs/tools/text/copyright-update/default.nix index 9a405674dc7a..ca815f915db3 100644 --- a/nixpkgs/pkgs/tools/text/copyright-update/default.nix +++ b/nixpkgs/pkgs/tools/text/copyright-update/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL=install" "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/jaalto/project--copyright-update; + homepage = "https://github.com/jaalto/project--copyright-update"; description = "Updates the copyright information in a set of files"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/csvkit/default.nix b/nixpkgs/pkgs/tools/text/csvkit/default.nix index d2c710d10f8c..7a0240fc7301 100644 --- a/nixpkgs/pkgs/tools/text/csvkit/default.nix +++ b/nixpkgs/pkgs/tools/text/csvkit/default.nix @@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; - homepage = https://github.com/wireservice/csvkit; + homepage = "https://github.com/wireservice/csvkit"; }; } diff --git a/nixpkgs/pkgs/tools/text/dadadodo/default.nix b/nixpkgs/pkgs/tools/text/dadadodo/default.nix index 5f6b0a8a6058..5de8e25e6fb2 100644 --- a/nixpkgs/pkgs/tools/text/dadadodo/default.nix +++ b/nixpkgs/pkgs/tools/text/dadadodo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Markov chain-based text generator"; - homepage = http://www.jwz.org/dadadodo; + homepage = "http://www.jwz.org/dadadodo"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/text/diffr/default.nix b/nixpkgs/pkgs/tools/text/diffr/default.nix index 9ddaa3468ff3..016cc40977b2 100644 --- a/nixpkgs/pkgs/tools/text/diffr/default.nix +++ b/nixpkgs/pkgs/tools/text/diffr/default.nix @@ -2,26 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "diffr"; - version = "v0.1.2"; - - # diffr's tests expect the diffr binary to be at `$CARGO_MANIFEST_DIR/target/debug/diffr`. - doCheck = false; + version = "v0.1.4"; src = fetchFromGitHub { owner = "mookid"; repo = pname; rev = version; - sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2"; + sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; }; - cargoSha256 = "17xgjk8li29b8q8p2bi56klqg0v2q0j6ich438c4p06jrszccx1f"; + cargoSha256 = "09yn02985yv40n9y0ipz0jmj7iqhz7l8hd3ry9ib3fyw9pyklnfa"; - nativeBuildInputs = []; buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); + preCheck = '' + export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr + ''; + meta = with stdenv.lib; { description = "Yet another diff highlighting tool"; - homepage = https://github.com/mookid/diffr; + homepage = "https://github.com/mookid/diffr"; license = with licenses; [ mit ]; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/diffstat/default.nix b/nixpkgs/pkgs/tools/text/diffstat/default.nix index bf4ff279f8fc..bed34e30e790 100644 --- a/nixpkgs/pkgs/tools/text/diffstat/default.nix +++ b/nixpkgs/pkgs/tools/text/diffstat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { insertions, deletions, and modifications per-file. It is useful for reviewing large, complex patch files. ''; - homepage = https://invisible-island.net/diffstat/; + homepage = "https://invisible-island.net/diffstat/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/text/diffutils/default.nix b/nixpkgs/pkgs/tools/text/diffutils/default.nix index 67f397dbe48a..06ecda9ff21d 100644 --- a/nixpkgs/pkgs/tools/text/diffutils/default.nix +++ b/nixpkgs/pkgs/tools/text/diffutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/diffutils/diffutils.html; + homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; description = "Commands for showing the differences between files (diff, cmp, etc.)"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/discount/default.nix b/nixpkgs/pkgs/tools/text/discount/default.nix index c1183d4c5a01..5a4dfd5de854 100644 --- a/nixpkgs/pkgs/tools/text/discount/default.nix +++ b/nixpkgs/pkgs/tools/text/discount/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of Markdown markup language in C"; - homepage = http://www.pell.portland.or.us/~orc/Code/discount/; + homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; maintainers = with maintainers; [ shell ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/ebook-tools/default.nix b/nixpkgs/pkgs/tools/text/ebook-tools/default.nix index 7dcd94e5363f..2a6af785692a 100644 --- a/nixpkgs/pkgs/tools/text/ebook-tools/default.nix +++ b/nixpkgs/pkgs/tools/text/ebook-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ebook-tools.sourceforge.net; + homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/text/enscript/default.nix b/nixpkgs/pkgs/tools/text/enscript/default.nix index 24ac649026af..670e052772ef 100644 --- a/nixpkgs/pkgs/tools/text/enscript/default.nix +++ b/nixpkgs/pkgs/tools/text/enscript/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/enscript/; + homepage = "https://www.gnu.org/software/enscript/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/text/epubcheck/default.nix b/nixpkgs/pkgs/tools/text/epubcheck/default.nix index 4e117ab7a481..914fe0067355 100644 --- a/nixpkgs/pkgs/tools/text/epubcheck/default.nix +++ b/nixpkgs/pkgs/tools/text/epubcheck/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/w3c/epubcheck; + homepage = "https://github.com/w3c/epubcheck"; description = "Validation tool for EPUB"; license = with licenses; [ asl20 bsd3 mpl10 w3c ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/esh/default.nix b/nixpkgs/pkgs/tools/text/esh/default.nix index 231a16bdc1b3..171d90026be8 100644 --- a/nixpkgs/pkgs/tools/text/esh/default.nix +++ b/nixpkgs/pkgs/tools/text/esh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple templating engine based on shell"; - homepage = https://github.com/jirutka/esh; + homepage = "https://github.com/jirutka/esh"; license = licenses.mit; maintainers = with maintainers; [ mnacamura ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/fanficfare/default.nix b/nixpkgs/pkgs/tools/text/fanficfare/default.nix index ac89b6af32a7..ac90b4d7792c 100644 --- a/nixpkgs/pkgs/tools/text/fanficfare/default.nix +++ b/nixpkgs/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.16.0"; + version = "3.17.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1l76fh23a9wmw47bahd5l1bxyqcy54lahvid373iy9p3586fskis"; + sha256 = "1h7kzlw516w9qk5vcn0rqibxbhvzbmxgnf9l6yjxj30x53ynrvzj"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/text/gawk/default.nix b/nixpkgs/pkgs/tools/text/gawk/default.nix index 0d5a50570f5f..58dea610c392 100644 --- a/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/gawk/; + homepage = "https://www.gnu.org/software/gawk/"; description = "GNU implementation of the Awk programming language"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/text/gist/default.nix b/nixpkgs/pkgs/tools/text/gist/default.nix index ebefae06c8ca..a4a26e139fb2 100644 --- a/nixpkgs/pkgs/tools/text/gist/default.nix +++ b/nixpkgs/pkgs/tools/text/gist/default.nix @@ -9,7 +9,7 @@ buildRubyGem rec { meta = with lib; { description = "Upload code to https://gist.github.com (or github enterprise)"; - homepage = http://defunkt.io/gist/; + homepage = "http://defunkt.io/gist/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; platforms = ruby.meta.platforms; diff --git a/nixpkgs/pkgs/tools/text/glogg/default.nix b/nixpkgs/pkgs/tools/text/glogg/default.nix index 6e9ff5170f2b..9dec057dfe9f 100644 --- a/nixpkgs/pkgs/tools/text/glogg/default.nix +++ b/nixpkgs/pkgs/tools/text/glogg/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' A multi-platform GUI application to browse and search through long or complex log files. It is designed with programmers and system administrators in mind. glogg can be seen as a graphical, interactive combination of grep and less. ''; - homepage = https://glogg.bonnefon.org/; + homepage = "https://glogg.bonnefon.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ c0bw3b ]; diff --git a/nixpkgs/pkgs/tools/text/gnugrep/default.nix b/nixpkgs/pkgs/tools/text/gnugrep/default.nix index 7608587e3c27..3f5c4d7d86cf 100644 --- a/nixpkgs/pkgs/tools/text/gnugrep/default.nix +++ b/nixpkgs/pkgs/tools/text/gnugrep/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/grep/; + homepage = "https://www.gnu.org/software/grep/"; description = "GNU implementation of the Unix grep command"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/text/gnupatch/default.nix b/nixpkgs/pkgs/tools/text/gnupatch/default.nix index 87a3c72f1653..8cca7f15962a 100644 --- a/nixpkgs/pkgs/tools/text/gnupatch/default.nix +++ b/nixpkgs/pkgs/tools/text/gnupatch/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { more original files, producing patched versions. ''; - homepage = https://savannah.gnu.org/projects/patch; + homepage = "https://savannah.gnu.org/projects/patch"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/text/gnused/422.nix b/nixpkgs/pkgs/tools/text/gnused/422.nix index 3a9856c3dd37..7ea637dc8c95 100644 --- a/nixpkgs/pkgs/tools/text/gnused/422.nix +++ b/nixpkgs/pkgs/tools/text/gnused/422.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnused-4.2.2"; src = fetchurl { - url = mirror://gnu/sed/sed-4.2.2.tar.bz2; + url = "mirror://gnu/sed/sed-4.2.2.tar.bz2"; sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "info" ]; meta = { - homepage = https://www.gnu.org/software/sed/; + homepage = "https://www.gnu.org/software/sed/"; description = "GNU sed, a batch stream editor"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/text/gnused/default.nix b/nixpkgs/pkgs/tools/text/gnused/default.nix index 953be5e07d66..d4da6f2c8ce8 100644 --- a/nixpkgs/pkgs/tools/text/gnused/default.nix +++ b/nixpkgs/pkgs/tools/text/gnused/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; meta = { - homepage = https://www.gnu.org/software/sed/; + homepage = "https://www.gnu.org/software/sed/"; description = "GNU sed, a batch stream editor"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/text/grin/default.nix b/nixpkgs/pkgs/tools/text/grin/default.nix index 837ec5b7a5ff..611507da75c7 100644 --- a/nixpkgs/pkgs/tools/text/grin/default.nix +++ b/nixpkgs/pkgs/tools/text/grin/default.nix @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication rec { buildInputs = with python2Packages; [ nose ]; meta = { - homepage = https://github.com/rkern/grin; + homepage = "https://github.com/rkern/grin"; description = "A grep program configured the way I like it"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.sjagoe ]; diff --git a/nixpkgs/pkgs/tools/text/groff/default.nix b/nixpkgs/pkgs/tools/text/groff/default.nix index 391e7543eca5..8c98a4aba465 100644 --- a/nixpkgs/pkgs/tools/text/groff/default.nix +++ b/nixpkgs/pkgs/tools/text/groff/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/groff/; + homepage = "https://www.gnu.org/software/groff/"; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/gtranslator/default.nix b/nixpkgs/pkgs/tools/text/gtranslator/default.nix index b871ac6ffaa0..ff5288f16316 100644 --- a/nixpkgs/pkgs/tools/text/gtranslator/default.nix +++ b/nixpkgs/pkgs/tools/text/gtranslator/default.nix @@ -13,6 +13,7 @@ , json-glib , gspell , glib +, libdazzle , gtk3 , gtksourceview4 , gnome3 @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05zvpx330h9k7b12p07bhcy47vq66260fmiph2b6h97xpl15rwmj"; + sha256 = "LaodO1m0o171TfCHNFsD4XA+clCB+drFQ1OSKKcVrdM="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { libxml2 glib gtk3 + libdazzle gtksourceview4 libgda libsoup @@ -64,7 +66,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME translation making program"; - homepage = https://wiki.gnome.org/Apps/Gtranslator; + homepage = "https://wiki.gnome.org/Apps/Gtranslator"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/gucci/default.nix b/nixpkgs/pkgs/tools/text/gucci/default.nix index 58f1768bfa1f..1667f2e45b54 100644 --- a/nixpkgs/pkgs/tools/text/gucci/default.nix +++ b/nixpkgs/pkgs/tools/text/gucci/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A simple CLI templating tool written in golang"; - homepage = https://github.com/noqcks/gucci; + homepage = "https://github.com/noqcks/gucci"; license = licenses.mit; maintainers = [ maintainers.braydenjw ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/highlight/default.nix b/nixpkgs/pkgs/tools/text/highlight/default.nix index 5f4855f29560..bc32a60c6727 100644 --- a/nixpkgs/pkgs/tools/text/highlight/default.nix +++ b/nixpkgs/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.55"; + version = "3.56"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "1cn8m2qk5vl5zcrmg0wlvj9wvpm0gdb5idh9bhh5b6pbl0hm93cr"; + sha256 = "1pilx58dg96zm0yx7i6k92vibwpvpj8ir39f2akrsyjgijnv3sx4"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/text/html-tidy/default.nix b/nixpkgs/pkgs/tools/text/html-tidy/default.nix index e31db4378507..28e1759fea59 100644 --- a/nixpkgs/pkgs/tools/text/html-tidy/default.nix +++ b/nixpkgs/pkgs/tools/text/html-tidy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { used to validate and fix HTML data. ''; license = licenses.libpng; # very close to it - the 3 clauses are identical - homepage = http://html-tidy.org; + homepage = "http://html-tidy.org"; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/nixpkgs/pkgs/tools/text/html2text/default.nix b/nixpkgs/pkgs/tools/text/html2text/default.nix index 194484755481..7cf276f2da3b 100644 --- a/nixpkgs/pkgs/tools/text/html2text/default.nix +++ b/nixpkgs/pkgs/tools/text/html2text/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "html2text-1.3.2a"; src = fetchurl { - url = http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz; + url = "http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz"; sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Convert HTML to plain text"; - homepage = http://www.mbayer.de/html2text/; + homepage = "http://www.mbayer.de/html2text/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eikek ]; diff --git a/nixpkgs/pkgs/tools/text/hyx/default.nix b/nixpkgs/pkgs/tools/text/hyx/default.nix index 70745266fe55..83fdabb8f46f 100644 --- a/nixpkgs/pkgs/tools/text/hyx/default.nix +++ b/nixpkgs/pkgs/tools/text/hyx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "minimalistic but powerful Linux console hex editor"; - homepage = https://yx7.cc/code/; + homepage = "https://yx7.cc/code/"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/icdiff/default.nix b/nixpkgs/pkgs/tools/text/icdiff/default.nix index 79bcf90718b1..15739432a19f 100644 --- a/nixpkgs/pkgs/tools/text/icdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/icdiff/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { }; meta = with stdenv.lib; { - homepage = https://www.jefftk.com/icdiff; + homepage = "https://www.jefftk.com/icdiff"; description = "Side-by-side highlighted command line diffs"; maintainers = with maintainers; [ aneeshusa ]; license = licenses.psfl; diff --git a/nixpkgs/pkgs/tools/text/invoice2data/default.nix b/nixpkgs/pkgs/tools/text/invoice2data/default.nix index 0e2e4cedfc22..78ab971f0c0d 100644 --- a/nixpkgs/pkgs/tools/text/invoice2data/default.nix +++ b/nixpkgs/pkgs/tools/text/invoice2data/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "Data extractor for PDF invoices"; - homepage = https://github.com/invoice-x/invoice2data; + homepage = "https://github.com/invoice-x/invoice2data"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/nixpkgs/pkgs/tools/text/jsawk/default.nix b/nixpkgs/pkgs/tools/text/jsawk/default.nix index c7f4002e2d3a..4f2ad403e365 100644 --- a/nixpkgs/pkgs/tools/text/jsawk/default.nix +++ b/nixpkgs/pkgs/tools/text/jsawk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Jsawk is like awk, but for JSON"; - homepage = https://github.com/micha/jsawk; + homepage = "https://github.com/micha/jsawk"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/jumanpp/default.nix b/nixpkgs/pkgs/tools/text/jumanpp/default.nix index 6be7106f2b95..ecadb4a89d8f 100644 --- a/nixpkgs/pkgs/tools/text/jumanpp/default.nix +++ b/nixpkgs/pkgs/tools/text/jumanpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { plausibility of word sequences by using a recurrent neural network language model (RNNLM). ''; - homepage = http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++; + homepage = "http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++"; license = licenses.asl20; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/nixpkgs/pkgs/tools/text/kdiff3/default.nix index d55ed89e633d..f41de9baffc0 100644 --- a/nixpkgs/pkgs/tools/text/kdiff3/default.nix +++ b/nixpkgs/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0vj3rw5w0kry2c1y8gv6hniam417w7k3ydb1dkf5xwr4iprw0xvq"; + sha256 = "0s5vsm1avzv88b6mf2pp20c2sz0srrj52iiqpnwi3p4ihivm8wgv"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -18,7 +18,7 @@ mkDerivation rec { propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; meta = with lib; { - homepage = http://kdiff3.sourceforge.net/; + homepage = "http://kdiff3.sourceforge.net/"; license = licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock index f4f16580c0cc..b50dc2fdbca0 100644 --- a/nixpkgs/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock +++ b/nixpkgs/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES kramdown-rfc2629 BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/text/kytea/default.nix b/nixpkgs/pkgs/tools/text/kytea/default.nix index 621408866e8c..b120d43287a5 100644 --- a/nixpkgs/pkgs/tools/text/kytea/default.nix +++ b/nixpkgs/pkgs/tools/text/kytea/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with stdenv.lib; { - homepage = http://www.phontron.com/kytea/; + homepage = "http://www.phontron.com/kytea/"; description = "General toolkit developed for analyzing text"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/text/mairix/default.nix b/nixpkgs/pkgs/tools/text/mairix/default.nix index e72824db6273..a2ae91e974b0 100644 --- a/nixpkgs/pkgs/tools/text/mairix/default.nix +++ b/nixpkgs/pkgs/tools/text/mairix/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.rc0.org.uk/mairix; + homepage = "http://www.rc0.org.uk/mairix"; license = stdenv.lib.licenses.gpl2Plus; description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/text/markdown-pp/default.nix b/nixpkgs/pkgs/tools/text/markdown-pp/default.nix index f479c221b65f..eaaa0547964d 100644 --- a/nixpkgs/pkgs/tools/text/markdown-pp/default.nix +++ b/nixpkgs/pkgs/tools/text/markdown-pp/default.nix @@ -3,7 +3,7 @@ with pythonPackages; buildPythonApplication rec { pname = "MarkdownPP"; - version = "1.4"; + version = "1.5.1"; propagatedBuildInputs = [ pillow watchdog ]; checkPhase = '' cd test @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "jreese"; repo = "markdown-pp"; rev = "v${version}"; - sha256 = "1xmc0cxvvf6jzr7p4f0hm8icysrd44sy2kgff9b99lr1agwkmysq"; + sha256 = "180i5wn9z6vdk2k2bh8345z3g80hj7zf5s2pq0h7k9vaxqpp7avc"; }; meta = with stdenv.lib; { description = "Preprocessor for Markdown files to generate a table of contents and other documentation needs"; diff --git a/nixpkgs/pkgs/tools/text/mawk/default.nix b/nixpkgs/pkgs/tools/text/mawk/default.nix index 8ad5cd16aafa..204d346082c3 100644 --- a/nixpkgs/pkgs/tools/text/mawk/default.nix +++ b/nixpkgs/pkgs/tools/text/mawk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interpreter for the AWK Programming Language"; - homepage = https://invisible-island.net/mawk/mawk.html; + homepage = "https://invisible-island.net/mawk/mawk.html"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/text/mdbook/default.nix b/nixpkgs/pkgs/tools/text/mdbook/default.nix index 09e0b24ab7ff..9ca92a21db1c 100644 --- a/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "07rpak233mi6ssqbpqsccn66a32jcgl90a5iyl2l5yyxw95rcya0"; + sha256 = "0a5i842aqa5xaii5lfrnks0ldavbhbd3bl4f2d442i1ahbin5b32"; }; - cargoSha256 = "0aanngwx7k86fb11zjx4wx954md446nn8667f2plr6bkqmlpxlkr"; + cargoSha256 = "1qx3447y684b7y18lgk9cc37if2ld42jnmy1kak191q6rjh5ssh7"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/nixpkgs/pkgs/tools/text/mdcat/default.nix b/nixpkgs/pkgs/tools/text/mdcat/default.nix index 9bb3d7469ef7..afd1a2990ff4 100644 --- a/nixpkgs/pkgs/tools/text/mdcat/default.nix +++ b/nixpkgs/pkgs/tools/text/mdcat/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "0qvlnjw0h2hnap1crnprdrynqvg7pywq32qin5fdkk4fv496wjhs"; + sha256 = "10svzq7656lynfcgnbyaibfvv48i4289ymxfc0bn0212biyrl1zb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "12s0dakv37vvvd43xzkydr7w3cpp7sizk8s1kalg4b0xz6ydghcp"; + cargoSha256 = "05nh3dfr7mdw21sdavyyjhr8sa4jcfqzwizbgg92ib7r834ir3m0"; checkInputs = [ ansi2html ]; checkPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "cat for markdown"; - homepage = https://github.com/lunaryorn/mdcat; + homepage = "https://github.com/lunaryorn/mdcat"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/mecab/base.nix b/nixpkgs/pkgs/tools/text/mecab/base.nix index e97980ef3d2d..181eb405cbd7 100644 --- a/nixpkgs/pkgs/tools/text/mecab/base.nix +++ b/nixpkgs/pkgs/tools/text/mecab/base.nix @@ -4,7 +4,7 @@ version = "0.996"; src = fetchurl { - url = https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE; + url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE"; name = "mecab-0.996.tar.gz"; sha256 = "0ncwlqxl1hdn1x4v4kr2sn1sbbcgnhdphp0lcvk74nqkhdbk4wz0"; }; diff --git a/nixpkgs/pkgs/tools/text/mecab/default.nix b/nixpkgs/pkgs/tools/text/mecab/default.nix index 0b7e7e86df1b..32060a6179a2 100644 --- a/nixpkgs/pkgs/tools/text/mecab/default.nix +++ b/nixpkgs/pkgs/tools/text/mecab/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (mecab-base // { meta = with stdenv.lib; { description = "Japanese morphological analysis system"; - homepage = http://taku910.github.io/mecab/; + homepage = "http://taku910.github.io/mecab/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ auntie ]; diff --git a/nixpkgs/pkgs/tools/text/mecab/ipadic.nix b/nixpkgs/pkgs/tools/text/mecab/ipadic.nix index 3b011787c7cb..026e385e7c2b 100644 --- a/nixpkgs/pkgs/tools/text/mecab/ipadic.nix +++ b/nixpkgs/pkgs/tools/text/mecab/ipadic.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2.7.0-20070801"; src = fetchurl { - url = https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM; + url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM"; name = "mecab-ipadic-2.7.0-20070801.tar.gz"; sha256 = "08rmkvj0f0x6jq0axrjw2y5nam0mavv6x77dp9v4al0wi1ym4bxn"; }; diff --git a/nixpkgs/pkgs/tools/text/mir-qualia/default.nix b/nixpkgs/pkgs/tools/text/mir-qualia/default.nix index 0a9b3777783b..f532daf8c442 100644 --- a/nixpkgs/pkgs/tools/text/mir-qualia/default.nix +++ b/nixpkgs/pkgs/tools/text/mir-qualia/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Dynamically enable sections of config files"; - homepage = https://github.com/darkfeline/mir.qualia; + homepage = "https://github.com/darkfeline/mir.qualia"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.srhb ] ; }; diff --git a/nixpkgs/pkgs/tools/text/mpage/default.nix b/nixpkgs/pkgs/tools/text/mpage/default.nix index 6665b377ccf5..e86c9f2ad266 100644 --- a/nixpkgs/pkgs/tools/text/mpage/default.nix +++ b/nixpkgs/pkgs/tools/text/mpage/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = "liberal"; # a non-copyleft license, see `Copyright' file - homepage = http://www.mesa.nl/pub/mpage/; + homepage = "http://www.mesa.nl/pub/mpage/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/text/multitran/data/default.nix b/nixpkgs/pkgs/tools/text/multitran/data/default.nix index d4b4902303b6..9b431f5b30bd 100644 --- a/nixpkgs/pkgs/tools/text/multitran/data/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/data/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "multitran-data-0.3"; src = fetchurl { - url = mirror://sourceforge/multitran/multitran-data.tar.bz2; + url = "mirror://sourceforge/multitran/multitran-data.tar.bz2"; sha256 = "9c2ff5027c2fe72b0cdf056311cd7543f447feb02b455982f20d4a3966b7828c"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran data english-russian"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix b/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix index ae4ece899a4c..9a7e0fdbd07f 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libbtree-0.0.1alpha2"; src = fetchurl { - url = mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2; + url = "mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2"; sha256 = "34a584e45058950337ff9342693b6739b52c3ce17e66440526c4bd6f9575802c"; }; patchPhase = '' @@ -11,7 +11,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: library for reading Multitran's BTREE database format"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix b/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix index 4470511f6163..f359819aa736 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libfacet-0.0.1alpha2"; src = fetchurl { - url = mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2; + url = "mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2"; sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: enchanced locale facets"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix b/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix index baccdfdedba5..2c03de6ede89 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmtquery-0.0.1alpha3"; src = fetchurl { - url = mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2; + url = "mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2"; sha256 = "e24c7c15772445f1b14871928d84dd03cf93bd88f9d2b2ed1bf0257c2cf2b15e"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: main engine to query translations"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix b/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix index 9b214e6b5027..bc5a77be4fb9 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmtsupport-0.0.1alpha2"; src = fetchurl { - url = mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2; + url = "mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2"; sha256 = "481f0f1ec15d7274f1e4eb93e7d060df10a181efd037eeff5e8056d283a9298b"; }; patchPhase = '' @@ -11,7 +11,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: basic useful functions"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix b/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix index ca65c567c661..9d701421d11c 100644 --- a/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mt-utils-0.0.1alpha3"; src = fetchurl { - url = mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2; + url = "mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2"; sha256 = "e407702c90c5272882386914e1eeca5f6c5039393af9a44538536b94867b0a0e"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran: simple command line utilities for dictionary maintenance"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/tools/text/namazu/default.nix b/nixpkgs/pkgs/tools/text/namazu/default.nix index 59cfc86efbf3..93fc9dc75de7 100644 --- a/nixpkgs/pkgs/tools/text/namazu/default.nix +++ b/nixpkgs/pkgs/tools/text/namazu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://namazu.org/; + homepage = "http://namazu.org/"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; diff --git a/nixpkgs/pkgs/tools/text/nawk/default.nix b/nixpkgs/pkgs/tools/text/nawk/default.nix index a746c4544350..57f036a47f0d 100644 --- a/nixpkgs/pkgs/tools/text/nawk/default.nix +++ b/nixpkgs/pkgs/tools/text/nawk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). ''; - homepage = https://www.cs.princeton.edu/~bwk/btl.mirror/; + homepage = "https://www.cs.princeton.edu/~bwk/btl.mirror/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.konimex ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/numdiff/default.nix b/nixpkgs/pkgs/tools/text/numdiff/default.nix index f7543dc0f70e..6e0c7e756493 100644 --- a/nixpkgs/pkgs/tools/text/numdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/numdiff/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { line by line and field by field, ignoring small numeric differences or/and different numeric formats ''; - homepage = https://www.nongnu.org/numdiff/; + homepage = "https://www.nongnu.org/numdiff/"; license = licenses.gpl3Plus; maintainers = with maintainers; []; platforms = platforms.gnu ++ platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/odt2txt/default.nix b/nixpkgs/pkgs/tools/text/odt2txt/default.nix index 69277d0412df..2a64533a459f 100644 --- a/nixpkgs/pkgs/tools/text/odt2txt/default.nix +++ b/nixpkgs/pkgs/tools/text/odt2txt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple .odt to .txt converter"; - homepage = https://github.com/dstosberg/odt2txt; + homepage = "https://github.com/dstosberg/odt2txt"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/nixpkgs/pkgs/tools/text/opencc/default.nix b/nixpkgs/pkgs/tools/text/opencc/default.nix index 07990aca92ad..54027de9acde 100644 --- a/nixpkgs/pkgs/tools/text/opencc/default.nix +++ b/nixpkgs/pkgs/tools/text/opencc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencc"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "BYVoid"; repo = "OpenCC"; rev = "ver.${version}"; - sha256 = "1pv5md225qwhbn8ql932zdg6gh1qlx3paiajaks8gfsa07yzvhr4"; + sha256 = "1ygj2ygxsva72hs6cm0a6wdd2rp71k4nm0pd7cb20y2srdlzvdqk"; }; nativeBuildInputs = [ cmake python ]; diff --git a/nixpkgs/pkgs/tools/text/papertrail/Gemfile.lock b/nixpkgs/pkgs/tools/text/papertrail/Gemfile.lock index 0d1b2a6fbe6d..37cd23eab6f5 100644 --- a/nixpkgs/pkgs/tools/text/papertrail/Gemfile.lock +++ b/nixpkgs/pkgs/tools/text/papertrail/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES papertrail BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/text/papertrail/default.nix b/nixpkgs/pkgs/tools/text/papertrail/default.nix index d20727f725a2..d635fab74d5a 100644 --- a/nixpkgs/pkgs/tools/text/papertrail/default.nix +++ b/nixpkgs/pkgs/tools/text/papertrail/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Command-line client for Papertrail log management service"; - homepage = https://github.com/papertrail/papertrail-cli/; + homepage = "https://github.com/papertrail/papertrail-cli/"; license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; platforms = ruby.meta.platforms; diff --git a/nixpkgs/pkgs/tools/text/par/default.nix b/nixpkgs/pkgs/tools/text/par/default.nix index 88325c38731d..54b5e6566e87 100644 --- a/nixpkgs/pkgs/tools/text/par/default.nix +++ b/nixpkgs/pkgs/tools/text/par/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.52"; src = fetchurl { - url = http://www.nicemice.net/par/Par152.tar.gz; + url = "http://www.nicemice.net/par/Par152.tar.gz"; sha256 = "33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { - homepage = http://www.nicemice.net/par/; + homepage = "http://www.nicemice.net/par/"; description = "Paragraph reflow for email"; platforms = platforms.unix; # See https://fedoraproject.org/wiki/Licensing/Par for license details diff --git a/nixpkgs/pkgs/tools/text/patchutils/generic.nix b/nixpkgs/pkgs/tools/text/patchutils/generic.nix index 9d7ac4b53f05..52961e58c0ee 100644 --- a/nixpkgs/pkgs/tools/text/patchutils/generic.nix +++ b/nixpkgs/pkgs/tools/text/patchutils/generic.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to manipulate patch files"; - homepage = http://cyberelk.net/tim/software/patchutils; + homepage = "http://cyberelk.net/tim/software/patchutils"; license = licenses.gpl2Plus; platforms = platforms.all; executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff" diff --git a/nixpkgs/pkgs/tools/text/peco/default.nix b/nixpkgs/pkgs/tools/text/peco/default.nix index 9407e68ed165..c5655cb2a585 100644 --- a/nixpkgs/pkgs/tools/text/peco/default.nix +++ b/nixpkgs/pkgs/tools/text/peco/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Simplistic interactive filtering tool"; - homepage = https://github.com/peco/peco; + homepage = "https://github.com/peco/peco"; license = licenses.mit; # peco should work on Windows or other POSIX platforms, but the go package # declares only linux and darwin. diff --git a/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix b/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix index 342377b85aea..53aa9ac7b76d 100644 --- a/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix +++ b/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/monochromegane/the_platinum_searcher; + homepage = "https://github.com/monochromegane/the_platinum_searcher"; description = "A code search tool similar to ack and the_silver_searcher(ag)."; platforms = platforms.all; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/text/podiff/default.nix b/nixpkgs/pkgs/tools/text/podiff/default.nix index a71ef2f06bd0..bee2c7a1a8f8 100644 --- a/nixpkgs/pkgs/tools/text/podiff/default.nix +++ b/nixpkgs/pkgs/tools/text/podiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Finds differences in translations between two PO files, or revisions"; - homepage = http://puszcza.gnu.org.ua/software/podiff; + homepage = "http://puszcza.gnu.org.ua/software/podiff"; license = licenses.gpl3Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/poedit/default.nix b/nixpkgs/pkgs/tools/text/poedit/default.nix index e0e7f5d957da..767569e42c20 100644 --- a/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform gettext catalogs (.po files) editor"; - homepage = https://www.poedit.net/; + homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ domenkozar genesis ]; diff --git a/nixpkgs/pkgs/tools/text/popfile/default.nix b/nixpkgs/pkgs/tools/text/popfile/default.nix index 5e76e3541733..b7134ba73564 100644 --- a/nixpkgs/pkgs/tools/text/popfile/default.nix +++ b/nixpkgs/pkgs/tools/text/popfile/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "An email classification system that automatically sorts messages and fights spam"; - homepage = http://getpopfile.org; + homepage = "http://getpopfile.org"; license = stdenv.lib.licenses.gpl2; # Should work on macOS, but havent tested it. diff --git a/nixpkgs/pkgs/tools/text/proselint/default.nix b/nixpkgs/pkgs/tools/text/proselint/default.nix index 27e9c80bc7d5..36a68f9406d3 100644 --- a/nixpkgs/pkgs/tools/text/proselint/default.nix +++ b/nixpkgs/pkgs/tools/text/proselint/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A linter for prose"; - homepage = http://proselint.com; + homepage = "http://proselint.com"; license = licenses.bsd3; maintainers = with maintainers; [ alibabzo ]; }; diff --git a/nixpkgs/pkgs/tools/text/qgrep/default.nix b/nixpkgs/pkgs/tools/text/qgrep/default.nix index c45398e31a1f..30873e89d1bf 100644 --- a/nixpkgs/pkgs/tools/text/qgrep/default.nix +++ b/nixpkgs/pkgs/tools/text/qgrep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast regular expression grep for source code with incremental index updates"; - homepage = https://github.com/zeux/qgrep; + homepage = "https://github.com/zeux/qgrep"; license = licenses.mit; maintainers = [ maintainers.yrashk ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/qprint/default.nix b/nixpkgs/pkgs/tools/text/qprint/default.nix index 8f998e3a26d2..d616d15ad75b 100644 --- a/nixpkgs/pkgs/tools/text/qprint/default.nix +++ b/nixpkgs/pkgs/tools/text/qprint/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.fourmilab.ch/webtools/qprint/; + homepage = "http://www.fourmilab.ch/webtools/qprint/"; license = stdenv.lib.licenses.publicDomain; description = "Encode and decode Quoted-Printable files"; maintainers = [ stdenv.lib.maintainers.tv ]; diff --git a/nixpkgs/pkgs/tools/text/qshowdiff/default.nix b/nixpkgs/pkgs/tools/text/qshowdiff/default.nix index 9cf9349badb2..bb2eeee8a9e2 100644 --- a/nixpkgs/pkgs/tools/text/qshowdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/qshowdiff/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://qshowdiff.danfis.cz/; + homepage = "http://qshowdiff.danfis.cz/"; description = "Colourful diff viewer"; license = stdenv.lib.licenses.gpl3Plus; }; diff --git a/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock b/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock index 0ede7e2a2564..94f0f8f506c2 100644 --- a/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock +++ b/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES reckon BUNDLED WITH - 1.12.5 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/text/recode/default.nix b/nixpkgs/pkgs/tools/text/recode/default.nix index e1c3d87bdcbc..b562c92679b2 100644 --- a/nixpkgs/pkgs/tools/text/recode/default.nix +++ b/nixpkgs/pkgs/tools/text/recode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://github.com/rrthomas/recode; + homepage = "https://github.com/rrthomas/recode"; description = "Converts files between various character sets and usages"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/text/replace/default.nix b/nixpkgs/pkgs/tools/text/replace/default.nix index 3549e7c1c943..009c3dcd8c58 100644 --- a/nixpkgs/pkgs/tools/text/replace/default.nix +++ b/nixpkgs/pkgs/tools/text/replace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "replace-2.24"; src = fetchurl { - url = ftp://hpux.connect.org.uk/hpux/Users/replace-2.24/replace-2.24-src-11.11.tar.gz; + url = "ftp://hpux.connect.org.uk/hpux/Users/replace-2.24/replace-2.24-src-11.11.tar.gz"; sha256 = "1c2nkxx83vmlh1v3ib6r2xqh121gdb1rharwsimcb2h0xwc558dm"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { patches = [./malloc.patch]; meta = { - homepage = https://replace.richardlloyd.org.uk/; + homepage = "https://replace.richardlloyd.org.uk/"; description = "A tool to replace verbatim strings"; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix b/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix index 5d02e6225be7..dcce9bf32911 100644 --- a/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix +++ b/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "phiresky"; repo = pname; - rev = version; - sha256 = "0fxvnd8qflzvqz2181njdhpbr4wdvd1jc6lcw38c3pknk9h3ymq9"; + rev = "v${version}"; + sha256 = "1nl03i36ilhxn5xbcry6pcr7vbl5667m43flpxaa0lf1wijzn5c2"; }; - cargoSha256 = "1ajj1glc9c1scnryyil7qg05gvyn1pk8dl2ivmv5h74vx0x8n0rv"; + cargoSha256 = "0ndyd8qrvljkk6yvpsp0w17iizxb529sh5q2bj790m32x0gz2w8l"; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { a multitude of file types. rga wraps the awesome ripgrep and enables it to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc. ''; - homepage = https://github.com/phiresky/ripgrep-all; + homepage = "https://github.com/phiresky/ripgrep-all"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ zaninime ma27 ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/nixpkgs/pkgs/tools/text/ripgrep/default.nix index d90537bd5533..c794b4ba33c7 100644 --- a/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.0.0"; + version = "12.0.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "0n4169l662fvg6r4rcfs8n8f92rxndlaqb7k4x63680mra470dbi"; + sha256 = "1c0v51s05kbg9825n6mvpizhkkgz38wl7hp8f3vzbjfg4i8l8wb0"; }; - cargoSha256 = "01zi9zqdjsgc3im9na511n6w2bmqvm46wryh10fhzc9fnkziqmq3"; + cargoSha256 = "0i8x2xgri8f8mzrlkc8l2yzcgczl35nw4bmwg09d343mjkmk6d8y"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; diff --git a/nixpkgs/pkgs/tools/text/rosie/default.nix b/nixpkgs/pkgs/tools/text/rosie/default.nix new file mode 100644 index 000000000000..4f70f972b683 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/rosie/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, lib +, fetchgit +, libbsd +, readline +}: + +stdenv.mkDerivation rec { + pname = "rosie"; + version = "unstable-2020-01-11"; + src = fetchgit { + url = "https://gitlab.com/rosie-pattern-language/rosie"; + rev = "670e9027563609ba2ea31e14e2621a1302742795"; + sha256 = "0jc512dbn62a1fniknhbp6q0xa1p7xi3hn5v60is8sy9jgi3afxv"; + fetchSubmodules = true; + }; + + postUnpack = '' + # The Makefile calls git to update submodules, unless this file exists + touch ${src.name}/submodules/~~present~~ + ''; + + preConfigure = '' + patchShebangs src/build_info.sh + # Part of the same Makefile target which calls git to update submodules + ln -s src submodules/lua/include + ''; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp $out/share/vim-plugins $out/share/nvim + mv $out/lib/rosie/extra/extra/emacs/* $out/share/emacs/site-lisp/ + mv $out/lib/rosie/extra/extra/vim $out/share/vim-plugins/rosie + ln -s $out/share/vim-plugins/rosie $out/share/nvim/site + ''; + + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; + + buildInputs = [ libbsd readline ]; + + meta = with lib; { + homepage = "https://rosie-lang.org"; + description = "Tools for searching using parsing expression grammars"; + license = licenses.mit; + maintainers = with maintainers; [ kovirobi ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/nixpkgs/pkgs/tools/text/rs/default.nix b/nixpkgs/pkgs/tools/text/rs/default.nix new file mode 100644 index 000000000000..bd141f491d41 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/rs/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, libbsd }: + +stdenv.mkDerivation rec { + pname = "rs"; + version = "20200313"; + + src = fetchurl { + url = "https://www.mirbsd.org/MirOS/dist/mir/rs/${pname}-${version}.tar.gz"; + sha256 = "0gxwlfk7bzivpp2260w2r6gkyl7vdi05cggn1fijfnp8kzf1b4li"; + }; + + buildInputs = [ libbsd ]; + + buildPhase = '' + ${stdenv.cc}/bin/cc utf8.c rs.c -o rs -lbsd + ''; + + installPhase = '' + install -Dm 755 rs -t $out/bin + install -Dm 644 rs.1 -t $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Reshape a data array from standard input"; + longDescription = '' + rs reads the standard input, interpreting each line as a row of blank- + separated entries in an array, transforms the array according to the op- + tions, and writes it on the standard output. With no arguments (argc < 2) + it transforms stream input into a columnar format convenient for terminal + viewing, i.e. if the length (in bytes!) of the first line is smaller than + the display width, -et is implied, -t otherwise. + + The shape of the input array is deduced from the number of lines and the + number of columns on the first line. If that shape is inconvenient, a more + useful one might be obtained by skipping some of the input with the -k + option. Other options control interpretation of the input columns. + + The shape of the output array is influenced by the rows and cols specifi- + cations, which should be positive integers. If only one of them is a po- + sitive integer, rs computes a value for the other which will accommodate + all of the data. When necessary, missing data are supplied in a manner + specified by the options and surplus data are deleted. There are options + to control presentation of the output columns, including transposition of + the rows and columns. + ''; + + homepage = "https://www.mirbsd.org/htman/i386/man1/rs.htm"; + license = licenses.bsd3; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/text/rst2html5/default.nix b/nixpkgs/pkgs/tools/text/rst2html5/default.nix index 83ac2d4d766d..d20ce99dd74e 100644 --- a/nixpkgs/pkgs/tools/text/rst2html5/default.nix +++ b/nixpkgs/pkgs/tools/text/rst2html5/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec { [ docutils genshi pygments beautifulsoup4 ]; meta = with stdenv.lib;{ - homepage = https://bitbucket.org/andre_felipe_dias/rst2html5; + homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5"; description = "Converts ReSTructuredText to (X)HTML5"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix b/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix index c39538408362..965d23d0c44b 100644 --- a/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix +++ b/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix @@ -10,7 +10,7 @@ bundlerEnv { meta = with lib; { description = "Quickly open CLI search results in your favorite editor!"; - homepage = https://gitlab.com/mjwhitta/zoom; + homepage = "https://gitlab.com/mjwhitta/zoom"; license = with licenses; gpl3; maintainers = with maintainers; [ vmandela nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/sd/default.nix b/nixpkgs/pkgs/tools/text/sd/default.nix index 1b6e4d945d42..a12f07d6da61 100644 --- a/nixpkgs/pkgs/tools/text/sd/default.nix +++ b/nixpkgs/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.6.5"; + version = "0.7.2"; src = fetchFromGitHub { owner = "chmln"; repo = pname; - rev = version; - sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj"; + rev = "v${version}"; + sha256 = "15siv3p22v7lj37b74pjsy360qx97d40q2xdzdg2srbi8svjgg27"; }; - cargoSha256 = "0n4c0snmjfyk3z2mbzpqgb6ggyv4nqszdda035g3rzpbavzx9xb5"; + cargoSha256 = "1sa7ki7kyg98l2gcrdzk7182ghm1clyqljjb596mhzh48g8kddn5"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/tools/text/sgml/jade/default.nix b/nixpkgs/pkgs/tools/text/sgml/jade/default.nix index 2cc40510121b..f4110ed21052 100644 --- a/nixpkgs/pkgs/tools/text/sgml/jade/default.nix +++ b/nixpkgs/pkgs/tools/text/sgml/jade/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "James Clark's DSSSL Engine"; license = "custom"; - homepage = http://www.jclark.com/jade/; + homepage = "http://www.jclark.com/jade/"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; }; diff --git a/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix b/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix index cf3b2bad6c99..eee5d005c058 100644 --- a/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix +++ b/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; license = stdenv.lib.licenses.mit; - homepage = http://openjade.sourceforge.net/; + homepage = "http://openjade.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix b/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix index ade640dac7a9..9880564d9692 100644 --- a/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix +++ b/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "opensp-1.5.2"; src = fetchurl { - url = mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz; + url = "mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz"; sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { description = "A suite of SGML/XML processing tools"; license = stdenv.lib.licenses.mit; - homepage = http://openjade.sourceforge.net/; + homepage = "http://openjade.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/text/shab/default.nix b/nixpkgs/pkgs/tools/text/shab/default.nix index 02d2d545122a..b5bb98e5f4d2 100644 --- a/nixpkgs/pkgs/tools/text/shab/default.nix +++ b/nixpkgs/pkgs/tools/text/shab/default.nix @@ -41,7 +41,7 @@ let meta = with lib; { description = "The bash templating language"; - homepage = https://github.com/zimbatm/shab; + homepage = "https://github.com/zimbatm/shab"; license = licenses.unlicense; maintainers = with maintainers; [ zimbatm ]; platforms = bash.meta.platforms; diff --git a/nixpkgs/pkgs/tools/text/shfmt/default.nix b/nixpkgs/pkgs/tools/text/shfmt/default.nix index 265141ad534c..71f79724b9cb 100644 --- a/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "shfmt"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1q0gazh87y7sl5sl5m046a83d64aas9xnbg2d1d1h2vwcqdaccp2"; + sha256 = "1k0bq4b4rv6wrh24jvcnpg1mfqrzqhl90zg4zibxzv3zkhjdskzh"; }; - modSha256 = "1ll2cxhgf8hh19wzdykgc81c4yfcp8bzmfaif08nvvb63rhjdb5y"; + modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z"; subPackages = ["cmd/shfmt"]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with lib; { homepage = "https://github.com/mvdan/sh"; description = "A shell parser and formatter"; diff --git a/nixpkgs/pkgs/tools/text/shocco/default.nix b/nixpkgs/pkgs/tools/text/shocco/default.nix index f657df5b780b..65adfc29b95a 100644 --- a/nixpkgs/pkgs/tools/text/shocco/default.nix +++ b/nixpkgs/pkgs/tools/text/shocco/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A quick-and-dirty, literate-programming-style documentation generator for / in POSIX shell"; - homepage = https://rtomayko.github.io/shocco/; + homepage = "https://rtomayko.github.io/shocco/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ dotlambda ]; diff --git a/nixpkgs/pkgs/tools/text/sift/default.nix b/nixpkgs/pkgs/tools/text/sift/default.nix index c2a4cf22ea6d..830810a84c43 100644 --- a/nixpkgs/pkgs/tools/text/sift/default.nix +++ b/nixpkgs/pkgs/tools/text/sift/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with lib; { description = "sift is a fast and powerful alternative to grep"; - homepage = https://sift-tool.org; + homepage = "https://sift-tool.org"; maintainers = [ maintainers.carlsverre ]; license = licenses.gpl3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/silver-searcher/default.nix b/nixpkgs/pkgs/tools/text/silver-searcher/default.nix index 2c28f9ea5a56..51003694203f 100644 --- a/nixpkgs/pkgs/tools/text/silver-searcher/default.nix +++ b/nixpkgs/pkgs/tools/text/silver-searcher/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcre zlib lzma ]; meta = with stdenv.lib; { - homepage = https://github.com/ggreer/the_silver_searcher/; + homepage = "https://github.com/ggreer/the_silver_searcher/"; description = "A code-searching tool similar to ack, but faster"; maintainers = with maintainers; [ madjar ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/nixpkgs/pkgs/tools/text/snippetpixie/default.nix index e273105a14a5..d2116ced5e28 100644 --- a/nixpkgs/pkgs/tools/text/snippetpixie/default.nix +++ b/nixpkgs/pkgs/tools/text/snippetpixie/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { For example:- "spr`" expands to "Snippet Pixie rules!" ''; - homepage = https://www.snippetpixie.com; + homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ianmjones diff --git a/nixpkgs/pkgs/tools/text/source-highlight/default.nix b/nixpkgs/pkgs/tools/text/source-highlight/default.nix index 8e937fe8518b..7052d9e5a44a 100644 --- a/nixpkgs/pkgs/tools/text/source-highlight/default.nix +++ b/nixpkgs/pkgs/tools/text/source-highlight/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Source code renderer with syntax highlighting"; - homepage = https://www.gnu.org/software/src-highlite/; + homepage = "https://www.gnu.org/software/src-highlite/"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux ++ darwin; longDescription = diff --git a/nixpkgs/pkgs/tools/text/tab/default.nix b/nixpkgs/pkgs/tools/text/tab/default.nix index b7855bc75325..f7796c8a3291 100644 --- a/nixpkgs/pkgs/tools/text/tab/default.nix +++ b/nixpkgs/pkgs/tools/text/tab/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming language/shell calculator"; - homepage = https://tkatchev.bitbucket.io/tab/; + homepage = "https://tkatchev.bitbucket.io/tab/"; license = licenses.boost; maintainers = with maintainers; [ mstarzyk ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/tools/text/txt2tags/default.nix b/nixpkgs/pkgs/tools/text/txt2tags/default.nix index 100124043ed7..f70ad1710e29 100644 --- a/nixpkgs/pkgs/tools/text/txt2tags/default.nix +++ b/nixpkgs/pkgs/tools/text/txt2tags/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://txt2tags.org/; + homepage = "https://txt2tags.org/"; description = "A KISS markup language"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; diff --git a/nixpkgs/pkgs/tools/text/uni2ascii/default.nix b/nixpkgs/pkgs/tools/text/uni2ascii/default.nix index ccf17695f6cd..d6b1215caf39 100644 --- a/nixpkgs/pkgs/tools/text/uni2ascii/default.nix +++ b/nixpkgs/pkgs/tools/text/uni2ascii/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl3; - homepage = http://billposer.org/Software/uni2ascii.html; + homepage = "http://billposer.org/Software/uni2ascii.html"; description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/text/unoconv/default.nix b/nixpkgs/pkgs/tools/text/unoconv/default.nix index ea90f5771207..f4ee581d11d7 100644 --- a/nixpkgs/pkgs/tools/text/unoconv/default.nix +++ b/nixpkgs/pkgs/tools/text/unoconv/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert between any document format supported by LibreOffice/OpenOffice"; - homepage = http://dag.wieers.com/home-made/unoconv/; + homepage = "http://dag.wieers.com/home-made/unoconv/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/text/unrtf/default.nix b/nixpkgs/pkgs/tools/text/unrtf/default.nix index 93611ec5531d..752d576701ee 100644 --- a/nixpkgs/pkgs/tools/text/unrtf/default.nix +++ b/nixpkgs/pkgs/tools/text/unrtf/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { UnRTF converts documents in Rich Text Format to other formats, including HTML, LaTeX, and RTF itself. ''; - homepage = https://www.gnu.org/software/unrtf/; + homepage = "https://www.gnu.org/software/unrtf/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ joachifm ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/untex/default.nix b/nixpkgs/pkgs/tools/text/untex/default.nix index f9c7e3cdfc63..829c4da38493 100644 --- a/nixpkgs/pkgs/tools/text/untex/default.nix +++ b/nixpkgs/pkgs/tools/text/untex/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility which removes LaTeX commands from input"; - homepage = https://www.ctan.org/pkg/untex; + homepage = "https://www.ctan.org/pkg/untex"; license = licenses.gpl1; maintainers = with maintainers; [ joachifm ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/wdiff/default.nix b/nixpkgs/pkgs/tools/text/wdiff/default.nix index 001ed1addaad..bec7ba8825dd 100644 --- a/nixpkgs/pkgs/tools/text/wdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/wdiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { checkInputs = [ which ]; meta = { - homepage = https://www.gnu.org/software/wdiff/; + homepage = "https://www.gnu.org/software/wdiff/"; description = "Comparing files on a word by word basis"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/nixpkgs/pkgs/tools/text/wgetpaste/default.nix b/nixpkgs/pkgs/tools/text/wgetpaste/default.nix index 3360fd4cbe09..9180573541d2 100644 --- a/nixpkgs/pkgs/tools/text/wgetpaste/default.nix +++ b/nixpkgs/pkgs/tools/text/wgetpaste/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface to various pastebins"; - homepage = http://wgetpaste.zlin.dk/; + homepage = "http://wgetpaste.zlin.dk/"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/text/xidel/default.nix b/nixpkgs/pkgs/tools/text/xidel/default.nix index 92ad2e005884..fabfdd857107 100644 --- a/nixpkgs/pkgs/tools/text/xidel/default.nix +++ b/nixpkgs/pkgs/tools/text/xidel/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line tool to download and extract data from html/xml pages"; - homepage = http://videlibri.sourceforge.net/xidel.html; + homepage = "http://videlibri.sourceforge.net/xidel.html"; # source contains no license info (AFAICS), but sourceforge says GPLv2 license = licenses.gpl2; # more platforms will be supported when we switch to source build diff --git a/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 704ccede799b..4dcaed16bb84 100644 --- a/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { highly interactive front-end (basexgui). Apart from two local standalone modes, BaseX offers a client/server architecture. ''; - homepage = http://basex.org/; + homepage = "http://basex.org/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix b/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix index 7ac624caff18..c42ecfc24410 100644 --- a/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities for manipulating HTML and XML files"; - homepage = http://www.w3.org/Tools/HTML-XML-utils/; + homepage = "http://www.w3.org/Tools/HTML-XML-utils/"; license = licenses.w3c; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix index b38c2b3e34de..dcf83c736cc4 100644 --- a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com # for downloads and call it the "project site". - homepage = https://www.thaiopensource.com/relaxng/trang.html; + homepage = "https://www.thaiopensource.com/relaxng/trang.html"; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/nixpkgs/pkgs/tools/text/xml/rnv/default.nix b/nixpkgs/pkgs/tools/text/xml/rnv/default.nix index 21869cef4ee4..2bc1b6ddddac 100644 --- a/nixpkgs/pkgs/tools/text/xml/rnv/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/rnv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Relax NG Compact Syntax validator"; - homepage = http://www.davidashen.net/rnv.html; + homepage = "http://www.davidashen.net/rnv.html"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/text/xml/rxp/default.nix b/nixpkgs/pkgs/tools/text/xml/rxp/default.nix index 093f1b0aec7f..c0e2ea1c4e25 100644 --- a/nixpkgs/pkgs/tools/text/xml/rxp/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/rxp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2Plus; description = "A validating XML parser written in C"; - homepage = http://www.cogsci.ed.ac.uk/~richard/rxp.html; + homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix index 3be952358b65..8c341855e687 100644 --- a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xml2-0.5"; src = fetchurl { - url = https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz; + url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz"; sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libxml2 ]; meta = with stdenv.lib; { - homepage = https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2; + homepage = "https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2"; description = "Tools for command line processing of XML, HTML, and CSV"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/xml/xmloscopy/default.nix b/nixpkgs/pkgs/tools/text/xml/xmloscopy/default.nix index 5d085e411963..2cd7a580ee34 100644 --- a/nixpkgs/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xmloscopy/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "wtf is my docbook broken?"; - homepage = https://github.com/grahamc/xmloscopy; + homepage = "https://github.com/grahamc/xmloscopy"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ grahamc ]; diff --git a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix index 4fe6ad6b3dc9..7d3471f9561c 100644 --- a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; - homepage = http://xmlstar.sourceforge.net/; + homepage = "http://xmlstar.sourceforge.net/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/text/xml/xpf/default.nix b/nixpkgs/pkgs/tools/text/xml/xpf/default.nix index b35053d362bb..6999a4a64d03 100644 --- a/nixpkgs/pkgs/tools/text/xml/xpf/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xpf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xpf-0.2"; src = fetchurl { - url = http://tarballs.nixos.org/xpf-0.2.tar.gz; + url = "http://tarballs.nixos.org/xpf-0.2.tar.gz"; sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "XML Pipes and Filters - command line tools for manipulating and querying XML data"; - homepage = http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters; + homepage = "http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/text/xsv/default.nix b/nixpkgs/pkgs/tools/text/xsv/default.nix index 72a586d2b22d..927d0d14be68 100644 --- a/nixpkgs/pkgs/tools/text/xsv/default.nix +++ b/nixpkgs/pkgs/tools/text/xsv/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A fast CSV toolkit written in Rust"; - homepage = https://github.com/BurntSushi/xsv; + homepage = "https://github.com/BurntSushi/xsv"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.jgertm ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/text/xurls/default.nix b/nixpkgs/pkgs/tools/text/xurls/default.nix index c8d10a6e2699..30cc825c6627 100644 --- a/nixpkgs/pkgs/tools/text/xurls/default.nix +++ b/nixpkgs/pkgs/tools/text/xurls/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Extract urls from text"; - homepage = https://github.com/mvdan/xurls; + homepage = "https://github.com/mvdan/xurls"; maintainers = with maintainers; [ koral ]; platforms = platforms.unix; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/text/yaml-merge/default.nix b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix index 95a94cee7c4b..b91d24e1137d 100644 --- a/nixpkgs/pkgs/tools/text/yaml-merge/default.nix +++ b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Merge YAML data files"; - homepage = https://github.com/abbradar/yaml-merge; + homepage = "https://github.com/abbradar/yaml-merge"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/text/zimreader/default.nix b/nixpkgs/pkgs/tools/text/zimreader/default.nix index 177f9326dd27..0b947ee5db36 100644 --- a/nixpkgs/pkgs/tools/text/zimreader/default.nix +++ b/nixpkgs/pkgs/tools/text/zimreader/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "A tool to serve ZIM files using HTTP"; - homepage = http://git.wikimedia.org/log/openzim; + homepage = "http://git.wikimedia.org/log/openzim"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ robbinch juliendehos ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix b/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix index 27334bf09b4c..8362280c2fa2 100644 --- a/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix +++ b/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A console tool to create ZIM files"; - homepage = http://git.wikimedia.org/log/openzim; + homepage = "http://git.wikimedia.org/log/openzim"; maintainers = with stdenv.lib.maintainers; [ robbinch ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; [ linux ]; diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix index 44c5f6d1f242..136c25f73b15 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix @@ -273,7 +273,7 @@ stdenv.mkDerivation rec { the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user. ''; - homepage = http://www.methods.co.nz/asciidoc/; + homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 02081e117d6e..c928e9548754 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -93,4 +93,4 @@ DEPENDENCIES rouge BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix index 20bbe782d91d..f875cc26311b 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix @@ -30,7 +30,7 @@ let meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; - homepage = https://asciidoctor.org/; + homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ gpyh nicknovitski ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix index 39e7eab34abb..80b99284e491 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { structure of a parsed AsciiDoc document from Java and other JVM languages. ''; - homepage = https://asciidoctor.org/docs/asciidoctorj/; + homepage = "https://asciidoctor.org/docs/asciidoctorj/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; diff --git a/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix b/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix index 5763a059d4b7..d0e2c79c0bce 100644 --- a/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bibclean"; - version = "3.03"; + version = "3.04"; src = fetchurl { url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz"; - sha256 = "06ic9zix8gh1wz7hd1cnlxxyrp7sqs67a7xnv08r71b5ikri35a3"; + sha256 = "0n5jb6w86y91q5lkcc9sb1kh4c2bk3q2va24gfr0n6v1jzyqp9jg"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix b/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix index cb667e6b1218..4e76fb87a6bd 100644 --- a/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Convert DjVu files to PDF files"; - homepage = https://0x2a.at/s/projects/djvu2pdf; + homepage = "https://0x2a.at/s/projects/djvu2pdf"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; inherit version; diff --git a/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix b/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix index 7200909660bd..d846d9394b26 100644 --- a/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these documents are XML based. ''; - homepage = http://open.comsultia.com/docbook2odf/; + homepage = "http://open.comsultia.com/docbook2odf/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix b/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix index 5309e4555b49..a36da7a2b6ae 100644 --- a/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { format. ''; license = licenses.mit; - homepage = http://docbook2x.sourceforge.net/; + homepage = "http://docbook2x.sourceforge.net/"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/typesetting/docbookrx/Gemfile.lock b/nixpkgs/pkgs/tools/typesetting/docbookrx/Gemfile.lock index e1fbc2c94464..423fac6c30a9 100644 --- a/nixpkgs/pkgs/tools/typesetting/docbookrx/Gemfile.lock +++ b/nixpkgs/pkgs/tools/typesetting/docbookrx/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES nokogiri (~> 1.8.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/typesetting/docbookrx/default.nix b/nixpkgs/pkgs/tools/typesetting/docbookrx/default.nix index 484e98fc88cb..6bfb0188a3a8 100644 --- a/nixpkgs/pkgs/tools/typesetting/docbookrx/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/docbookrx/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby."; - homepage = https://asciidoctor.org/; + homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/typesetting/fop/default.nix b/nixpkgs/pkgs/tools/typesetting/fop/default.nix index 0b5c79756bd6..d5dea2c6dc6f 100644 --- a/nixpkgs/pkgs/tools/typesetting/fop/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/fop/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { This package contains the fop command line tool. ''; - homepage = https://xmlgraphics.apache.org/fop/; + homepage = "https://xmlgraphics.apache.org/fop/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; diff --git a/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix b/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix index c214bd3cac7e..d969ca8fec6f 100644 --- a/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View diff on LaTeX source files on the generated PDF files"; - homepage = https://gitlab.com/git-latexdiff/git-latexdiff; + homepage = "https://gitlab.com/git-latexdiff/git-latexdiff"; maintainers = [ ]; license = licenses.bsd3; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9 platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/typesetting/halibut/default.nix b/nixpkgs/pkgs/tools/typesetting/halibut/default.nix index f0ed44351a20..d2779df0c944 100644 --- a/nixpkgs/pkgs/tools/typesetting/halibut/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/halibut/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Documentation production system for software manuals"; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/halibut/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/halibut/"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/typesetting/hevea/default.nix b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix index d5ede51ba0c3..f3f634eb944c 100644 --- a/nixpkgs/pkgs/tools/typesetting/hevea/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.33"; + name = "hevea-2.34"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "0115bn6n6hhb08rmj0m508wjcsn1mggiagqly6s941pq811wxymb"; + sha256 = "1pzyszxw90klpcmhjqrjfc8cw6c0gm4w2blim8ydyxb6rq6qml1s"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A quite complete and fast LATEX to HTML translator"; - homepage = http://pauillac.inria.fr/~maranget/hevea/; + homepage = "http://pauillac.inria.fr/~maranget/hevea/"; license = licenses.qpl; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix b/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix index 7fca57ab9d26..ae6e2e9006e6 100644 --- a/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Converts HTML files to PostScript and PDF"; - homepage = https://michaelrsweet.github.io/htmldoc; + homepage = "https://michaelrsweet.github.io/htmldoc"; license = licenses.gpl2; maintainers = with maintainers; [ shanemikel ]; platforms = with platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix b/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix index ff63ece34173..709e94005346 100644 --- a/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Convert documents to .mobi for use with Amazon Kindle"; - homepage = https://www.amazon.com/gp/feature.html?docId=1000765211; + homepage = "https://www.amazon.com/gp/feature.html?docId=1000765211"; license = licenses.unfree; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "x86_64-cygwin" "i686-cygwin" ]; diff --git a/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock b/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock index f47f401367c8..c975e23f323c 100644 --- a/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock +++ b/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES kramdown-asciidoc BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix index f37be270ddbe..3b54eb637d2e 100644 --- a/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix @@ -27,7 +27,7 @@ let meta = with lib; { description = "A kramdown extension for converting Markdown documents to AsciiDoc."; - homepage = https://asciidoctor.org/; + homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/typesetting/lout/default.nix b/nixpkgs/pkgs/tools/typesetting/lout/default.nix index 85c0bacf3155..d86c4908f21b 100644 --- a/nixpkgs/pkgs/tools/typesetting/lout/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/lout/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # Author's page: http://jeffreykingston.id.au/lout/ # Wiki: https://sourceforge.net/p/lout/wiki/ - homepage = https://savannah.nongnu.org/projects/lout/; + homepage = "https://savannah.nongnu.org/projects/lout/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/typesetting/mmark/default.nix b/nixpkgs/pkgs/tools/typesetting/mmark/default.nix index 064e75ecbdc1..be7d4c958333 100644 --- a/nixpkgs/pkgs/tools/typesetting/mmark/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/mmark/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "A powerful markdown processor in Go geared towards the IETF"; - homepage = https://github.com/miekg/mmark; + homepage = "https://github.com/miekg/mmark"; license = with stdenv.lib.licenses; bsd2; maintainers = with stdenv.lib.maintainers; [ yrashk ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix b/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix index 4cdbac7d6381..5043eb681e88 100644 --- a/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { glossary entries (LaTeX only) document metadata (e.g. title, author, date, etc.) ''; - homepage = https://fletcherpenney.net/multimarkdown/; + homepage = "https://fletcherpenney.net/multimarkdown/"; # licensed under GPLv2+ or MIT: # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE license = with stdenv.lib.licenses; [ gpl2Plus mit ]; diff --git a/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix b/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix index 9f62671a4fac..4b85a252c130 100644 --- a/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix @@ -17,8 +17,8 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/thorstenb/odpdown; - repositories.git = https://github.com/thorstenb/odpdown.git; + homepage = "https://github.com/thorstenb/odpdown"; + repositories.git = "https://github.com/thorstenb/odpdown.git"; description = "Create nice-looking slides from your favourite text editor"; longDescription = '' Have a tool like pandoc, latex beamer etc, that you can write (or diff --git a/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix b/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix index c8e27fb5a6e7..879597f91da4 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF to ODT format converter"; - homepage = https://github.com/gutschke/pdf2odt; + homepage = "https://github.com/gutschke/pdf2odt"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix b/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix index 20da90961dda..e445cf78d7ae 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Commandline utility to search text in PDF files"; - homepage = https://pdfgrep.org/; + homepage = "https://pdfgrep.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ qknight fpletz ]; platforms = with stdenv.lib.platforms; unix; diff --git a/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix b/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix index f8b17be01ddc..12fcf8a71a26 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "OCR tool for scanned PDFs"; - homepage = http://www.tobias-elze.de/pdfsandwich/; + homepage = "http://www.tobias-elze.de/pdfsandwich/"; license = licenses.gpl2; maintainers = [ maintainers.rps ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix b/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix index 72f25ef099bc..b3edd7d54507 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdftk/legacy.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Simple tool for doing everyday things with PDF documents"; - homepage = https://www.pdflabs.com/tools/pdftk-server/; + homepage = "https://www.pdflabs.com/tools/pdftk-server/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [raskin]; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/tools/typesetting/psutils/default.nix b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix index 39beab751a7a..72c72d1b3baa 100644 --- a/nixpkgs/pkgs/tools/typesetting/psutils/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Collection of useful utilities for manipulating PS documents"; - homepage = http://knackered.knackered.org/angus/psutils/; + homepage = "http://knackered.knackered.org/angus/psutils/"; license = licenses.bsd3; }; } diff --git a/nixpkgs/pkgs/tools/typesetting/rubber/default.nix b/nixpkgs/pkgs/tools/typesetting/rubber/default.nix index 21d83dd1dd06..a9ac2690b66d 100644 --- a/nixpkgs/pkgs/tools/typesetting/rubber/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/rubber/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, python3Packages, texinfo }: python3Packages.buildPythonApplication rec { - name = "rubber-${version}"; + pname = "rubber"; version = "1.5.1"; src = fetchurl { - url = "https://launchpad.net/rubber/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/rubber/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p"; }; @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { of pdfLaTeX to produce PDF documents. ''; license = licenses.gpl2Plus; - homepage = https://launchpad.net/rubber; + homepage = "https://launchpad.net/rubber"; maintainers = with maintainers; [ ttuegel peterhoeg ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix index c355d7b6d986..7a4b8010f04c 100644 --- a/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix @@ -62,7 +62,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://github.com/gfngfn/SATySFi; + homepage = "https://github.com/gfngfn/SATySFi"; description = "A statically-typed, functional typesetting system"; license = licenses.lgpl3; maintainers = [ maintainers.mt-caret maintainers.marsam ]; diff --git a/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix b/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix index 6bddf1073289..356433bac41c 100644 --- a/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { scdoc is a simple man page generator written for POSIX systems written in C99. ''; - homepage = https://git.sr.ht/~sircmpwn/scdoc; + homepage = "https://git.sr.ht/~sircmpwn/scdoc"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix b/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix index b06b2e25fcc2..813a464b7703 100644 --- a/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { outline mode and from other conventions used in emails, Usenet and text. ''; - homepage = https://www.nongnu.org/skribilo/; + homepage = "https://www.nongnu.org/skribilo/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix b/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix index be218cda535a..26af22589467 100644 --- a/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { thereby preloading the required LaTeX packages, it is also useful in a purely local setting. ''; - homepage = https://github.com/iblech/sshlatex; + homepage = "https://github.com/iblech/sshlatex"; license = stdenv.lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus platforms = stdenv.lib.platforms.all; maintainers = [ maintainers.iblech ]; diff --git a/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index 7e4c7dafefe3..f5ac36690fd7 100644 --- a/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; - homepage = https://tectonic-typesetting.github.io/; + homepage = "https://tectonic-typesetting.github.io/"; license = with licenses; [ mit ]; maintainers = [ maintainers.lluchs ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/typesetting/ted/default.nix b/nixpkgs/pkgs/tools/typesetting/ted/default.nix index a03432b729ad..25e9dce242f3 100644 --- a/nixpkgs/pkgs/tools/typesetting/ted/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/ted/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { MS-Word. Additionally, Ted also is an RTF to PostScript and an RTF to Acrobat PDF converter. ''; - homepage = https://nllgg.nl/Ted/; + homepage = "https://nllgg.nl/Ted/"; license = licenses.gpl2; platforms = platforms.all; broken = stdenv.isDarwin; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix index 787f19d91f4a..ccb5dcc51907 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix @@ -29,7 +29,7 @@ let auctex = stdenv.mkDerivation ( rec { meta = { description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; - homepage = https://www.gnu.org/software/auctex; + homepage = "https://www.gnu.org/software/auctex"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix index cc9432f6f22d..a145e1a42ff2 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; - homepage = http://dblatex.sourceforge.net/; + homepage = "http://dblatex.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix index 6d64b536502e..392edfc3a2f3 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation { meta = with stdenvNoCC.lib; { description = "A 21st century LaTeX wrapper"; - homepage = https://github.com/aclements/latexrun; + homepage = "https://github.com/aclements/latexrun"; license = licenses.mit; maintainers = [ maintainers.lucus16 ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix index db0ec6d9bead..39029635beb4 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lkproof-3.1"; src = fetchurl { - url = http://mirror.ctan.org/macros/latex/contrib/lkproof.zip; + url = "http://mirror.ctan.org/macros/latex/contrib/lkproof.zip"; sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/pgf/1.x.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgf/1.x.nix index 9215a1e0ac48..dc13ea331782 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgf-1.18"; src = fetchurl { - url = mirror://sourceforge/pgf/pgf-1.18.tar.gz; + url = "mirror://sourceforge/pgf/pgf-1.18.tar.gz"; sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/pgf/2.x.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgf/2.x.nix index 56e50e444081..00b92935babb 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgf-2.00"; src = fetchurl { - url = mirror://sourceforge/pgf/pgf-2.00.tar.gz; + url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz"; sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix index 0835c7c547df..a9ff54e4c11e 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgf-3.00"; src = fetchurl { - url = mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip; + url = "mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip"; sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix index fcdebedb7d87..998f61786db4 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgfplots-1.5.1"; src = fetchurl { - url = mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip; + url = "mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip"; sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "TeX package to draw plots directly in TeX in two and three dimensions"; - homepage = http://pgfplots.sourceforge.net; + homepage = "http://pgfplots.sourceforge.net"; platforms = platforms.unix; license = licenses.gpl3Plus; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix index ac317fd51dcb..021927702ffb 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "tetex-3.0"; src = fetchurl { - url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz"; sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww"; }; texmf = fetchurl { - url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz"; sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A full-featured (La)TeX distribution"; - homepage = http://www.tug.org/tetex/; + homepage = "http://www.tug.org/tetex/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; hydraPlatforms = []; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 6054ea5c6e92..5800cedf7f14 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -26,10 +26,7 @@ let sha256 = "1dfps39q6bdr1zsbp9p74mvalmy3bycihv19sb9c6kg30kprz8nj"; }; - patches = [ - ]; - - postPatch = let + prePatch = let # The source compatible with Poppler ${popplerVersion} not yet available in TeXLive ${year} # so we need to use files introduced in https://www.tug.org/svn/texlive?view=revision&revision=52959 popplerVersion = "0.83.0"; @@ -68,10 +65,18 @@ let done cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc + ''; + patches = [ # poppler 0.84 compat fixups, use 0.83 files otherwise - patch -p1 -i ${./poppler84.patch} - ''; + ./poppler84.patch + + (fetchpatch { + name = "texlive-poppler-0.86.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin&id=60244e41bb6f1501e8ed1fc9e6b7ba8d3f283398"; + sha256 = "0pdvhaqc3zgz7hp0x3a4qs0nh26fkvgmr6w1cjljqhp1nyiw2f1l"; + }) + ]; # remove when removing synctex-missing-header.patch preAutoreconf = "pushd texk/web2c"; @@ -108,7 +113,7 @@ core = stdenv.mkDerivation rec { pname = "texlive-bin"; inherit version; - inherit (common) src patches postPatch preAutoreconf postAutoreconf; + inherit (common) src patches prePatch preAutoreconf postAutoreconf; outputs = [ "out" "doc" ]; @@ -188,7 +193,7 @@ core = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Basic binaries for TeX Live"; - homepage = http://www.tug.org/texlive; + homepage = "http://www.tug.org/texlive"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ]; platforms = platforms.all; @@ -201,7 +206,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex pname = "texlive-core-big.bin"; inherit version; - inherit (common) src patches postPatch preAutoreconf postAutoreconf; + inherit (common) src patches prePatch preAutoreconf postAutoreconf; hardeningDisable = [ "format" ]; @@ -383,7 +388,7 @@ pygmentex = python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://www.ctan.org/pkg/pygmentex; + homepage = "https://www.ctan.org/pkg/pygmentex"; description = "Auxiliary tool for typesetting code listings in LaTeX documents using Pygments"; longDescription = '' PygmenTeX is a Python-based LaTeX package that can be used for diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index cb4bc14927de..ee4d0dfe588a 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -153,7 +153,8 @@ in buildEnv { rm "$link" makeWrapper "$target" "$link" \ --prefix PATH : "$out/bin:${perl}/bin" \ - --prefix PERL5LIB : "$PERL5LIB" + --prefix PERL5LIB : "$PERL5LIB" \ + --set-default TEXMFCNF "$TEXMFCNF" # avoid using non-nix shebang in $target by calling interpreter if [[ "$(head -c 2 "$target")" = "#!" ]]; then diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index 278e33c383a4..52a107118753 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -111,8 +111,8 @@ let # (https://tug.org/historic/). urlPrefixes = args.urlPrefixes or [ # tlnet-final snapshot - http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive - ftp://tug.org/texlive/historic/2019/tlnet-final/archive + "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive" + "ftp://tug.org/texlive/historic/2019/tlnet-final/archive" # Daily snapshots hosted by one of the texlive release managers #https://texlive.info/tlnet-archive/2019/10/19/tlnet/archive diff --git a/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix index 0a1f6591b860..31baa431bfc9 100644 --- a/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix @@ -2,13 +2,13 @@ mkDerivation { pname = "tikzit"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "tikzit"; repo = "tikzit"; - rev = "v2.1.4"; - sha256 = "121pgl2cdkksw48mjg6hzk7324ax6iw6fq7q3v1kdgwm8rwxm1fl"; + rev = "v2.1.5"; + sha256 = "1xrx7r8b6nb912k91pkdwaz2gijfq6lzssyqxard0591h2mycbcg"; }; nativeBuildInputs = [ qmake qttools flex bison ]; @@ -25,7 +25,7 @@ mkDerivation { can be included directly in papers typeset using LaTeX. For preview support the texlive package 'preview' has to be installed. ''; - homepage = https://tikzit.github.io/; + homepage = "https://tikzit.github.io/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.iblech maintainers.mgttlinger ]; diff --git a/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix b/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix index b5b03b470cde..f37bfb7c133b 100644 --- a/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://fedorahosted.org/xmlto/; + homepage = "https://fedorahosted.org/xmlto/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/video/atomicparsley/default.nix b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix index a4089636b951..9a19a6789e57 100644 --- a/nixpkgs/pkgs/tools/video/atomicparsley/default.nix +++ b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { This is a maintained fork of the original AtomicParsley. ''; - homepage = https://bitbucket.org/wez/atomicparsley; + homepage = "https://bitbucket.org/wez/atomicparsley"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pjones ]; diff --git a/nixpkgs/pkgs/tools/video/bento4/default.nix b/nixpkgs/pkgs/tools/video/bento4/default.nix index 4dea8dba6eda..94a1a5d04f32 100644 --- a/nixpkgs/pkgs/tools/video/bento4/default.nix +++ b/nixpkgs/pkgs/tools/video/bento4/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Full-featured MP4 format and MPEG DASH library and tools"; - homepage = http://bento4.com; + homepage = "http://bento4.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ makefu ]; broken = stdenv.isAarch64; diff --git a/nixpkgs/pkgs/tools/video/dvgrab/default.nix b/nixpkgs/pkgs/tools/video/dvgrab/default.nix index 8fe2a70dcb44..9077d34614df 100644 --- a/nixpkgs/pkgs/tools/video/dvgrab/default.nix +++ b/nixpkgs/pkgs/tools/video/dvgrab/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { AVI type 2, Quicktime DV, a series of JPEG stills or MPEG2-TS. ''; - homepage = http://kinodv.org/; + homepage = "http://kinodv.org/"; license = licenses.gpl2Plus; platforms = platforms.gnu ++ platforms.linux; diff --git a/nixpkgs/pkgs/tools/video/flvtool2/default.nix b/nixpkgs/pkgs/tools/video/flvtool2/default.nix index 06830d1be636..0875b7ee1d1a 100644 --- a/nixpkgs/pkgs/tools/video/flvtool2/default.nix +++ b/nixpkgs/pkgs/tools/video/flvtool2/default.nix @@ -8,7 +8,7 @@ buildRubyGem rec { source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; meta = { - homepage = https://github.com/unnu/flvtool2; + homepage = "https://github.com/unnu/flvtool2"; description = "A tool to manipulate Macromedia Flash Video files"; platforms = ruby.meta.platforms; license = lib.licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/video/mjpegtools/default.nix b/nixpkgs/pkgs/tools/video/mjpegtools/default.nix index 3e72d8b8af59..6c74aab95731 100644 --- a/nixpkgs/pkgs/tools/video/mjpegtools/default.nix +++ b/nixpkgs/pkgs/tools/video/mjpegtools/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A suite of programs for processing MPEG or MJPEG video"; - homepage = http://mjpeg.sourceforge.net/; + homepage = "http://mjpeg.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/nixpkgs/pkgs/tools/video/swfmill/default.nix b/nixpkgs/pkgs/tools/video/swfmill/default.nix index 3832f3c3be0c..b675c1a57c2f 100644 --- a/nixpkgs/pkgs/tools/video/swfmill/default.nix +++ b/nixpkgs/pkgs/tools/video/swfmill/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An xml2swf and swf2xml processor with import functionalities"; - homepage = http://swfmill.org; + homepage = "http://swfmill.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/video/swftools/default.nix b/nixpkgs/pkgs/tools/video/swftools/default.nix index d75405ab309f..a37f58937b81 100644 --- a/nixpkgs/pkgs/tools/video/swftools/default.nix +++ b/nixpkgs/pkgs/tools/video/swftools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Collection of SWF manipulation and creation utilities"; - homepage = http://www.swftools.org/about.html; + homepage = "http://www.swftools.org/about.html"; license = licenses.gpl2; maintainers = [ maintainers.koral ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/video/untrunc/default.nix b/nixpkgs/pkgs/tools/video/untrunc/default.nix index c7b76e0cb6ea..728b4ff01188 100644 --- a/nixpkgs/pkgs/tools/video/untrunc/default.nix +++ b/nixpkgs/pkgs/tools/video/untrunc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video"; license = licenses.gpl2; - homepage = https://github.com/ponchio/untrunc; + homepage = "https://github.com/ponchio/untrunc"; maintainers = [ maintainers.earvstedt ]; }; } diff --git a/nixpkgs/pkgs/tools/video/vnc2flv/default.nix b/nixpkgs/pkgs/tools/video/vnc2flv/default.nix index 561c8cf7d78f..ed2d872b874c 100644 --- a/nixpkgs/pkgs/tools/video/vnc2flv/default.nix +++ b/nixpkgs/pkgs/tools/video/vnc2flv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "vnc2flv-20100207"; - namePrefix = ""; + pname = "vnc2flv"; + version = "20100207"; src = fetchurl { - url = "mirror://pypi/v/vnc2flv/${name}.tar.gz"; + url = "mirror://pypi/v/vnc2flv/${pname}-${version}.tar.gz"; sha256 = "14d4nm8yim0bm0nd3wyj7z4zdsg5zk3d9bhhvwdc36x03r8d0sbq"; }; @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; - homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + homepage = "http://www.unixuser.org/~euske/python/vnc2flv/"; license = stdenv.lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/tools/video/vncrec/default.nix b/nixpkgs/pkgs/tools/video/vncrec/default.nix index 857524661bfa..98b644a633c8 100644 --- a/nixpkgs/pkgs/tools/video/vncrec/default.nix +++ b/nixpkgs/pkgs/tools/video/vncrec/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "VNC recorder"; - homepage = http://ronja.twibright.com/utils/vncrec/; + homepage = "http://ronja.twibright.com/utils/vncrec/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/nixpkgs/pkgs/tools/video/yamdi/default.nix b/nixpkgs/pkgs/tools/video/yamdi/default.nix index b9b16e4d8ece..28861887ed2a 100644 --- a/nixpkgs/pkgs/tools/video/yamdi/default.nix +++ b/nixpkgs/pkgs/tools/video/yamdi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Yet Another MetaData Injector for FLV"; - homepage = http://yamdi.sourceforge.net/; + homepage = "http://yamdi.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.ryanartecona ]; diff --git a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index ada948735d0f..19766fb5ba9d 100644 --- a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # */ meta = with stdenv.lib; { - homepage = https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI.html; + homepage = "https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI.html"; description = "The Amazon ECS command line interface"; longDescription = "The Amazon Elastic Container Service (Amazon ECS) command line interface (CLI) provides high-level commands to simplify creating, updating, and monitoring clusters and tasks from a local development environment."; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/virtualization/awless/default.nix b/nixpkgs/pkgs/tools/virtualization/awless/default.nix index 57a68b868096..f051fd12ab3b 100644 --- a/nixpkgs/pkgs/tools/virtualization/awless/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/awless/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/wallix/awless/; + homepage = "https://github.com/wallix/awless/"; description = "A Mighty CLI for AWS"; platforms = with platforms; linux ++ darwin; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/virtualization/aws/default.nix b/nixpkgs/pkgs/tools/virtualization/aws/default.nix index 618a45075c95..57aae0c695f9 100644 --- a/nixpkgs/pkgs/tools/virtualization/aws/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/aws/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "aws-1.75"; src = fetchurl { - url = https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws; + url = "https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws"; sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.timkay.com/aws/; + homepage = "https://www.timkay.com/aws/"; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix index fabdd5357743..aff00519a2dc 100644 --- a/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix @@ -88,7 +88,7 @@ in with localPython.pkgs; buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://aws.amazon.com/elasticbeanstalk/; + homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix index 580c2f9a01f3..bf932ff1ad4f 100644 --- a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication { doCheck = false; meta = { - homepage = https://cloudinit.readthedocs.org; + homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; platforms = lib.platforms.all; diff --git a/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix b/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix index 1c7613b4893f..2565d9346b0e 100644 --- a/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = with lib; { description = "CLI for Apache CloudStack."; - homepage = https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI; + homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; }; diff --git a/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix index 910f2822c6f3..2aa23f04fe48 100644 --- a/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with lib; { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; - homepage = https://github.com/kubernetes-sigs/cri-tools; + homepage = "https://github.com/kubernetes-sigs/cri-tools"; license = lib.licenses.asl20; maintainers = with maintainers; [ saschagrunert ]; }; diff --git a/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix index e8172066800d..f8359e6286c9 100644 --- a/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = https://aws.amazon.com/developertools/Amazon-EC2/368; + homepage = "https://aws.amazon.com/developertools/Amazon-EC2/368"; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; license = stdenv.lib.licenses.amazonsl; }; diff --git a/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix b/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix index 86ad36886c9f..409b2ba8f416 100644 --- a/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; + homepage = "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351"; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; license = stdenv.lib.licenses.amazonsl; }; diff --git a/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix b/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix index cb31a66ea72d..3d7b62777aa5 100644 --- a/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/euca2ools/default.nix @@ -3,11 +3,11 @@ let inherit (python2Packages) buildPythonApplication boto m2crypto; in buildPythonApplication { - name = "euca2ools-2.1.4"; - namePrefix = ""; + pname = "euca2ools"; + version = "2.1.4"; src = fetchgit { - url = https://github.com/eucalyptus/euca2ools.git; + url = "https://github.com/eucalyptus/euca2ools.git"; rev = "19cb7eac34dd7efe3a56e4841b9692c03458bf3b"; sha256 = "0grsgn5gbvk1hlfa8qx7ppz7iyfyi2pdhxy8njr8lm60w4amfiyq"; }; @@ -15,7 +15,7 @@ in buildPythonApplication { propagatedBuildInputs = [ boto m2crypto ]; meta = { - homepage = https://github.com/eucalyptus/euca2ools; + homepage = "https://github.com/eucalyptus/euca2ools"; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 0daa01f85bb3..31ea1cb2a946 100644 --- a/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -3,6 +3,7 @@ , curl , json_c , pam +, bashInteractive }: stdenv.mkDerivation rec { @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace compat.h --replace /bin/bash ${stdenv.shell} + substituteInPlace compat.h --replace /bin/bash ${bashInteractive}/bin/bash ''; buildInputs = [ curl.dev pam ]; @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/GoogleCloudPlatform/compute-image-packages; + homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; description = "OS Login Guest Environment for Google Compute Engine"; license = licenses.asl20; maintainers = with maintainers; [ adisbladis flokli ]; diff --git a/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/nixpkgs/pkgs/tools/virtualization/govc/default.nix index b53c211d379f..1595af847701 100644 --- a/nixpkgs/pkgs/tools/virtualization/govc/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/govc/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "A vSphere CLI built on top of govmomi"; - homepage = https://github.com/vmware/govmomi/tree/master/govc; + homepage = "https://github.com/vmware/govmomi/tree/master/govc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nicknovitski ]; }; diff --git a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index d7696be85e40..bcb0c545d455 100644 --- a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -1,42 +1,70 @@ -{ stdenv, fetchFromGitHub, perlPackages, makeWrapper}: +{ lib +, buildPythonApplication +, fetchFromGitHub +, fetchpatch +, fetchurl +, terminaltables +, colorclass +, requests +, pyyaml +, setuptools +}: -perlPackages.buildPerlPackage rec { +let + + spec = fetchurl { + url = "https://developers.linode.com/api/docs/v4/openapi.yaml"; + sha256 = "1l2fahdcmv7sp1qkwr5nv2vls8fypvlybwylqfzhyjmn7jqkw4hq"; + }; + +in + +buildPythonApplication rec { pname = "linode-cli"; - version = "1.4.7"; + version = "2.14.1"; src = fetchFromGitHub { owner = "linode"; - repo = "cli"; - rev = "v${version}"; - sha256 = "1wiz067wgxi4z4rz4n9p7dlvx5z4hkl2nxpfvhikl6dri4m2nkkp"; + repo = pname; + rev = version; + sha256 = "1hpdmbzs182iag471yvq3kwd1san04a58sczzbmw6vjv2kswn1c2"; }; - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = with perlPackages; [ - JSON - LWP - MozillaCA - TryTiny - WebServiceLinode + patches = [ + # make enum34 depend on python version + ( fetchpatch { + url = "https://github.com/linode/linode-cli/pull/184/commits/4cf55759c5da33fbc49b9ba664698875d67d4f76.patch"; + sha256 = "04n9a6yh0abyyymvfzajhav6qxwvzjl2vs8jnqp3yqrma7kl0slj"; + }) ]; - # Wrap perl scripts so they can find libraries - postInstall = '' - for n in "$out/bin"/*; do - wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" - done + # remove need for git history + prePatch = '' + substituteInPlace setup.py \ + --replace "version=get_version()," "version='${version}'," ''; - # Has no tests - doCheck = false; + propagatedBuildInputs = [ + terminaltables + colorclass + requests + pyyaml + setuptools + ]; - # Has no "doc" or "devdoc" outputs - outputs = [ "out" ]; + postConfigure = '' + python3 -m linodecli bake ${spec} --skip-config + cp data-3 linodecli/ + ''; - meta = with stdenv.lib; { - description = "Command-line interface to the Linode platform"; - homepage = https://github.com/linode/cli; - license = with licenses; [ artistic2 gpl2 ]; - maintainers = with maintainers; [ nixy ]; + # requires linode access token for unit tests, and running executable + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/linode/linode-cli"; + description = "The Linode Command Line Interface"; + license = licenses.bsd3; + maintainers = with maintainers; [ ryantm ]; }; + } diff --git a/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix index 10103be26308..c557361f122f 100644 --- a/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix @@ -16,7 +16,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/shoenig/marathonctl; + homepage = "https://github.com/shoenig/marathonctl"; description = "CLI tool for Marathon"; platforms = platforms.all; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/virtualization/mininet/default.nix b/nixpkgs/pkgs/tools/virtualization/mininet/default.nix index 0ee27d36e0af..78ddc8e6dfd5 100644 --- a/nixpkgs/pkgs/tools/virtualization/mininet/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/mininet/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { fullName = "Mininet 2.3.0d6 License"; }; platforms = platforms.linux; - homepage = https://github.com/mininet/mininet; + homepage = "https://github.com/mininet/mininet"; maintainers = with maintainers; [ teto ]; }; } diff --git a/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix b/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix index 79dd4e4551ad..224e7b33081a 100644 --- a/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { }; meta = with lib; { - homepage = https://github.com/rootless-containers/rootlesskit; + homepage = "https://github.com/rootless-containers/rootlesskit"; description = ''Kind of Linux-native "fake root" utility, made for mainly running Docker and Kubernetes as an unprivileged user''; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/nixpkgs/pkgs/tools/virtualization/udocker/default.nix b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix index 5f4d982d86d9..00771b917501 100644 --- a/nixpkgs/pkgs/tools/virtualization/udocker/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/udocker/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "basic user tool to execute simple docker containers in user space without root privileges"; - homepage = https://indigo-dc.gitbooks.io/udocker; + homepage = "https://indigo-dc.gitbooks.io/udocker"; license = licenses.asl20; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix index 4a81e8fe48b1..e5c5b0978af0 100644 --- a/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { version = "6.2.0"; meta = { description = "Citrix XenServer Tools"; - homepage = http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US; + homepage = "http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"; maintainers = with stdenv.lib.maintainers; [ benwbooth ]; platforms = stdenv.lib.platforms.linux; license = [ stdenv.lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 ]; |