diff options
Diffstat (limited to 'nixpkgs/pkgs/tools')
342 files changed, 3619 insertions, 1594 deletions
diff --git a/nixpkgs/pkgs/tools/X11/autocutsel/default.nix b/nixpkgs/pkgs/tools/X11/autocutsel/default.nix index 4e6f40707a77..036ba8bc4e9a 100644 --- a/nixpkgs/pkgs/tools/X11/autocutsel/default.nix +++ b/nixpkgs/pkgs/tools/X11/autocutsel/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; homepage = "https://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; license = lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/X11/bumblebee/default.nix b/nixpkgs/pkgs/tools/X11/bumblebee/default.nix index 706194cc0dd0..48d28562c207 100644 --- a/nixpkgs/pkgs/tools/X11/bumblebee/default.nix +++ b/nixpkgs/pkgs/tools/X11/bumblebee/default.nix @@ -33,8 +33,6 @@ }: let - version = "3.2.1"; - nvidia_x11s = [ nvidia_x11 ] ++ lib.optional nvidia_x11.useGLVND libglvnd ++ lib.optionals (nvidia_x11_i686 != null) @@ -57,7 +55,7 @@ let in stdenv.mkDerivation rec { pname = "bumblebee"; - inherit version; + version = "3.2.1"; src = fetchurl { url = "https://bumblebee-project.org/${pname}-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/X11/nitrogen/default.nix b/nixpkgs/pkgs/tools/X11/nitrogen/default.nix index 432193950cdd..deefddf23cea 100644 --- a/nixpkgs/pkgs/tools/X11/nitrogen/default.nix +++ b/nixpkgs/pkgs/tools/X11/nitrogen/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, glib, gtkmm2 }: -let version = "1.6.1"; -in stdenv.mkDerivation rec { pname = "nitrogen"; - inherit version; + version = "1.6.1"; src = fetchurl { url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/X11/runningx/default.nix b/nixpkgs/pkgs/tools/X11/runningx/default.nix index ae0e5b89a619..b3b5233564af 100644 --- a/nixpkgs/pkgs/tools/X11/runningx/default.nix +++ b/nixpkgs/pkgs/tools/X11/runningx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 ]; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' cc -O2 -o RunningX $(pkg-config --cflags --libs x11) $src diff --git a/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix b/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix index adf3b3d9250c..0519f2c42044 100644 --- a/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix +++ b/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { sed -e "s@/etc/xdg@$out&@" -i Makefile ''; meta = { - inherit version; description = "Expose-style compositing-based standalone window switcher"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/X11/sx/default.nix b/nixpkgs/pkgs/tools/X11/sx/default.nix new file mode 100644 index 000000000000..c03d4443fcf0 --- /dev/null +++ b/nixpkgs/pkgs/tools/X11/sx/default.nix @@ -0,0 +1,30 @@ +{ coreutils, fetchFromGitHub, lib, makeWrapper, stdenv, util-linux, xauth, xorgserver }: + +stdenv.mkDerivation rec { + pname = "sx"; + version = "2.1.7"; + + src = fetchFromGitHub { + owner = "earnestly"; + repo = pname; + rev = version; + sha256 = "0xv15m30nhcknasqiybj5wwf7l91q4a4jf6xind8x5x00c6br6nl"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/sx \ + --prefix PATH : ${lib.makeBinPath [ coreutils util-linux xorgserver xauth ]} + ''; + + meta = with lib; { + description = "Simple alternative to both xinit and startx for starting a Xorg server"; + homepage = "https://github.com/earnestly/sx"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix b/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix index 362a86fff37c..5974b2bd3d56 100644 --- a/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix +++ b/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake -, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk +, libGL, libGLU, libXv, libXtst, libXi, libjpeg_turbo, fltk , xorg , opencl-headers, opencl-clhpp, ocl-icd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjpeg_turbo libGL libGLU fltk - libX11 libXv libXtst xorg.xcbutilkeysyms + libXv libXtst libXi xorg.xcbutilkeysyms opencl-headers opencl-clhpp ocl-icd ]; diff --git a/nixpkgs/pkgs/tools/X11/wayv/default.nix b/nixpkgs/pkgs/tools/X11/wayv/default.nix index 4ee2c8acc254..e489ad0237be 100644 --- a/nixpkgs/pkgs/tools/X11/wayv/default.nix +++ b/nixpkgs/pkgs/tools/X11/wayv/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "A gesture control for X11"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix index 0a01a3dad5a4..19a464aff72a 100644 --- a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix +++ b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ glib.dev ]; buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; diff --git a/nixpkgs/pkgs/tools/X11/xannotate/default.nix b/nixpkgs/pkgs/tools/X11/xannotate/default.nix index 9c88a038e3ee..9eafb5e6b497 100644 --- a/nixpkgs/pkgs/tools/X11/xannotate/default.nix +++ b/nixpkgs/pkgs/tools/X11/xannotate/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; meta = { - inherit version; description = "A tool to scribble over X windows"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/X11/xautomation/default.nix b/nixpkgs/pkgs/tools/X11/xautomation/default.nix index 0521b6f8b3b4..a1fb88176325 100644 --- a/nixpkgs/pkgs/tools/X11/xautomation/default.nix +++ b/nixpkgs/pkgs/tools/X11/xautomation/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libpng, libX11, libXext, libXi, libXtst }: -let version = "1.09"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xautomation"; - inherit version; + version = "1.09"; src = fetchurl { url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz"; sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; diff --git a/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix b/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix index ba45442a4492..17e0ca66e3f3 100644 --- a/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix +++ b/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libX11, guile }: -let version = "1.8.7"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xbindkeys"; - inherit version; + version = "1.8.7"; src = fetchurl { url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; diff --git a/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix b/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix index b954205990b9..87c643af483d 100644 --- a/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix +++ b/nixpkgs/pkgs/tools/X11/xgeometry-select/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0s7kirgh5iz91m3qy8xiq0j4gljy8zrcnylf4szl5h0lrsaqj7ya"; }; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildInputs = [ libX11 ]; diff --git a/nixpkgs/pkgs/tools/X11/xob/default.nix b/nixpkgs/pkgs/tools/X11/xob/default.nix index 2c1ae4bdf61c..754904449efa 100644 --- a/nixpkgs/pkgs/tools/X11/xob/default.nix +++ b/nixpkgs/pkgs/tools/X11/xob/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix b/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix index 758450d36545..61e48de7f5e1 100644 --- a/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure.ac \ - --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])" + --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.64])" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix b/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix index 311f1e42901e..af17f3ade7dc 100644 --- a/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix +++ b/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libXdamage ]; meta = { - inherit version; description = "X window switcher drawing a colourful grid"; license = lib.licenses.bsd2 ; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix b/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix index 00ee7413189a..3921df9fffab 100644 --- a/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix +++ b/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchbzr, xlibsWrapper }: -let - version = "4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xwinwrap"; - inherit version; + version = "4"; src = fetchbzr { url = "https://code.launchpad.net/~shantanu-goel/xwinwrap/devel"; diff --git a/nixpkgs/pkgs/tools/X11/xzoom/default.nix b/nixpkgs/pkgs/tools/X11/xzoom/default.nix index ba62704bdd3b..979e2725098d 100644 --- a/nixpkgs/pkgs/tools/X11/xzoom/default.nix +++ b/nixpkgs/pkgs/tools/X11/xzoom/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; meta = { - inherit version; description = "An X11 screen zoom tool"; license = lib.licenses.free ; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 1ce3cb452b8c..d84c1816fec4 100644 --- a/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, groff, less, fetchFromGitHub }: +{ lib, python3, groff, less, fetchFromGitHub, fetchpatch }: let py = python3.override { packageOverrides = self: super: { @@ -33,6 +33,13 @@ with py.pkgs; buildPythonApplication rec { sha256 = "sha256-LU9Tqzdi8ULZ5y3FbfSXdrip4NcxFkXRCTpVGo05LcM="; }; + patches = [ + (fetchpatch { + url = "https://github.com/mgorny/aws-cli/commit/85361123d2fa12eaedf912c046ffe39aebdd2bad.patch"; + sha256 = "sha256-1Rb+/CY7ze1/DbJ6TfqHF01cfI2vixZ1dT91bmHTg/A="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "awscrt==0.11.13" "awscrt" \ diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 877ddf8a5e9d..b93ab0e867b3 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.24.2"; + version = "2.26.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-4XmwM0/89hacA8ARs5Zq/ahzeqIc9wS18zT/ale+wQ4="; + sha256 = "sha256-AwchP0o3I2T37dLPNw51wldwYUmcRuWptyzrhOocEaQ="; }; # put packages that needs to be overriden in the py package scope @@ -81,6 +81,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-dns azure-mgmt-eventgrid azure-mgmt-eventhub + azure-mgmt-extendedlocation azure-mgmt-hdinsight azure-mgmt-imagebuilder azure-mgmt-iotcentral diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 64823278d6da..2cde5a1da579 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -86,7 +86,7 @@ let postPatch = '' substituteInPlace setup.py \ - --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" \ + --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \ --replace "cryptography>=3.2,<3.4" "cryptography" ''; @@ -132,17 +132,20 @@ let ''; }; + azure-appconfiguration = overrideAzureMgmtPackage super.azure-appconfiguration "1.1.1" "zip" + "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; + azure-batch = overrideAzureMgmtPackage super.azure-batch "10.0.0" "zip" "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0"; azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; - azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip" - "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83"; + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "15.0.0" "zip" + "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb"; - azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip" - "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0"; + azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" + "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f"; azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.3.0" "zip" "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1"; @@ -153,23 +156,23 @@ let azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "8.1.0b4" "zip" "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs="; - azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" - "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; + azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "1.0.0" "zip" + "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rza"; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip" - "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.12.0" "zip" + "sha256-mrw1Gs3LMOPFiL5mSSrm+g1/dxihplA6ItYHbwljJbM="; azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "18.0.0" "zip" "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c"; - azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip" + azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.0.0" "zip" "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip" - "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx"; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "12.0.0" "zip" + "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "20.0.0" "zip" - "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "21.0.0" "zip" + "sha256-kifDdVpwvDd9cONeH8bx+rEJ3YiXT9LHEphnzKoQ+BM="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -177,14 +180,11 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.2.0" "zip" - "sha256-x2YJt+fX0B+YMn7+yYi4t21K518DQQ3kBHn1nCrDSqo="; - - azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" - "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.0.0" "zip" + "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.3.0" "zip" - "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.4.0" "zip" + "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b"; azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip" "sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; @@ -192,8 +192,8 @@ let azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; - azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc9" "zip" - "sha256-txWYthg9QI5OSW6yE5lY+Gpb+/E6x3jb/obfSQuaAcg="; + azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "9.0.0" "zip" + "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510"; azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; @@ -210,8 +210,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "2.0.0" "zip" - "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "4.0.0" "zip" + "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; @@ -261,17 +261,17 @@ let azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip" "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3"; - azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip" - "09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5"; + azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.0.0b2" "zip" + "sha256-FTxY8qoihHG4OZuKT3sRRlKfORbIoqDqug9Ko+6S9dw="; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.26.0" "zip" - "sha256-tmsxhHt6mRWNOXDebckZSXt4L8+757NRKSDu6wVMqRE="; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.29.0" "zip" + "sha256-a8epWPoGI4SA01DkjToaHmTx8lSPgwMB7dutI/zaoAA="; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; - azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.6.0" "zip" - "sha256-+By1KyIHdKq5P/zyW9wX4D/YS2kWg2ZAeJ+G+/Y2uYQ="; + azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.0.0" "zip" + "bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8"; azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip" "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; @@ -288,17 +288,17 @@ let azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip" "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc17" "zip" - "sha256-M6lenj1rVEJZ+EJyBXkqokFfr1e5sqRgcAbUc0W0svo="; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.0.0" "zip" + "480eb5d1bb910da4e87a5d7047e2f3e426083b14911ac64c48badd0218e9e756"; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; - azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip" - "1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r"; + azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" + "fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b"; - azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "0.1.1" "zip" - "16raxr5naszrxmgbfhsvh7rqcph5cx6x3f480790m79ykvmjj0pi"; + azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip" + "c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b"; azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; @@ -312,8 +312,8 @@ let azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.2.0" "zip" - "sha256-Myxg3G0+OAk/bh4k5TOEGGJuyEBtYA2edNlbIXnWE4M="; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "8.0.0" "zip" + "2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000"; azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.2" "tar.gz" "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc"; @@ -458,20 +458,6 @@ let }; }); - pyjwt = super.pyjwt.overridePythonAttrs(oldAttrs: rec { - version = "1.7.1"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; - }; - - # new cryptography returns slightly different values than what's expected - # this gets tested in azure-cli-core, so not absolutely necessary to run tests here - doCheck = false; - }); - PyGithub = super.PyGithub.overridePythonAttrs(oldAttrs: rec { version = "1.38"; diff --git a/nixpkgs/pkgs/tools/admin/boulder/default.nix b/nixpkgs/pkgs/tools/admin/boulder/default.nix index a21a3ebdde11..706ac84afb33 100644 --- a/nixpkgs/pkgs/tools/admin/boulder/default.nix +++ b/nixpkgs/pkgs/tools/admin/boulder/default.nix @@ -4,13 +4,10 @@ , lib }: -let - version = "release-2019-10-13"; - -in buildGoPackage { +buildGoPackage rec{ pname = "boulder"; - inherit version; + version = "release-2019-10-13"; goPackagePath = "github.com/letsencrypt/boulder"; diff --git a/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix b/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix index 48851c3784b7..ee2efb206af6 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 = "2.0.4"; + version = "2.0.5"; goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-yG8gpsD1KZBSbJnnNTXgZah/mcrOUH1O37s7AGpeHjQ="; + sha256 = "sha256-WrcGTXy5SMWDHJWddXUuvUvEWjOsJcoB1zBg02p5ggY="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 9af721f02e56..6a28e18c7d3a 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.55.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-5PrwOR70pSmNPHFSDHRvXNn0pksIQun5jJkcCFsYhCE="; + sha256 = "sha256-5Y//OD/UsqDnM8MPVJghrc5SbVwBEG/Eu761QWy5xK8="; }; - vendorSha256 = "sha256-N2jdaz0lb4Ut8P+FgNNjgyUeJ731fTQ5XSQgOF8KCQs="; + vendorSha256 = "sha256-CQ7A4vwUrshKRZBdIJZlCXmcxS0O0CkE1tNkZskYu1E="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 7136fecf433a..4fb11de26c3c 100644 --- a/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.34.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Gu9o1aUDlhcEZPZZsfVF0FnlzT1DvbEXMXjnOxhY8tY="; + sha256 = "sha256-ETj14xwCQJv3xNYXFY/Z0FsxjxLrlpcVkap2sRsLzVU="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/nixpkgs/pkgs/tools/admin/fastlane/default.nix b/nixpkgs/pkgs/tools/admin/fastlane/default.nix index 245c1dfef8cb..dc8dd1fd7a6c 100644 --- a/nixpkgs/pkgs/tools/admin/fastlane/default.nix +++ b/nixpkgs/pkgs/tools/admin/fastlane/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = let env = bundlerEnv { diff --git a/nixpkgs/pkgs/tools/admin/gixy/default.nix b/nixpkgs/pkgs/tools/admin/gixy/default.nix index 1711792ab2bc..65ca85b463e9 100644 --- a/nixpkgs/pkgs/tools/admin/gixy/default.nix +++ b/nixpkgs/pkgs/tools/admin/gixy/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ cached-property - ConfigArgParse + configargparse pyparsing jinja2 nose diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 5bd9c95d3a5e..f461a5c30ed1 100644 --- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,23 +21,23 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0viiwimnk26jfi4ypkvclqqxw8anlmch10zscjw69d8x1pyqczcd"; + sha256 = "1h02pywzjn2d4p07xic1936w5qjbaz33qny8afrgzvgbqnqx7dvs"; }; aarch64-darwin = { url = "${baseUrl}/${name}-darwin-arm.tar.gz"; - sha256 = "sha256-EZbJgMzEZScvaqSKay5aDuayVaIK1zZUzqAHgT0czZk="; + sha256 = "0qrmrxzphslhq3xf01zh91v7fvqn0z4hv8rpd15qwq9q84d2c3gr"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "11113l8pyhq6vbsh79m5anh6ljss94zhnp33ghds9rn1gxa83hnb"; + sha256 = "0lz14d9gs6k0zbnyvrl6zyj8w7f6a5z7q95y48jkizc822rajhc3"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "347.0.0"; + version = "348.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/nixpkgs/pkgs/tools/admin/lexicon/default.nix index 6c105cf9b335..c183e3741429 100644 --- a/nixpkgs/pkgs/tools/admin/lexicon/default.nix +++ b/nixpkgs/pkgs/tools/admin/lexicon/default.nix @@ -65,8 +65,8 @@ buildPythonApplication rec { checkInputs = [ mock pytest - pytestcov - pytest_xdist + pytest-cov + pytest-xdist vcrpy ]; diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index fde3e829cc1e..ac831c9da482 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.15"; + version = "4.16"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "sha256-UXipGNWclBKgr0r0wav85Gnhp2SXkTvDFr9gKJWismU="; + sha256 = "1da9avmxs8sy92d9nrdgry2x685ral58zgf89yr88qxc0llbzq7r"; }; postPatch = '' @@ -40,6 +40,9 @@ buildGoPackage rec { cp -r _dist/src/* ../../.. popd + # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 + export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" + makeFlagsArray+=("-tags libsqlite3") ''; diff --git a/nixpkgs/pkgs/tools/admin/procs/default.nix b/nixpkgs/pkgs/tools/admin/procs/default.nix index e86bfb31101a..0578bb4703cc 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.11.8"; + version = "0.11.9"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZeCTUoi2HAMUeyze7LdxH0mi1Dd6q8Sw6+xPAVf3HTs="; + sha256 = "sha256-zqRjMCyFT7knI1/zH+RF1pA/OKaDhJZLLjWJhfmqopE="; }; - cargoSha256 = "sha256-8myay5y4PGb/8s0vPLeg9xt6xqAQxGFXJz/GiV0ABlA="; + cargoSha256 = "sha256-W/ZMDbHC1VsllTSxCt77n4eb8Xgfj9YNx5NG5u+D+qA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix b/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix index 25d3eaa15fc8..31cb2861f39f 100644 --- a/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix +++ b/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { buildInputs = with python3Packages; [ setuptools setuptools-scm salt ]; checkInputs = with python3Packages; [ - pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado + pytest mock pyzmq pytest-rerunfailures pytest-cov cherrypy tornado ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/admin/tigervnc/default.nix b/nixpkgs/pkgs/tools/admin/tigervnc/default.nix index 20d17b77741b..1ef584ec977f 100644 --- a/nixpkgs/pkgs/tools/admin/tigervnc/default.nix +++ b/nixpkgs/pkgs/tools/admin/tigervnc/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub , xorg, xkeyboard_config, zlib , libjpeg_turbo, pixman, fltk -, fontDirectories , cmake, gettext, libtool , libGLU , gnutls, pam, nettle , xterm, openssh, perl , makeWrapper +, nixosTests }: with lib; @@ -22,17 +22,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-IX39oEhTyk7NV+9dD9mFtes22fBdMTAVIv5XkqFK560="; }; - inherit fontDirectories; postPatch = '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= - for i in $fontDirectories; do - for j in $(find $i -name fonts.dir); do - addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) - done - done - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver/vncserver.in substituteInPlace vncviewer/vncviewer.cxx \ --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh' ''; @@ -98,6 +91,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; + passthru.tests.tigervnc = nixosTests.vnc.testTigerVNC; + meta = { homepage = "https://tigervnc.org/"; license = lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/admin/trivy/default.nix b/nixpkgs/pkgs/tools/admin/trivy/default.nix index 9507096335a9..50ca76f0d6d3 100644 --- a/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.18.3"; + version = "0.19.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YQYDDg4rgLygswGl/IYb+USSsuXQ8kXh4NhQYvnaCko="; + sha256 = "sha256-aYPG0xvuijASKXBGgB+6UyF9bmeU8l5snOoPWI8Ewh8="; }; - vendorSha256 = "sha256-f1un8jWhx7VfbbYV0/t3SLFXp496Wt5aEHkcuj/U4KQ="; + vendorSha256 = "sha256-4FO6/1eNyxy/CH7XMUkLfRqEg2+XUXL1gKleL6o4EoM="; excludedPackages = "misc"; diff --git a/nixpkgs/pkgs/tools/admin/turbovnc/default.nix b/nixpkgs/pkgs/tools/admin/turbovnc/default.nix index 33d248ffde88..c0af38e10f3b 100644 --- a/nixpkgs/pkgs/tools/admin/turbovnc/default.nix +++ b/nixpkgs/pkgs/tools/admin/turbovnc/default.nix @@ -95,10 +95,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/vncserver \ --prefix PATH : ${lib.makeBinPath (with xorg; [ xauth ])} - # The viewer is in Java and requires `JAVA_HOME`. + # The viewer is in Java and requires `JAVA_HOME` (which is a single + # path, cannot be multiple separated paths). # For SSH support, `ssh` is required on `PATH`. wrapProgram $out/bin/vncviewer \ - --prefix JAVA_HOME : "${lib.makeLibraryPath [ openjdk ]}/openjdk" \ + --set JAVA_HOME "${lib.makeLibraryPath [ openjdk ]}/openjdk" \ --prefix PATH : ${lib.makeBinPath [ openssh ]} ''; diff --git a/nixpkgs/pkgs/tools/admin/virtscreen/default.nix b/nixpkgs/pkgs/tools/admin/virtscreen/default.nix index ebfd6c21772f..a1558248f802 100644 --- a/nixpkgs/pkgs/tools/admin/virtscreen/default.nix +++ b/nixpkgs/pkgs/tools/admin/virtscreen/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: +{ lib +, stdenv +, fetchFromGitHub +, python3Packages +, x11vnc +, xrandr +, libGL +, qt5 +}: python3Packages.buildPythonApplication rec { pname = "virtscreen"; @@ -16,6 +24,8 @@ python3Packages.buildPythonApplication rec { sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ netifaces pyqt5 @@ -24,10 +34,17 @@ python3Packages.buildPythonApplication rec { xrandr ]; - postPatch = let - ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + # import Qt.labs.platform failed without this + "--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}" + ]; + + postPatch = '' substituteInPlace virtscreen/__main__.py \ - --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ + --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \ ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/archivers/arj/default.nix b/nixpkgs/pkgs/tools/archivers/arj/default.nix new file mode 100644 index 000000000000..e09e390fa473 --- /dev/null +++ b/nixpkgs/pkgs/tools/archivers/arj/default.nix @@ -0,0 +1,150 @@ +{stdenv, lib, fetchurl, fetchpatch, autoreconfHook}: + +stdenv.mkDerivation rec { + pname = "arj"; + version = "3.10.22"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1nx7jqxwqkihhdmdbahhzqhjqshzw1jcsvwddmxrwrn8rjdlr7jq"; + }; + + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/001_arches_align.patch"; + sha256 = "0i3qclm2mh98c04rqpx1r4qagd3wpxlkj7lvq0ddpkmr8bm0fh0m"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/002_no_remove_static_const.patch"; + sha256 = "0zfjqmjsj0y1kfzxbp29v6nxq5qwgazhb9clqc544sm5zn0bdp8n"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/003_64_bit_clean.patch"; + sha256 = "0mda9fkaqf2s1xl6vlbkbq20362h3is9dpml9kfmacpbifl4dx3n"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/004_parallel_build.patch"; + sha256 = "0gam6k7jknzmbjlf1r6c9kjh5s5h76pd31v59cnaqiycwiy8z6q9"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/005_use_system_strnlen.patch"; + sha256 = "0q0ypm8mdsxd0rl1k0id6fdx5m7mvqgwcla4r250cmc6zqzpib6d"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/006_use_safe_strcpy.patch"; + sha256 = "1garad95s34cix3kd77lz37andrcnz19glzkfdnkjaq7ldvzwikc"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/hurd_no_fcntl_getlk.patch"; + sha256 = "0b3hpn4qypimrw9ar2n4h24886sl6pmim4lb4ly1wqcq0f73arva"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security_format.patch"; + sha256 = "0q67cvln55p38bm0xwd2cgppqmkp2nfar2pg1zj78f7ncn35lbvf"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/doc_refer_robert_k_jung.patch"; + sha256 = "1wxdx0m6a9vdvjlaycwsissn75l1ni7grg8n6qmkynz2vrcvgzb1"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix.patch"; + sha256 = "19ycp1rak7l6ql28m50v95ls621w3sl8agw5r5va73svkgh8hc3g"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_flags.patch"; + sha256 = "1jw1y9i9lw1idgi4l9cycwsql1hcz1m4f3k2iybwsgx0acaw695q"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_strip.patch"; + sha256 = "1b18khj6cxnjyqk2ycygwqlcs20hrsbf4h6bckl99dxnpbq5blxi"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_pie.patch"; + sha256 = "1jqswxgc1plipblf055n9175fbanfi6fb67lnzk8dcvxjn227fs3"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/self_integrity_64bit.patch"; + sha256 = "0s5zdq81a0f83hdg9hy6lqn3xvckx9y9r20awczm9mbf11vi01cb"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-afl.patch"; + sha256 = "0yajcwpghij8wg21a0kkp3f9x7anz5m121jx2vnkyn04bvi9541a"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-dir.patch"; + sha256 = "10lv3867k0wm2s0cyf40hkxfqbjaxm4aph5ivk2q2rjkracrn2y4"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-symlink.patch"; + sha256 = "095pdfskxwh0jnyy31dpz10s2ppv8n7lvvn4q722y3g71d0c79qq"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/out-of-bounds-read.patch"; + sha256 = "0ps9lqkbqzlhzr2bnr47sir431z1nywr7nagkmk42iki4d96v0jq"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/remove_build_date.patch"; + sha256 = "1vjlfq6firxpj068l9acyqs77mfydn1rwgr2jmxgsy9mq0fw1dsc"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/reproducible_help_archive.patch"; + sha256 = "0l3qi9f140pwc6fk8qdbxx4g9d8zlf45asimmr8wfpbi4pf59n8i"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_cross.patch"; + sha256 = "1vb0vbh3jbxj192q47vg3f41l343ghcz2ypbrrm2bkbpwm5cl8qr"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/fix-time_t-usage.patch"; + sha256 = "012c6pnf5y4jwn715kxn3vjy088rm905959j6yh8bslyx84qaijv"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix_autoreconf.patch"; + sha256 = "0yhxbdasnbqcg1nyx2379fpbr7fmdlv4n2nlxrv1z1vbc7rlvw9d"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + preAutoreconf = '' + cd gnu + ''; + + postConfigure = '' + cd .. + ''; + + meta = with lib; { + description = "Open-source implementation of the world-famous ARJ archiver"; + longDescription = '' + This version of ARJ has been created with an intent to preserve maximum + compatibility and retain the feature set of the original ARJ archiver as + provided by ARJ Software, Inc. + ''; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/archivers/lha/default.nix b/nixpkgs/pkgs/tools/archivers/lha/default.nix new file mode 100644 index 000000000000..f6b5c2bd1350 --- /dev/null +++ b/nixpkgs/pkgs/tools/archivers/lha/default.nix @@ -0,0 +1,27 @@ +{stdenv, lib, fetchFromGitHub, autoreconfHook}: + +stdenv.mkDerivation { + pname = "lha"; + version = "unstable-2021-01-07"; + + src = fetchFromGitHub { + owner = "jca02266"; + repo = "lha"; + rev = "03475355bc6311f7f816ea9a88fb34a0029d975b"; + sha256 = "18w2x0g5yq89yxkxh1fmb05lz4hw7a3b4jmkk95gvh11mwbbr5lm"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "LHa is an archiver and compressor using the LZSS and Huffman encoding compression algorithms"; + platforms = platforms.unix; + maintainers = [ maintainers.sander ]; + # Some of the original LhA code has been rewritten and the current author + # considers adopting a "true" free and open source license for it. + # However, old code is still covered by the original LHa license, which is + # not a free software license (it has additional requirements on commercial + # use). + license = licenses.unfree; + }; +} diff --git a/nixpkgs/pkgs/tools/archivers/p7zip/default.nix b/nixpkgs/pkgs/tools/archivers/p7zip/default.nix index 8ba87da6b6ac..96f9262427b0 100644 --- a/nixpkgs/pkgs/tools/archivers/p7zip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/p7zip/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "17.04"; src = fetchFromGitHub { - owner = "szcnick"; + owner = "jinfeihan57"; repo = pname; rev = "v${version}"; sha256 = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18="; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { - homepage = "https://github.com/szcnick/p7zip"; + homepage = "https://github.com/jinfeihan57/p7zip"; description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.raskin ]; diff --git a/nixpkgs/pkgs/tools/archivers/unar/default.nix b/nixpkgs/pkgs/tools/archivers/unar/default.nix index 4021bc92e062..f3f7b32e1192 100644 --- a/nixpkgs/pkgs/tools/archivers/unar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unar/default.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { homepage = "https://theunarchiver.com"; description = "An archive unpacker program"; longDescription = '' - The Unarchiver is an archive unpacker program with support for the popular \ - zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, \ - and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, \ - Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \ + The Unarchiver is an archive unpacker program with support for the popular + zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, + and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, + Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; license = licenses.lgpl21Plus; maintainers = with maintainers; [ peterhoeg ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix index e94092210693..57d35633128d 100644 --- a/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix +++ b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, gtk3, pkg-config, intltool, libxslt, makeWrapper, - coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: + coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { version = "0.5.4.17"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/xarchiver \ - --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]} + --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unar gnutar bzip2 gzip lhasa coreutils ]} ''; meta = { diff --git a/nixpkgs/pkgs/tools/archivers/zpaq/default.nix b/nixpkgs/pkgs/tools/archivers/zpaq/default.nix index 08d98716f1f2..150633e620ae 100644 --- a/nixpkgs/pkgs/tools/archivers/zpaq/default.nix +++ b/nixpkgs/pkgs/tools/archivers/zpaq/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/audio/beets/default.nix b/nixpkgs/pkgs/tools/audio/beets/default.nix index c218aa7e4e12..059174ae0a27 100644 --- a/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -133,7 +133,7 @@ in pythonPackages.buildPythonApplication rec { ++ lib.optional enableAcoustid pythonPackages.pyacoustid ++ lib.optional enableBeatport pythonPackages.requests_oauthlib ++ lib.optional enableConvert ffmpeg - ++ lib.optional enableDiscogs pythonPackages.discogs_client + ++ lib.optional enableDiscogs pythonPackages.discogs-client ++ lib.optional (enableFetchart || enableDeezer || enableEmbyupdate @@ -175,7 +175,7 @@ in pythonPackages.buildPythonApplication rec { # https://github.com/beetbox/beets/blob/v1.4.9/setup.py pylast mpd2 - discogs_client + discogs-client pyxdg ]; diff --git a/nixpkgs/pkgs/tools/audio/tts/default.nix b/nixpkgs/pkgs/tools/audio/tts/default.nix index 0e57e19a2883..7906c92ba881 100644 --- a/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -1,7 +1,6 @@ { lib -, python3Packages +, python38 , fetchFromGitHub -, python3 , fetchpatch }: @@ -12,38 +11,43 @@ # # If you upgrade from an old version you may have to delete old models from ~/.local/share/tts # Also note that your tts version might not support all available models so check: -# https://github.com/coqui-ai/TTS/releases/tag/v0.0.15.1 +# https://github.com/coqui-ai/TTS/releases/tag/v0.1.2 # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 -python3Packages.buildPythonApplication rec { +let + python3 = python38; +in python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.0.15.1"; + version = "0.1.2"; + + # https://github.com/coqui-ai/TTS/issues/570 + disabled = python3.pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "0z6sbzspgmw5ja8r2zysyhdk4jzlv88a0ihkvxvvwxslkyncdb89"; + sha256 = "1qgiaqn7iqxyf54qgnpmli69nw9s3gmi9qv874jsgycykc10hjg4"; }; postPatch = '' sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt - sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt sed -i -e 's!numba==[^"]*!numba!' requirements.txt sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt ''; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3.pkgs; [ cython ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ anyascii coqpit flask + gruut gdown inflect jieba @@ -69,11 +73,11 @@ python3Packages.buildPythonApplication rec { # cython modules are not installed for some reasons ( cd TTS/tts/layers/glow_tts/monotonic_align - ${python3Packages.python.interpreter} setup.py install --prefix=$out + ${python3.interpreter} setup.py install --prefix=$out ) ''; - checkInputs = with python3Packages; [ + checkInputs = with python3.pkgs; [ pytest-sugar pytestCheckHook ]; diff --git a/nixpkgs/pkgs/tools/backup/borgbackup/default.nix b/nixpkgs/pkgs/tools/backup/borgbackup/default.nix index d0e48454a368..ce7887ff0fb8 100644 --- a/nixpkgs/pkgs/tools/backup/borgbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/borgbackup/default.nix @@ -1,33 +1,53 @@ -{ lib, stdenv, python3, fetchpatch, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: +{ lib +, stdenv +, acl +, e2fsprogs +, libb2 +, lz4 +, openssh +, openssl +, python3 +, zstd +, nixosTests +}: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.16"; + version = "1.1.17"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw"; + sha256 = "0x0ncy0b0bmf586hbdgrif3gjmkdw760vfnfxndr493v07y29fbs"; }; - patches = [ - # fix compatibility with sphinx 4 - (fetchpatch { - url = "https://github.com/borgbackup/borg/commit/6a1f31bf2914d167e2f5051f1d531d5d4a19f54b.patch"; - includes = [ "docs/conf.py" ]; - sha256 = "0aa4kyb3j4apgwqcy1hzg6lxvpf60m2mijcj60vh101b42410hiz"; - }) - ]; + postPatch = '' + # sandbox does not support setuid/setgid/sticky bits + substituteInPlace src/borg/testsuite/archiver.py \ + --replace "0o4755" "0o0755" + ''; nativeBuildInputs = with python3.pkgs; [ setuptools-scm # For building documentation: - sphinx guzzle_sphinx_theme + sphinx + guzzle_sphinx_theme ]; + buildInputs = [ - libb2 lz4 zstd openssl - ] ++ lib.optionals stdenv.isLinux [ acl ]; + libb2 + lz4 + zstd + openssl + ] ++ lib.optionals stdenv.isLinux [ + acl + ]; + propagatedBuildInputs = with python3.pkgs; [ - cython llfuse + cython + llfuse + packaging + ] ++ lib.optionals (!stdenv.isDarwin) [ + pyfuse3 ]; preConfigure = '' @@ -61,15 +81,36 @@ python3.pkgs.buildPythonApplication rec { ''; checkInputs = with python3.pkgs; [ - pytest + e2fsprogs + pytest-benchmark + pytest-xdist + pytestCheckHook ]; - checkPhase = '' - HOME=$(mktemp -d) py.test --pyargs borg.testsuite - ''; + pytestFlagsArray = [ + "--numprocesses" "auto" + "--benchmark-skip" + "--pyargs" "borg.testsuite" + ]; - # 64 failures, needs pytest-benchmark - doCheck = false; + disabledTests = [ + # fuse: device not found, try 'modprobe fuse' first + "test_fuse" + "test_fuse_allow_damaged_files" + "test_fuse_mount_hardlinks" + "test_fuse_mount_options" + "test_fuse_versions_view" + "test_readonly_mount" + # Error: Permission denied while trying to write to /var/{,tmp} + "test_get_cache_dir" + "test_get_keys_dir" + "test_get_security_dir" + "test_get_config_dir" + ]; + + preCheck = '' + export HOME=$TEMP + ''; passthru.tests = { inherit (nixosTests) borgbackup; diff --git a/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/nixpkgs/pkgs/tools/backup/btrbk/default.nix index 4b4dadd4faff..12308b240450 100644 --- a/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ asymmetric ]; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix index 76b7d1da59b4..770a64b841c3 100644 --- a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "discordchatexporter-cli"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "1bcq8mwjr8635g8mkgbxnszk20hnwf0zk672glrxjqga6f6fnykg"; + sha256 = "0hbhDlGEK2rxuCByW8RaT/0vne8Z+q0ZobCkW1FBoG8="; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ]; diff --git a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix index a7703f2ba2c1..9849e6c63662 100644 --- a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,8 +1,8 @@ { fetchNuGet }: [ (fetchNuGet { name = "CliFx"; - version = "2.0.4"; - sha256 = "1wwpjli4y2545yi6k17mvjqy994wl3wm6nngszk87rbdwhkbncaj"; + version = "2.0.6"; + sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6"; }) (fetchNuGet { name = "Gress"; @@ -46,8 +46,13 @@ }) (fetchNuGet { name = "Spectre.Console"; - version = "0.40.0"; - sha256 = "17bb31nsvfk7m337zwqcz4v6cvayhfx51ri4yrv5i8nbp7f4rpb1"; + version = "0.41.0"; + sha256 = "104vyzwbbq5m75dm31xk7ilvmik8hw1cj3bc301a8w6gq8i0fpk3"; + }) + (fetchNuGet { + name = "Superpower"; + version = "2.3.0"; + sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; }) (fetchNuGet { name = "System.Memory"; diff --git a/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/nixpkgs/pkgs/tools/backup/duplicity/default.nix index 24e1a2954ed6..28929615bcdb 100644 --- a/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -1,6 +1,7 @@ { lib, stdenv -, fetchurl -, pythonPackages +, fetchFromGitLab +, fetchpatch +, python38 , librsync , ncftp , gnupg @@ -12,16 +13,19 @@ , gettext }: let + pythonPackages = python38.pkgs; inherit (lib.versions) majorMinor splitVersion; majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v)); in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.17"; + version = "0.8.20"; - src = fetchurl { - url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "114rwkf9b3h4fcagrx013sb7krc4hafbwl9gawjph2wd9pkv2wx2"; + src = fetchFromGitLab { + owner = "duplicity"; + repo = "duplicity"; + rev = "rel.${version}"; + sha256 = "13ghra0myq6h6yx8qli55bh8dg91nf1hpd8l7d7xamgrw6b188sm"; }; patches = [ @@ -31,6 +35,13 @@ pythonPackages.buildPythonApplication rec { # Our Python infrastructure runs test in installCheckPhase so we need # to make the testing code stop assuming it is run from the source directory. ./use-installed-scripts-in-test.patch + + # https://gitlab.com/duplicity/duplicity/-/merge_requests/64 + # remove on next release + (fetchpatch { + url = "https://gitlab.com/duplicity/duplicity/-/commit/5c229a9b42f67257c747fbc0022c698fec405bbc.patch"; + sha256 = "05v931rnawfv11cyxj8gykmal8rj5vq2ksdysyr2mb4sl81mi7v0"; + }) ] ++ lib.optionals stdenv.isLinux [ # Broken on Linux in Nix' build environment ./linux-disable-timezone-test.patch @@ -38,6 +49,15 @@ pythonPackages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; + preConfigure = '' + # fix version displayed by duplicity --version + # see SourceCopy in setup.py + ls + for i in bin/*.1 duplicity/__init__.py; do + substituteInPlace "$i" --replace '$version' "${version}" + done + ''; + nativeBuildInputs = [ makeWrapper gettext @@ -50,7 +70,6 @@ pythonPackages.buildPythonApplication rec { pythonPath = with pythonPackages; [ b2sdk - boto boto3 cffi cryptography @@ -81,7 +100,7 @@ pythonPackages.buildPythonApplication rec { mock pexpect pytest - pytestrunner + pytest-runner ]); postInstall = '' @@ -102,6 +121,9 @@ pythonPackages.buildPythonApplication rec { # Don't run developer-only checks (pep8, etc.). export RUN_CODE_TESTS=0 + + # check version string + duplicity --version | grep ${version} '' + lib.optionalString stdenv.isDarwin '' # Work around the following error when running tests: # > Max open files of 256 is too low, should be >= 1024. diff --git a/nixpkgs/pkgs/tools/backup/duplicity/gnutar-in-test.patch b/nixpkgs/pkgs/tools/backup/duplicity/gnutar-in-test.patch index 694fc8819509..ee95b68e2abb 100644 --- a/nixpkgs/pkgs/tools/backup/duplicity/gnutar-in-test.patch +++ b/nixpkgs/pkgs/tools/backup/duplicity/gnutar-in-test.patch @@ -1,9 +1,11 @@ +diff --git a/testing/functional/test_restart.py b/testing/functional/test_restart.py +index 6d972c82..e8435fd5 100644 --- a/testing/functional/test_restart.py +++ b/testing/functional/test_restart.py -@@ -323,14 +323,7 @@ class RestartTestWithoutEncryption(RestartTest): +@@ -350,14 +350,7 @@ class RestartTestWithoutEncryption(RestartTest): https://launchpad.net/bugs/929067 """ - + - if platform.system().startswith(u'Linux'): - tarcmd = u"tar" - elif platform.system().startswith(u'Darwin'): @@ -13,6 +15,6 @@ - else: - raise Exception(u"Platform %s not supported by tar/gtar." % platform.platform()) + tarcmd = u"tar" - + # Intial normal backup - self.backup("full", "testfiles/blocktartest") + self.backup(u"full", u"{0}/testfiles/blocktartest".format(_runtest_dir)) diff --git a/nixpkgs/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch b/nixpkgs/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch index b5e6df18a15b..e322625cdbf4 100644 --- a/nixpkgs/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch +++ b/nixpkgs/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch @@ -1,10 +1,16 @@ +commit f0142706c377b7c133753db57b5c4c90baa2de30 +Author: Guillaume Girol <symphorien+git@xlumurb.eu> +Date: Sun Jul 11 17:48:15 2021 +0200 + +diff --git a/testing/unit/test_statistics.py b/testing/unit/test_statistics.py +index 4be5000c..80545853 100644 --- a/testing/unit/test_statistics.py +++ b/testing/unit/test_statistics.py -@@ -59,6 +59,7 @@ class StatsObjTest(UnitTestCase): +@@ -63,6 +63,7 @@ class StatsObjTest(UnitTestCase): s1 = StatsDeltaProcess() - assert s1.get_stat('SourceFiles') == 0 - + assert s1.get_stat(u'SourceFiles') == 0 + + @unittest.skip("Broken on Linux in Nix' build environment") def test_get_stats_string(self): - """Test conversion of stat object into string""" + u"""Test conversion of stat object into string""" s = StatsObj() diff --git a/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch index c02527cf3948..a5ddc4381bd8 100644 --- a/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch +++ b/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch @@ -1,48 +1,62 @@ +commit ccd4dd92cd37acce1da20966ad9e4e0c7bcf1709 +Author: Guillaume Girol <symphorien+git@xlumurb.eu> +Date: Sun Jul 11 12:00:00 2021 +0000 + + use installed duplicity when running tests + +diff --git a/setup.py b/setup.py +index fa474f20..604a242a 100755 --- a/setup.py +++ b/setup.py -@@ -92,10 +92,6 @@ class TestCommand(test): +@@ -205,10 +205,6 @@ class TestCommand(test): except Exception: pass - + - os.environ[u'PATH'] = u"%s:%s" % ( - os.path.abspath(build_scripts_cmd.build_dir), - os.environ.get(u'PATH')) - test.run(self) - - def run_tests(self): + + +diff --git a/testing/functional/__init__.py b/testing/functional/__init__.py +index 4221576d..3cf44945 100644 --- a/testing/functional/__init__.py +++ b/testing/functional/__init__.py -@@ -107,7 +107,7 @@ class FunctionalTestCase(DuplicityTestCase): - if basepython is not None: - cmd_list.extend([basepython]) +@@ -111,7 +111,7 @@ class FunctionalTestCase(DuplicityTestCase): + run_coverage = os.environ.get(u'RUN_COVERAGE', None) + if run_coverage is not None: cmd_list.extend([u"-m", u"coverage", u"run", u"--source=duplicity", u"-p"]) -- cmd_list.extend([u"../bin/duplicity"]) +- cmd_list.extend([u"{0}/bin/duplicity".format(_top_dir)]) + cmd_list.extend([u"duplicity"]) cmd_list.extend(options) cmd_list.extend([u"-v0"]) cmd_list.extend([u"--no-print-statistics"]) +diff --git a/testing/functional/test_log.py b/testing/functional/test_log.py +index 9dfc86a6..b9cb55db 100644 --- a/testing/functional/test_log.py +++ b/testing/functional/test_log.py -@@ -47,9 +47,9 @@ class LogTest(FunctionalTestCase): +@@ -49,9 +49,9 @@ class LogTest(FunctionalTestCase): # Run actual duplicity command (will fail, because no arguments passed) basepython = os.environ.get(u'TOXPYTHON', None) if basepython is not None: -- os.system(u"{} ../bin/duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile)) -+ os.system(u"{} duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile)) +- os.system(u"{0} {1}/bin/duplicity --log-file={2} >/dev/null 2>&1".format(basepython, _top_dir, self.logfile)) ++ os.system(u"{0} duplicity --log-file={1} >/dev/null 2>&1".format(basepython, self.logfile)) else: -- os.system(u"../bin/duplicity --log-file={} >/dev/null 2>&1".format(self.logfile)) -+ os.system(u"duplicity --log-file={} >/dev/null 2>&1".format(self.logfile)) +- os.system(u"{0}/bin/duplicity --log-file={1} >/dev/null 2>&1".format(_top_dir, self.logfile)) ++ os.system(u"duplicity --log-file={0} >/dev/null 2>&1".format(self.logfile)) # The format of the file should be: # """ERROR 2 +diff --git a/testing/functional/test_rdiffdir.py b/testing/functional/test_rdiffdir.py +index 0cbfdb33..47acd029 100644 --- a/testing/functional/test_rdiffdir.py +++ b/testing/functional/test_rdiffdir.py -@@ -42,7 +42,7 @@ class RdiffdirTest(FunctionalTestCase): +@@ -44,7 +44,7 @@ class RdiffdirTest(FunctionalTestCase): basepython = os.environ.get(u'TOXPYTHON', None) if basepython is not None: cmd_list.extend([basepython]) -- cmd_list.extend([u"../bin/rdiffdir"]) +- cmd_list.extend([u"{0}/bin/rdiffdir".format(_top_dir)]) + cmd_list.extend([u"rdiffdir"]) cmd_list.extend(argstring.split()) cmdline = u" ".join([u'"%s"' % x for x in cmd_list]) diff --git a/nixpkgs/pkgs/tools/backup/lvmsync/default.nix b/nixpkgs/pkgs/tools/backup/lvmsync/default.nix index c289c3938ab7..e36e20902df8 100644 --- a/nixpkgs/pkgs/tools/backup/lvmsync/default.nix +++ b/nixpkgs/pkgs/tools/backup/lvmsync/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - phases = ["installPhase"]; + dontUnpack = true; installPhase = let env = bundlerEnv { diff --git a/nixpkgs/pkgs/tools/backup/ori/default.nix b/nixpkgs/pkgs/tools/backup/ori/default.nix index 5e6e6a95ae72..01da407695a4 100644 --- a/nixpkgs/pkgs/tools/backup/ori/default.nix +++ b/nixpkgs/pkgs/tools/backup/ori/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { scons PREFIX=$out WITH_ORILOCAL=1 install ''; - installPhase = ":"; + dontInstall = true; meta = with lib; { description = "A secure distributed file system"; diff --git a/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix index 0d24e3df7206..3307ba08b118 100644 --- a/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,23 +1,36 @@ -{lib, fetchurl, python2Packages, librsync, gnused }: +{ lib, python3Packages, librsync }: -python2Packages.buildPythonApplication { - name = "rdiff-backup-1.3.3"; +let + pypkgs = python3Packages; - src = fetchurl { - url = "mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz"; - sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf"; +in +pypkgs.buildPythonApplication rec { + pname = "rdiff-backup"; + version = "2.0.5"; + + src = pypkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s="; }; - patches = [ ./fix-librsync-rs_default_strong_len.patch ]; + # pkg_resources fails to find the version and then falls back to "DEV" + postPatch = '' + substituteInPlace src/rdiff_backup/Globals.py \ + --replace 'version = "DEV"' 'version = "${version}"' + ''; + + buildInputs = [ librsync ]; - buildInputs = [ librsync gnused ]; + nativeBuildInputs = with pypkgs; [ setuptools-scm ]; + # no tests from pypi doCheck = false; - meta = { + meta = with lib; { description = "Backup system trying to combine best a mirror and an incremental backup system"; - homepage = "http://rdiff-backup.nongnu.org/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.all; + homepage = "https://rdiff-backup.net"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch b/nixpkgs/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch deleted file mode 100644 index ce23c8a8124f..000000000000 --- a/nixpkgs/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch +++ /dev/null @@ -1,20 +0,0 @@ -Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 to avoid a build failure with -librsync >= 1.0.0 (which is a security bugfix release). The discussion and solution finding can be -found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity). - ---- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100 -+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0 2015-03-02 00:54:24.000000000 +0100 -@@ -59,8 +59,13 @@ - if (sm == NULL) return NULL; - sm->x_attr = NULL; - -+#ifdef RS_DEFAULT_STRONG_LEN - sm->sig_job = rs_sig_begin((size_t)blocklen, - (size_t)RS_DEFAULT_STRONG_LEN); -+#else -+ sm->sig_job = rs_sig_begin((size_t)blocklen, -+ (size_t)8, RS_MD4_SIG_MAGIC); -+#endif - return (PyObject*)sm; - } - diff --git a/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix index c167ad1fa018..fa2f69bb3ef5 100644 --- a/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix +++ b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytestcov, pytestrunner, lib, stringcase +, pytest-cov, pytest-runner, lib, stringcase }: buildPythonApplication rec { @@ -15,11 +15,11 @@ buildPythonApplication rec { hypothesis mypy pytest - pytestcov + pytest-cov ]; buildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/backup/zrepl/default.nix b/nixpkgs/pkgs/tools/backup/zrepl/default.nix index a7111633545e..59dbfc0be72e 100644 --- a/nixpkgs/pkgs/tools/backup/zrepl/default.nix +++ b/nixpkgs/pkgs/tools/backup/zrepl/default.nix @@ -1,5 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub }: - +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, openssh +}: buildGoModule rec { pname = "zrepl"; version = "0.4.0"; @@ -15,10 +19,17 @@ buildGoModule rec { subPackages = [ "." ]; + nativeBuildInputs = [ + makeWrapper + ]; + postInstall = '' mkdir -p $out/lib/systemd/system substitute dist/systemd/zrepl.service $out/lib/systemd/system/zrepl.service \ --replace /usr/local/bin/zrepl $out/bin/zrepl + + wrapProgram $out/bin/zrepl \ + --prefix PATH : ${lib.makeBinPath [ openssh ]} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/cd-dvd/brasero/wrapper.nix b/nixpkgs/pkgs/tools/cd-dvd/brasero/wrapper.nix index 8112b0971f3d..5371e8d526b8 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -6,7 +6,7 @@ in symlinkJoin { name = "brasero-${brasero-original.version}"; paths = [ brasero-original ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/brasero \ diff --git a/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix b/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix index a202ee9376b0..59e8bf8843a4 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, libdvdread, pkg-config }: -let - version = "0.17"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lsdvd"; - inherit version; + version = "0.17"; src = fetchurl { url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz"; sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x"; diff --git a/nixpkgs/pkgs/tools/compression/brotli/default.nix b/nixpkgs/pkgs/tools/compression/brotli/default.nix index af0cbc4fe22e..dfac5af0980b 100644 --- a/nixpkgs/pkgs/tools/compression/brotli/default.nix +++ b/nixpkgs/pkgs/tools/compression/brotli/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic }: @@ -11,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v" + version; + rev = "v${version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -24,8 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); - cmakeFlags = [] - ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; + cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; @@ -36,13 +39,13 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = '' - rm BUILD + rm BUILD - # Upstream fixed this reference to runtime-path after the release - # and with this references g++ complains about invalid option -R - sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in - cat scripts/libbrotli*.pc.in - ''; + # Upstream fixed this reference to runtime-path after the release + # and with this references g++ complains about invalid option -R + sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in + cat scripts/libbrotli*.pc.in + ''; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. @@ -53,10 +56,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit (src.meta) homepage; - + homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; - longDescription = '' Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { in the following internet draft: http://www.ietf.org/id/draft-alakuijala-brotli ''; - license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/compression/bsc/default.nix b/nixpkgs/pkgs/tools/compression/bsc/default.nix index ac0c0544f017..93b715f853cf 100644 --- a/nixpkgs/pkgs/tools/compression/bsc/default.nix +++ b/nixpkgs/pkgs/tools/compression/bsc/default.nix @@ -1,30 +1,31 @@ -{ lib, stdenv, fetchurl, openmp ? null }: +{ lib, stdenv, fetchFromGitHub, openmp }: stdenv.mkDerivation rec { pname = "bsc"; version = "3.1.0"; - src = fetchurl { - url = "https://github.com/IlyaGrebnov/libbsc/archive/${version}.tar.gz"; - sha256 = "01yhizaf6qjv1plyrx0fcib264maa5qwvgfvvid9rzlzj9fxjib6"; + src = fetchFromGitHub { + owner = "IlyaGrebnov"; + repo = "libbsc"; + rev = version; + sha256 = "0c0jmirh9y23kyi1jnrm13sa3xsjn54jazfr84ag45pai279fciz"; }; enableParallelBuilding = true; buildInputs = lib.optional stdenv.isDarwin openmp; - prePatch = '' + postPatch = '' substituteInPlace makefile \ --replace 'g++' '$(CXX)' ''; - preInstall = '' - makeFlagsArray+=("PREFIX=$out") - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "High performance block-sorting data compression library"; homepage = "http://libbsc.com/"; + maintainers = with maintainers; [ ]; # 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/bsdiff/default.nix b/nixpkgs/pkgs/tools/compression/bsdiff/default.nix index 8b5dfe919c7d..8f8818781ab4 100644 --- a/nixpkgs/pkgs/tools/compression/bsdiff/default.nix +++ b/nixpkgs/pkgs/tools/compression/bsdiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { cp bspatch.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { description = "An efficient binary diff/patch tool"; - homepage = "http://www.daemonology.net/bsdiff"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; + homepage = "https://www.daemonology.net/bsdiff/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix b/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix index 07b6a5979a4f..0dd703035fa9 100644 --- a/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix +++ b/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix @@ -1,28 +1,30 @@ { lib, stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { - pname = "dejsonlz4"; - version = "1.1"; - src = fetchFromGitHub { - owner = "avih"; - repo = pname; - rev = "v${version}"; - sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; - }; + pname = "dejsonlz4"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "avih"; + repo = pname; + rev = "v${version}"; + sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; + }; - buildPhase = '' - ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c - ''; + buildPhase = '' + ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c + ''; - installPhase = '' - mkdir -p $out/bin/ - cp dejsonlz4 $out/bin/ - ''; + installPhase = '' + mkdir -p $out/bin/ + cp dejsonlz4 $out/bin/ + ''; - meta = with lib; { - description = "Decompress Mozilla Firefox bookmarks backup files"; - homepage = "https://github.com/avih/dejsonlz4"; - license = licenses.bsd2; - maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.all; - }; - } + meta = with lib; { + description = "Decompress Mozilla Firefox bookmarks backup files"; + homepage = "https://github.com/avih/dejsonlz4"; + license = licenses.bsd2; + maintainers = with maintainers; [ mt-caret ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/compression/gzrt/default.nix b/nixpkgs/pkgs/tools/compression/gzrt/default.nix index 18efc1b64c28..664c1eb78565 100644 --- a/nixpkgs/pkgs/tools/compression/gzrt/default.nix +++ b/nixpkgs/pkgs/tools/compression/gzrt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "gzrt-0.8"; + pname = "gzrt"; + version = "0.8"; src = fetchurl { - url = "https://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz"; + url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${version}.tar.gz"; sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; }; @@ -15,10 +16,11 @@ stdenv.mkDerivation rec { cp gzrecover $out/bin ''; - meta = { + meta = with lib; { homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/compression/kzipmix/default.nix b/nixpkgs/pkgs/tools/compression/kzipmix/default.nix index 73931f6bcaea..9072a24b7fb5 100644 --- a/nixpkgs/pkgs/tools/compression/kzipmix/default.nix +++ b/nixpkgs/pkgs/tools/compression/kzipmix/default.nix @@ -1,25 +1,26 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "kzipmix-20091108"; +stdenv.mkDerivation rec { + pname = "kzipmix"; + version = "20200115"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz"; - sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; + url = "http://static.jonof.id.au/dl/kenutils/kzipmix-${version}-linux.tar.gz"; + sha256 = "sha256-ePgye0D6/ED53zx6xffLnYhkjed7SPU4BLOZQr9E3yA="; }; installPhase = '' mkdir -p $out/bin - cp kzip zipmix $out/bin + cp amd64/{kzip,zipmix} $out/bin patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix ''; - meta = { + meta = with lib; { description = "A tool that aggressively optimizes the sizes of Zip archives"; - license = lib.licenses.unfree; + license = licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ maintainers.sander ]; }; } diff --git a/nixpkgs/pkgs/tools/compression/lbzip2/default.nix b/nixpkgs/pkgs/tools/compression/lbzip2/default.nix index 4072dd43aef1..6d4017ac62ca 100644 --- a/nixpkgs/pkgs/tools/compression/lbzip2/default.nix +++ b/nixpkgs/pkgs/tools/compression/lbzip2/default.nix @@ -1,20 +1,21 @@ { lib, stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: stdenv.mkDerivation rec { + pname = "lbzip2"; version = "2.5"; - name = "lbzip2-${version}"; src = fetchFromGitHub { owner = "kjn"; repo = "lbzip2"; - sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; rev = "v${version}"; + sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; }; buildInputs = [ gnulib perl ]; nativeBuildInputs = [ autoconf automake ]; preConfigure = '' + substituteInPlace configure.ac --replace 'AC_PREREQ([2.63])' 'AC_PREREQ(2.64)' ./build-aux/autogen.sh ''; diff --git a/nixpkgs/pkgs/tools/compression/lhasa/default.nix b/nixpkgs/pkgs/tools/compression/lhasa/default.nix index 77df84879b8d..4f1ba702831f 100644 --- a/nixpkgs/pkgs/tools/compression/lhasa/default.nix +++ b/nixpkgs/pkgs/tools/compression/lhasa/default.nix @@ -1,21 +1,24 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "lhasa"; + version = "0.3.1"; -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-${version}.tar.gz"; sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; }; - meta = { + + meta = with lib; { description = "Free Software replacement for the Unix LHA tool"; longDescription = '' Lhasa is a Free Software replacement for the Unix LHA tool, for decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for the tool is a library, so that it can be reused for other purposes. ''; - license = lib.licenses.isc; + license = licenses.isc; homepage = "http://fragglet.github.io/lhasa"; - maintainers = with lib; [ maintainers.sander ]; - platforms = with lib.platforms; linux ++ darwin; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/nixpkgs/pkgs/tools/compression/lrzip/default.nix index 9f4f66521f66..02f62c3e3c01 100644 --- a/nixpkgs/pkgs/tools/compression/lrzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/lrzip/default.nix @@ -1,8 +1,8 @@ -{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}: +{ lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl }: stdenv.mkDerivation rec { - version = "0.641"; pname = "lrzip"; + version = "0.641"; src = fetchurl { url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz"; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { "--disable-asm" ]; - meta = { + meta = with lib; { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = lib.licenses.gpl2Plus; - inherit version; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/compression/lzop/default.nix b/nixpkgs/pkgs/tools/compression/lzop/default.nix index be31048c2186..8bf58d9cc356 100644 --- a/nixpkgs/pkgs/tools/compression/lzop/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzop/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, lzo}: +{ lib, stdenv, fetchurl, lzo }: stdenv.mkDerivation rec { - name = "lzop-1.04"; + pname = "lzop"; + version = "1.04"; + src = fetchurl { - url = "https://www.lzop.org/download/${name}.tar.gz"; + url = "https://www.lzop.org/download/lzop-${version}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; @@ -12,6 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.lzop.org"; description = "Fast file compressor"; + maintainers = with maintainers; [ ]; 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 dabde674d2eb..0aec49827e6d 100644 --- a/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix +++ b/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { buildInputs = [ python3 python3.pkgs.python-lz4 ]; meta = { - inherit version; description = "A script to handle Mozilla's mozlz4 files"; license = lib.licenses.bsd2; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/compression/pigz/default.nix b/nixpkgs/pkgs/tools/compression/pigz/default.nix index a4cdcc08549e..6dbe190c400b 100644 --- a/nixpkgs/pkgs/tools/compression/pigz/default.nix +++ b/nixpkgs/pkgs/tools/compression/pigz/default.nix @@ -1,36 +1,34 @@ { lib, stdenv, fetchurl, zlib, util-linux }: -let name = "pigz"; - version = "2.6"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pigz"; + version = "2.6"; src = fetchurl { - url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; + url = "https://www.zlib.net/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0="; }; enableParallelBuilding = true; - buildInputs = [zlib] ++ lib.optional stdenv.isLinux util-linux; + buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; doCheck = stdenv.isLinux; checkTarget = "tests"; - installPhase = - '' - install -Dm755 pigz "$out/bin/pigz" - ln -s pigz "$out/bin/unpigz" - install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" - ln -s pigz.1 "$out/share/man/man1/unpigz.1" - install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" + installPhase = '' + install -Dm755 pigz "$out/bin/pigz" + ln -s pigz "$out/bin/unpigz" + install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" + ln -s pigz.1 "$out/share/man/man1/unpigz.1" + install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" ''; meta = with lib; { - homepage = "http://www.zlib.net/pigz/"; + homepage = "https://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; + maintainers = with maintainers; [ ]; license = licenses.zlib; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/compression/pixz/default.nix b/nixpkgs/pkgs/tools/compression/pixz/default.nix index d0418ffdd60d..ec05a44a5189 100644 --- a/nixpkgs/pkgs/tools/compression/pixz/default.nix +++ b/nixpkgs/pkgs/tools/compression/pixz/default.nix @@ -1,25 +1,42 @@ -{ - lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config - , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl - , libarchive, xz +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, asciidoc +, libxslt +, libxml2 +, docbook_xml_dtd_45 +, docbook_xsl +, libarchive +, xz }: + stdenv.mkDerivation rec { - baseName = "pixz"; + pname = "pixz"; version = "1.0.7"; - name = "${baseName}-${version}"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - autoconf automake libtool asciidoc libxslt libxml2 - docbook_xml_dtd_45 docbook_xsl - libarchive xz + autoconf + automake + libtool + asciidoc + libxslt + libxml2 + docbook_xml_dtd_45 + docbook_xsl + libarchive + xz ]; preBuild = '' echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" ''; src = fetchFromGitHub { owner = "vasi"; - repo = baseName; + repo = pname; rev = "v${version}"; sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2"; }; @@ -27,11 +44,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { - inherit version; + meta = with lib; { description = "A parallel compressor/decompressor for xz format"; - license = lib.licenses.bsd2; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.bsd2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/nixpkgs/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch deleted file mode 100644 index fac8f1fc147c..000000000000 --- a/nixpkgs/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b8f9827fc4de9296c7a6f5e6fdac46e070cd6cb4 Mon Sep 17 00:00:00 2001 -From: Igor Pashev <pashev.igor@gmail.com> -Date: Sat, 1 Nov 2014 18:10:05 +0300 -Subject: [PATCH] Fixed crash on Linux when stack size is unlimited - ---- - pxz.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pxz.c b/pxz.c -index 9cb843e..52713e2 100644 ---- a/pxz.c -+++ b/pxz.c -@@ -65,7 +65,7 @@ FILE **ftemp; - char str[0x100]; - char buf[BUFFSIZE]; - char *xzcmd; --size_t xzcmd_max; -+const size_t xzcmd_max = 10240; - - unsigned opt_complevel = 6, opt_stdout, opt_keep, opt_threads, opt_verbose; - unsigned opt_force, opt_stdout; -@@ -243,9 +243,12 @@ int main( int argc, char **argv ) { - lzma_filter filters[LZMA_FILTERS_MAX + 1]; - lzma_options_lzma lzma_options; - -- xzcmd_max = sysconf(_SC_ARG_MAX); - page_size = sysconf(_SC_PAGE_SIZE); - xzcmd = malloc(xzcmd_max); -+ if (!xzcmd) { -+ fprintf(stderr, "Failed to allocate %lu bytes for xz command.\n", xzcmd_max); -+ return -1; -+ } - snprintf(xzcmd, xzcmd_max, XZ_BINARY); - - parse_args(argc, argv); diff --git a/nixpkgs/pkgs/tools/compression/pxz/default.nix b/nixpkgs/pkgs/tools/compression/pxz/default.nix index eb1f5d3570b1..4ea95a3f78ac 100644 --- a/nixpkgs/pkgs/tools/compression/pxz/default.nix +++ b/nixpkgs/pkgs/tools/compression/pxz/default.nix @@ -1,21 +1,18 @@ -{ lib, stdenv, fetchgit, xz }: +{ lib, stdenv, fetchFromGitHub, xz }: -let name = "pxz"; - version = "4.999.9beta+git"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pxz"; + version = "4.999.9beta+git"; - src = fetchgit { - url = "https://github.com/jnovy/pxz.git"; - rev = "ae808463c2950edfdedb8fb49f95006db0a18667"; - sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; + src = fetchFromGitHub { + owner = "jnovy"; + repo = "pxz"; + rev = "124382a6d0832b13b7c091f72264f8f3f463070a"; + sha256 = "15mmv832iqsqwigidvwnf0nyivxf0y8m22j2szy4h0xr76x4z21m"; }; buildInputs = [ xz ]; - patches = [ ./_SC_ARG_MAX.patch ]; - buildPhase = '' gcc -o pxz pxz.c -llzma \ -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ @@ -30,15 +27,18 @@ stdenv.mkDerivation { cp pxz.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { homepage = "https://jnovy.fedorapeople.org/pxz/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [pashev]; - description = ''Parallel XZ is a compression utility that takes advantage of + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pashev ]; + description = "compression utility that runs LZMA compression of different parts on multiple cores simultaneously"; + longDescription = '' + Parallel XZ is a compression utility that takes advantage of running LZMA compression of different parts of an input file on multiple cores and processors simultaneously. Its primary goal is to utilize all resources to speed up compression time with minimal possible influence - on compression ratio''; - platforms = with lib.platforms; linux; + on compression ratio + ''; + platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/tools/compression/rzip/default.nix b/nixpkgs/pkgs/tools/compression/rzip/default.nix index 60364afa9f30..5f878f8c494f 100644 --- a/nixpkgs/pkgs/tools/compression/rzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/rzip/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, fetchpatch, bzip2}: +{ lib, stdenv, fetchurl, fetchpatch, bzip2 }: + +stdenv.mkDerivation rec { + pname = "rzip"; + version = "2.1"; -stdenv.mkDerivation { - name = "rzip-2.1"; src = fetchurl { - url = "mirror://samba/rzip/rzip-2.1.tar.gz"; + url = "mirror://samba/rzip/rzip-${version}.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; buildInputs = [ bzip2 ]; @@ -16,10 +18,11 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with lib; { homepage = "https://rzip.samba.org/"; description = "Compression program"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/compression/zstd/default.nix b/nixpkgs/pkgs/tools/compression/zstd/default.nix index a89453b55f4f..5253d7faa401 100644 --- a/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { BUILD_SHARED = !static; BUILD_STATIC = static; + BUILD_CONTRIB = true; PROGRAMS_LINK_SHARED = !static; LEGACY_SUPPORT = legacySupport; BUILD_TESTS = doCheck; @@ -62,12 +63,16 @@ stdenv.mkDerivation rec { ''; preInstall = '' + mkdir -p $bin/bin + cp contrib/pzstd/pzstd $bin/bin/pzstd substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ --replace ":-zstdcat" ":-$bin/bin/zstdcat" substituteInPlace ../programs/zstdless \ --replace "zstdcat" "$bin/bin/zstdcat" + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd ''; outputs = [ "bin" "dev" ] diff --git a/nixpkgs/pkgs/tools/compression/zsync/default.nix b/nixpkgs/pkgs/tools/compression/zsync/default.nix index 94921397e303..b92112a4816e 100644 --- a/nixpkgs/pkgs/tools/compression/zsync/default.nix +++ b/nixpkgs/pkgs/tools/compression/zsync/default.nix @@ -1,20 +1,21 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zsync-0.6.2"; + pname = "zsync"; + version = "0.6.2"; src = fetchurl { - url = "http://zsync.moria.org.uk/download/${name}.tar.bz2"; + url = "http://zsync.moria.org.uk/download/${pname}-${version}.tar.bz2"; sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; - meta = { + meta = with lib; { homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; - license = lib.licenses.free; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; all; + license = licenses.free; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; all; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index a28499f77328..be7a42e19e9d 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,18 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages, nixosTests -, fuseSupport ? false, fuse3 ? null }: - -assert fuseSupport -> fuse3 != null; +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, docutils +, libuuid +, libscrypt +, libsodium +, keyutils +, liburcu +, zlib +, libaio +, zstd +, lz4 +, python3Packages +, udev +, valgrind +, nixosTests +, fuse3 +, fuseSupport ? false +}: stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2020-11-17"; + version = "unstable-2021-07-08"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "41bec63b265a38dd9fa168b6042ea5bf07135048"; - sha256 = "1y3187kpw1bmnl97isv28k2sw8cmrnsn31a0dw745adwm0n7z6fj"; + rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e"; + sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw"; }; postPatch = '' @@ -22,7 +38,7 @@ stdenv.mkDerivation { "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config docutils ]; buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio @@ -48,6 +64,6 @@ stdenv.mkDerivation { homepage = "https://bcachefs.org/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak chiiruno ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; # does not build on aarch64, see https://github.com/koverstreet/bcachefs-tools/issues/39 }; } diff --git a/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix index ec7563dfc494..7c9edf2f84d9 100644 --- a/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; - inherit version; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix index 8a0671957c35..0149071ab0d0 100644 --- a/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; inherit (src.homepage); description = "A FUSE-based filesystem that uses the p7zip library"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix index 03e76e5fb275..b5b1256a9b5e 100644 --- a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { 'from pygit2 import RemoteCallbacks' ''; - checkInputs = with python3Packages; [ pytest pytestcov mock ]; + checkInputs = with python3Packages; [ pytest pytest-cov mock ]; propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ]; checkPhase = "py.test"; diff --git a/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix index 8589abffc77d..2754d223a6ba 100644 --- a/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, file, fuse, libmtp }: -let version = "0.5"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "jmtpfs"; - inherit version; + version = "0.5"; src = fetchFromGitHub { sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1"; diff --git a/nixpkgs/pkgs/tools/filesystems/mtools/default.nix b/nixpkgs/pkgs/tools/filesystems/mtools/default.nix index 4618a9b3b79a..f82b008e41d0 100644 --- a/nixpkgs/pkgs/tools/filesystems/mtools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.31"; + version = "4.0.33"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "11nm5mhsq700f3dzvzjpcik89cfcn38mb249yc0sjbwggwkrk2ak"; + sha256 = "0m5rx8djvg4jfvdgs4dxjkfd2na55wkdpid9xa32yc103s70zc8w"; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; diff --git a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix index 961a286729a8..f833d562972a 100644 --- a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,9 +1,8 @@ {lib, stdenv, fetchurl, libaal}: -let version = "2.0.4"; in stdenv.mkDerivation rec { pname = "reiser4progs"; - inherit version; + version = "2.0.4"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix index dc97cdb652e2..c6583410ff3c 100644 --- a/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, libuuid, autoreconfHook }: -let version = "3.6.24"; in stdenv.mkDerivation rec { pname = "reiserfsprogs"; - inherit version; + version = "3.6.24"; src = fetchurl { url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix index 3bbff2903bc7..bb042a95ecc4 100644 --- a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; - inherit version; homepage = "https://sourceforge.net/projects/smbnetfs/"; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 8661740d8074..cb4f3820bcc0 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq"; + sha256 = "0hlrbiy8xmccczi11ml0lzmg3946l9ck5wpfyw03wn5zgvx29zja"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix b/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix index 6a6409ad3251..bf141c8d94d7 100644 --- a/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ]; + dontBuild = true; patchPhase = '' sed -i '1s;^;#!${python3.interpreter}\n;' ubidump.py diff --git a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix index d2779e2b4c59..e837350abd6f 100644 --- a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,18 +4,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "14bpc5ddhxvgfxkxhj5q9z443s7z4nn1zf4k1hxj7rbf13rcpg00"; + sha256 = "e4f579963199f05476657f0066beaa32d1261aef2203382f3919e1ed4bc4594e"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5"; + sha256 = "69113bf33ba0c57a363305b76361f2866c3b8394b173eed0f49db1f50bfe0373"; }; in stdenv.mkDerivation rec { pname = "yandex-disk"; - version = "0.1.5.1039"; + version = "0.1.6.1074"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm"; diff --git a/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix b/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix index ecc4b1184867..feb5b23df52a 100644 --- a/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub, ruby, zfs }: -let version = "0.3.6"; in stdenv.mkDerivation rec { pname = "zfstools"; - inherit version; + version = "0.3.6"; src = fetchFromGitHub { sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg"; diff --git a/nixpkgs/pkgs/tools/games/amidst/default.nix b/nixpkgs/pkgs/tools/games/minecraft/amidst/default.nix index 8ec65a1dd391..8ec65a1dd391 100644 --- a/nixpkgs/pkgs/tools/games/amidst/default.nix +++ b/nixpkgs/pkgs/tools/games/minecraft/amidst/default.nix diff --git a/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix b/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix new file mode 100644 index 000000000000..ef978875049e --- /dev/null +++ b/nixpkgs/pkgs/tools/games/minecraft/fabric-installer/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, jre }: + +stdenv.mkDerivation rec { + pname = "fabric-installer"; + version = "0.7.4"; + + src = fetchurl { + url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar"; + sha256 = "0s3nmwpq1qg90c27qh4anvvsg4yzsgcp6kwsb35fsiaaakxn0b8r"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ jre makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,lib/fabric} + + cp $src $out/lib/fabric/fabric-installer.jar + makeWrapper ${jre}/bin/java $out/bin/fabric-installer \ + --add-flags "-jar $out/lib/fabric/fabric-installer.jar" + ''; + + meta = with lib; { + homepage = "https://fabricmc.net/"; + description = "A lightweight, experimental modding toolchain for Minecraft"; + license = licenses.asl20; + maintainers = [ maintainers.ivar ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/games/minecraft/optifine/default.nix b/nixpkgs/pkgs/tools/games/minecraft/optifine/default.nix new file mode 100644 index 000000000000..06425e6b67ef --- /dev/null +++ b/nixpkgs/pkgs/tools/games/minecraft/optifine/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, jre }: + +stdenv.mkDerivation rec { + pname = "optifine"; + version = "1.16.5_HD_U_G8"; + + src = fetchurl { + url = "https://optifine.net/download?f=OptiFine_${version}.jar"; + sha256 = "0ks91d6n4vkgb5ykdrc67br2c69nqjr0xhp7rrkybg24xn8bqxiw"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ jre makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,lib/optifine} + cp $src $out/lib/optifine/optifine.jar + + makeWrapper ${jre}/bin/java $out/bin/optifine \ + --add-flags "-jar $out/lib/optifine/optifine.jar" + ''; + + meta = with lib; { + homepage = "https://optifine.net/"; + description = "A Minecraft optimization mod"; + longDescription = '' + OptiFine is a Minecraft optimization mod. + It allows Minecraft to run faster and look better with full support for HD textures and many configuration options. + ''; + license = licenses.unfree; + maintainers = [ maintainers.ivar ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix index 9dc2ad4d5f57..8ebccd8047ae 100644 --- a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix +++ b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix @@ -1,12 +1,10 @@ { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText , libXdmcp, libXau, lib, openssl }: -let - version = "2.1.2"; - in + stdenv.mkDerivation rec { pname = "argyllcms"; - inherit version; + version = "2.1.2"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a diff --git a/nixpkgs/pkgs/tools/graphics/briss/default.nix b/nixpkgs/pkgs/tools/graphics/briss/default.nix index b554ac9b3c0e..07f7b63ad7d4 100644 --- a/nixpkgs/pkgs/tools/graphics/briss/default.nix +++ b/nixpkgs/pkgs/tools/graphics/briss/default.nix @@ -2,17 +2,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let - - version = "0.9"; - sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "briss"; - inherit version; + version = "0.9"; src = fetchurl { url = "mirror://sourceforge/briss/briss-${version}.tar.gz"; - inherit sha256; + sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; }; nativeBuildInputs = [makeWrapper]; diff --git a/nixpkgs/pkgs/tools/graphics/convchain/default.nix b/nixpkgs/pkgs/tools/graphics/convchain/default.nix index 714cdd656df1..20f29b2a0ad5 100644 --- a/nixpkgs/pkgs/tools/graphics/convchain/default.nix +++ b/nixpkgs/pkgs/tools/graphics/convchain/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [mono]; meta = { - inherit version; description = "Bitmap generation from a single example with convolutions and MCMC"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix index ac6481cc6251..3d7608ac094c 100644 --- a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix +++ b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = "https://git.archlinux.org/svntogit/community.git/plain/cuneiform/trunk/build-fix.patch?id=a2ec92f05de006b56d16ac6a6c370d54a554861a"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/a2ec92f05de006b56d16ac6a6c370d54a554861a/cuneiform/trunk/build-fix.patch"; sha256 = "19cmrlx4khn30qqrpyayn7bicg8yi0wpz1x1bvqqrbvr3kwldxyj"; }) ]; diff --git a/nixpkgs/pkgs/tools/graphics/ditaa/default.nix b/nixpkgs/pkgs/tools/graphics/ditaa/default.nix index 79a24ed3841c..a22f402b5d17 100644 --- a/nixpkgs/pkgs/tools/graphics/ditaa/default.nix +++ b/nixpkgs/pkgs/tools/graphics/ditaa/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "ditaa-0.11.0"; + pname = "ditaa"; + version = "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/v${version}/ditaa-${version}-standalone.jar"; sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" + mkdir -p $out/bin $out/lib cp ${src} "$out/lib/ditaa.jar" diff --git a/nixpkgs/pkgs/tools/graphics/facedetect/default.nix b/nixpkgs/pkgs/tools/graphics/facedetect/default.nix index 257de05a898a..26a9b3e24bd5 100644 --- a/nixpkgs/pkgs/tools/graphics/facedetect/default.nix +++ b/nixpkgs/pkgs/tools/graphics/facedetect/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ python2Packages.python python2Packages.wrapPython ]; pythonPath = [ python2Packages.numpy python2Packages.opencv4 ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + dontConfigure = true; patchPhase = '' substituteInPlace facedetect \ diff --git a/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/nixpkgs/pkgs/tools/graphics/gmic/default.nix index 37b398ef1c62..d12a213a31e5 100644 --- a/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.7"; + version = "2.9.8"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY="; + sha256 = "sha256-GNa7xzGuO02oplasGJR2eTsRGp3Rn3LbIxLwdN983II="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/graphics/lsix/default.nix b/nixpkgs/pkgs/tools/graphics/lsix/default.nix new file mode 100644 index 000000000000..ba07e2886b53 --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/lsix/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, imagemagick }: + +stdenvNoCC.mkDerivation rec { + pname = "lsix"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "hackerb9"; + repo = pname; + rev = version; + sha256 = "sha256-mOueSNhf1ywG4k1kRODBaWRjy0L162BAO1HRPaMMbFM="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 lsix -t $out/bin + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/lsix \ + --prefix PATH : ${lib.makeBinPath [ imagemagick ]} + ''; + + meta = with lib; { + description = "Shows thumbnails in terminal using sixel graphics"; + homepage = "https://github.com/hackerb9/lsix"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ kidonng ]; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/mangohud/default.nix b/nixpkgs/pkgs/tools/graphics/mangohud/default.nix index 888a9a1e3a72..6c5da89b85b7 100644 --- a/nixpkgs/pkgs/tools/graphics/mangohud/default.nix +++ b/nixpkgs/pkgs/tools/graphics/mangohud/default.nix @@ -46,14 +46,14 @@ let }; in stdenv.mkDerivation rec { pname = "mangohud"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "S7FtO/VLZp6Al13i6IrEbIzsgP3kZ3VSNBLhwReZLqM="; + sha256 = "sha256-RRtti0VnB6SXrpFYaEqANvpgvP/Dkvc+x/I40AXaspU="; }; outputs = [ "out" "doc" "man" ]; diff --git a/nixpkgs/pkgs/tools/graphics/mscgen/default.nix b/nixpkgs/pkgs/tools/graphics/mscgen/default.nix index 6cd8777f5258..6749a193c00e 100644 --- a/nixpkgs/pkgs/tools/graphics/mscgen/default.nix +++ b/nixpkgs/pkgs/tools/graphics/mscgen/default.nix @@ -11,12 +11,9 @@ , zlib }: -let - version = "0.20"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mscgen"; - inherit version; + version = "0.20"; src = fetchurl { url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/nixpkgs/pkgs/tools/graphics/oxipng/default.nix index edffad57963e..eab3996811ef 100644 --- a/nixpkgs/pkgs/tools/graphics/oxipng/default.nix +++ b/nixpkgs/pkgs/tools/graphics/oxipng/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "4.0.3"; + version = "5.0.0"; pname = "oxipng"; src = fetchCrate { inherit version pname; - sha256 = "sha256-lvVgoAZMIqmbS6yMul9Hf9PtneEVy+jDs3kU1jSBL2w="; + sha256 = "sha256-rTAY+3ViPkOsRjT9FHKnVOEGfLscuBdMAiQq+N9PRNU="; }; - cargoSha256 = "sha256-sxvOFxSZCANBa/448SpjoLqk/HjqtaFrOhjrQro446Q="; + cargoSha256 = "sha256-Z5tA2bUE/5qGKXP2hIKo6tBegaSUALRzEZ/Xext3EWY="; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/nixpkgs/pkgs/tools/graphics/pgf/default.nix b/nixpkgs/pkgs/tools/graphics/pgf/default.nix index 14cd83c3fcfe..8976700006bc 100644 --- a/nixpkgs/pkgs/tools/graphics/pgf/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pgf/default.nix @@ -1,13 +1,9 @@ { lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: with lib; - -let - version = "6.14.12"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pgf"; - inherit version; + version = "6.14.12"; src = fetchurl { url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix index b9784a85b2da..1f72243293e8 100644 --- a/nixpkgs/pkgs/tools/graphics/svgbob/default.nix +++ b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix @@ -1,25 +1,16 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.4.2"; + version = "0.5.3"; - src = fetchFromGitHub { - owner = "ivanceras"; - repo = pname; - rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432"; - sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr"; + src = fetchCrate { + inherit version; + crateName = "svgbob_cli"; + sha256 = "1gi8h4wzpi477y1gwi4708pn2kr65934a4dmphbhwppxbw447qiw"; }; - sourceRoot = "source/svgbob_cli"; - postPatch = '' - substituteInPlace ../svgbob/src/lib.rs \ - --replace '#![deny(warnings)]' "" - ''; - cargoSha256 = "1jyycr95gjginx6bzmay9b5dbpnbwdqbv13w1qy58znicsmh3v8a"; - - # Test tries to build outdated examples - doCheck = false; + cargoSha256 = "1x8phpllwm12igaachghwq6wgxl7nl8bhh7xybfrmn447viwxhq2"; meta = with lib; { description = "Convert your ascii diagram scribbles into happy little SVG"; diff --git a/nixpkgs/pkgs/tools/graphics/syntex/default.nix b/nixpkgs/pkgs/tools/graphics/syntex/default.nix index a076e97d0568..b149333f2eac 100644 --- a/nixpkgs/pkgs/tools/graphics/syntex/default.nix +++ b/nixpkgs/pkgs/tools/graphics/syntex/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [mono]; meta = { - inherit version; description = "Texture synthesis from examples"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/graphics/twilight/default.nix b/nixpkgs/pkgs/tools/graphics/twilight/default.nix index 7c43063fb810..58d4d0df9133 100644 --- a/nixpkgs/pkgs/tools/graphics/twilight/default.nix +++ b/nixpkgs/pkgs/tools/graphics/twilight/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchFromGitHub , libGL, libGLU, freeglut, libX11 }: -let - version = "2018-04-19"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "twilight"; - inherit version; + version = "unstable-2018-04-19"; src = fetchFromGitHub { owner = "tweakoz"; diff --git a/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix index f761e2bbde60..2c7ce4272458 100644 --- a/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix +++ b/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [mono]; meta = { - inherit version; description = "A generator of bitmaps that are locally similar to the input bitmap"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/graphics/zxing/default.nix b/nixpkgs/pkgs/tools/graphics/zxing/default.nix index f4eeb50fc03b..18721390a511 100644 --- a/nixpkgs/pkgs/tools/graphics/zxing/default.nix +++ b/nixpkgs/pkgs/tools/graphics/zxing/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { cd "$out/lib/java"; for i in *.jar; do mv "$i" "''${i#*-}"; done ''; meta = { - inherit version; description = "1D and 2D code reading library"; license = lib.licenses.asl20; maintainers = [lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx/wrapper.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/wrapper.nix index 28a08e39b225..6e7e71c57132 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx/wrapper.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ fcitx fcitx-configtool libsForQt5.fcitx-qt5 ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/fcitx \ 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 acb2d41e0456..aaef2dd2d084 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg="; + sha256 = "sha256-hdm1ObzN9pFLeO1ujobHxiQYnA+dg9zIp/qho6S0H78="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 258ab93689bc..18fc21e98088 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.11"; + version = "1.3.12"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0763wnlklcs3d8fk21nkp7dgn4qzqgxh1s24q3kl8gzgng2a88jj"; + sha256 = "sha256-2k7JtLr+zO71rbTz11CCiIPx+orn0dw/Y8m47WfRDEU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix b/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix index 35b3b1e336d3..ad18becfc72f 100644 --- a/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix @@ -3,23 +3,17 @@ stdenv.mkDerivation rec { pname = "interception-tools"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitLab { owner = "interception/linux"; repo = "tools"; rev = "v${version}"; - sha256 = "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj"; + sha256 = "0wcmppa7092b33wb8vc782day5phf90pc25cn1x7rk0rlw565z36"; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevdev udev libyamlcpp boost ]; - prePatch = '' - substituteInPlace CMakeLists.txt --replace \ - '"/usr/include/libevdev-1.0"' \ - "\"$(pkg-config --cflags libevdev | cut -c 3-)\"" - ''; - meta = { description = "A minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; diff --git a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index bc9aa73c2fc6..d165f404f6cb 100644 --- a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation { srcs = [ small medium large edict assoc ]; nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; - phases = [ "installPhase" ]; + dontUnpack = true; + installPhase = '' function dictname() { src=$1 diff --git a/nixpkgs/pkgs/tools/misc/afetch/default.nix b/nixpkgs/pkgs/tools/misc/afetch/default.nix new file mode 100644 index 000000000000..aea2ff1ff2b9 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/afetch/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "afetch"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "13-CF"; + repo = "afetch"; + rev = "V${version}"; + sha256 = "sha256-bHP3DJpgh89AaCX4c1tQGaZ/PiWjArED1rMdszFUq+U="; + }; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A fetch program written in C"; + homepage = "https://github.com/13-CF/afetch"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 jk ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/android-tools/default.nix b/nixpkgs/pkgs/tools/misc/android-tools/default.nix index 69a74e465c91..1654b008aa55 100644 --- a/nixpkgs/pkgs/tools/misc/android-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/android-tools/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "android-tools"; - version = "31.0.0p1"; + version = "31.0.2"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - sha256 = "1dn7v10gdx1pi0pkddznd5sdz941qz0x4jww8h2mk50nbyxc792i"; + sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ="; }; nativeBuildInputs = [ cmake perl go ]; diff --git a/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/nixpkgs/pkgs/tools/misc/autorandr/default.nix index 1d4a3a2b6ec9..793204014541 100644 --- a/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -4,63 +4,59 @@ , systemd , xrandr }: -let - python = python3Packages.python; +stdenv.mkDerivation rec { + pname = "autorandr"; version = "1.11"; -in - stdenv.mkDerivation { - pname = "autorandr"; - inherit version; - buildInputs = [ python ]; - - # no wrapper, as autorandr --batch does os.environ.clear() - buildPhase = '' - substituteInPlace autorandr.py \ - --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ - --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' - ''; - - outputs = [ "out" "man" ]; - - installPhase = '' - runHook preInstall - make install TARGETS='autorandr' PREFIX=$out - - make install TARGETS='bash_completion' DESTDIR=$out/share/bash-completion/completions - - make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out - - make install TARGETS='manpage' PREFIX=$man - - ${if systemd != null then '' - make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ - SYSTEMD_UNIT_DIR=/lib/systemd/system \ - UDEV_RULES_DIR=/etc/udev/rules.d - substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ - --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" - '' else '' - make install TARGETS='pmutils' DESTDIR=$out \ - PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d - make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ - UDEV_RULES_DIR=/etc/udev/rules.d - ''} - - runHook postInstall - ''; - - src = fetchFromGitHub { - owner = "phillipberndt"; - repo = "autorandr"; - rev = version; - sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; - }; - - meta = with lib; { - homepage = "https://github.com/phillipberndt/autorandr/"; - description = "Automatically select a display configuration based on connected devices"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ coroa globin ]; - platforms = platforms.unix; - }; - } + buildInputs = [ python3Packages.python ]; + + # no wrapper, as autorandr --batch does os.environ.clear() + buildPhase = '' + substituteInPlace autorandr.py \ + --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ + --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' + ''; + + outputs = [ "out" "man" ]; + + installPhase = '' + runHook preInstall + make install TARGETS='autorandr' PREFIX=$out + + make install TARGETS='bash_completion' DESTDIR=$out/share/bash-completion/completions + + make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out + + make install TARGETS='manpage' PREFIX=$man + + ${if systemd != null then '' + make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ + SYSTEMD_UNIT_DIR=/lib/systemd/system \ + UDEV_RULES_DIR=/etc/udev/rules.d + substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" + '' else '' + make install TARGETS='pmutils' DESTDIR=$out \ + PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d + make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ + UDEV_RULES_DIR=/etc/udev/rules.d + ''} + + runHook postInstall + ''; + + src = fetchFromGitHub { + owner = "phillipberndt"; + repo = "autorandr"; + rev = version; + sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; + }; + + meta = with lib; { + homepage = "https://github.com/phillipberndt/autorandr/"; + description = "Automatically select a display configuration based on connected devices"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ coroa globin ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/bat/default.nix b/nixpkgs/pkgs/tools/misc/bat/default.nix index 8bc82547eeb9..81b910117f17 100644 --- a/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , nixosTests , rustPlatform , fetchFromGitHub @@ -12,16 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kyl+clL/4uxVaDH/9zPDGQTir4/JVgtHo9kNQ31gXTo="; + sha256 = "sha256-Y8CmVOIDPQ9kpggOlKnxLV0oOyNRow0r/nvxNpCtYNU="; }; - - cargoSha256 = "sha256-j9HbOXiwN4CWv9wMBrNxY3jehh+KRkXlwmDqChNy1Dk="; + cargoSha256 = "sha256-MdfBldImyW8QV0P3zPrYT2Vi9zChvXePI2T8tRsrlcQ="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 - installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{fish,zsh} + installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{bash,fish,zsh} ''; # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as diff --git a/nixpkgs/pkgs/tools/misc/bcunit/default.nix b/nixpkgs/pkgs/tools/misc/bcunit/default.nix index 099ae294bec9..61fc84fef7e7 100644 --- a/nixpkgs/pkgs/tools/misc/bcunit/default.nix +++ b/nixpkgs/pkgs/tools/misc/bcunit/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; description = "A fork of CUnit test framework"; homepage = "https://gitlab.linphone.org/BC/public/bcunit"; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index 5e91756413eb..d6ee17204304 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.203"; + version = "1.204"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-jQJC3b+HsEeKYRKQUfI2w3xYDJHs9ajfN8lb6Upzgd8="; + sha256 = "sha256-oyBkt52mWM2FiaM++s5Uoe7Wd0v1oLM7HjWKDjIonGE="; }; nativeBuildInputs = [ dpkg ]; diff --git a/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix b/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix index f75f3a6f8223..6a20ebc10c5c 100644 --- a/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "betterdiscordctl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "bb010g"; repo = "betterdiscordctl"; rev = "v${version}"; - sha256 = "1wys3wbcz5hq8275ia2887kr5fzz4b3gkcp56667j9k0p3k3zfac"; + sha256 = "0p321rfcihz2779sdd6qfgpxgk5yd53d33vq5pvb50dbdgxww0bc"; }; postPatch = '' @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/betterdiscordctl --version + ''; + meta = with lib; { homepage = "https://github.com/bb010g/betterdiscordctl"; description = "A utility for managing BetterDiscord on Linux"; diff --git a/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/nixpkgs/pkgs/tools/misc/birdfont/default.nix index 57b42952c854..5473fa0e78ce 100644 --- a/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.29.4"; + version = "2.29.5"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8="; + sha256 = "sha256-eIqq4ehUB4lF89ikrHeN5Akq14nxYMxREZzPSVnv+nU="; }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/tools/misc/bitwise/default.nix b/nixpkgs/pkgs/tools/misc/bitwise/default.nix new file mode 100644 index 000000000000..a7ae6243f453 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/bitwise/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "bitwise"; + version = "0.42"; + + src = fetchFromGitHub { + owner = "mellowcandle"; + repo = "bitwise"; + rev = "v${version}"; + sha256 = "154y0sn3z64z56k84ghsazkyihbkaz40hfwxcxdymnhvhh6m9f3g"; + }; + + buildInputs = [ ncurses readline ]; + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Terminal based bitwise calculator in curses"; + homepage = "https://github.com/mellowcandle/bitwise"; + license = licenses.gpl3Only; + maintainers = [ maintainers.whonore ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/bmon/default.nix b/nixpkgs/pkgs/tools/misc/bmon/default.nix index ca5f99f3b62a..758a42d15385 100644 --- a/nixpkgs/pkgs/tools/misc/bmon/default.nix +++ b/nixpkgs/pkgs/tools/misc/bmon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ncurses libconfuse libnl ]; + buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.isLinux libnl; preConfigure = '' # Must be an absolute path @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor pSub ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/bonfire/default.nix b/nixpkgs/pkgs/tools/misc/bonfire/default.nix index a3f1608c3ad1..f71d8a8b8ef3 100644 --- a/nixpkgs/pkgs/tools/misc/bonfire/default.nix +++ b/nixpkgs/pkgs/tools/misc/bonfire/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { --replace "data_files = *.rst, *.txt" "" ''; - buildInputs = [ httpretty pytest pytestcov ]; + buildInputs = [ httpretty pytest pytest-cov ]; preCheck = '' # fix compatibility with pytest 4 diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 5d9790ec2be0..fd289f9cfb8a 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-TEY3oEAWnS+iuLgAgR9mp1TaEb+wzlAgN41dgLRdUs4="; + sha256 = "sha256-EStR/tmbu95tptB7h3rHxoro87jlhu3i0XwRQNbIBvA="; }; - vendorSha256 = "sha256-pr6bMO1klq/V9zkBftLleSRTg3zjl24EuA283M88HY4="; + vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/clac/default.nix b/nixpkgs/pkgs/tools/misc/clac/default.nix index 4f26b2036a7d..acf9b6b867de 100644 --- a/nixpkgs/pkgs/tools/misc/clac/default.nix +++ b/nixpkgs/pkgs/tools/misc/clac/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Interactive stack-based calculator"; homepage = "https://github.com/soveran/clac"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/tools/misc/clasp/default.nix b/nixpkgs/pkgs/tools/misc/clasp/default.nix index 4fc0d2c2f8cb..401a2006c6f9 100644 --- a/nixpkgs/pkgs/tools/misc/clasp/default.nix +++ b/nixpkgs/pkgs/tools/misc/clasp/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl }: -let - version = "3.1.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "clasp"; - inherit version; + version = "3.1.4"; src = fetchurl { url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/cod/default.nix b/nixpkgs/pkgs/tools/misc/cod/default.nix index dfad9569d2a0..741487c66877 100644 --- a/nixpkgs/pkgs/tools/misc/cod/default.nix +++ b/nixpkgs/pkgs/tools/misc/cod/default.nix @@ -2,24 +2,24 @@ buildGoModule rec { pname = "cod"; - version = "unstable-2020-09-10"; + version = "0.1.0"; src = fetchFromGitHub { owner = "dim-an"; repo = pname; - rev = "ae68da08339471dd278d6df79abbfd6fe89a10fe"; - sha256 = "1l3gn9v8dcy72f5xq9hwbkvkis0vp4dp8qyinsrii3acmhksg9v6"; + rev = "v${version}"; + sha256 = "0wi680sxpv0kp1ggy21qp4c4ms79hw4z9w9kvp278p8z3y8wwglr"; }; - vendorSha256 = "1arllkiz1hk12hq5b2zpg3f8i9lxl66mil5sdv8gnhflmb37vbv3"; + vendorSha256 = "0ann1fbh8rqys3rwbz5h9mfnvkpqiw5rgkd4c30y99706h2dzv4i"; - buildFlagsArray = [ "-ldflags=-s -w -X main.GitSha=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ]; doCheck = false; meta = with lib; { - description = "Tool for generating Bash/Zsh autocompletions based on `--help` output"; - homepage = src.meta.homepage; + description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output"; + homepage = "https://github.com/dim-an/cod/"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/nixpkgs/pkgs/tools/misc/code-minimap/default.nix index 560ad4604713..cc2d979ca757 100644 --- a/nixpkgs/pkgs/tools/misc/code-minimap/default.nix +++ b/nixpkgs/pkgs/tools/misc/code-minimap/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nWfvRrKkUrr2owv9sLgORVPYp68/Ibdu/P1VddMb61s="; + sha256 = "sha256-eCHmMtndcQJqKmjxhkcLvjMUXApkSnH+7qyG7PDfcwo="; }; - cargoSha256 = "sha256-OmWn6Z/r/gXMD4gp/TDo0Hokliq8Qgb354q8ZFpVG2s="; + cargoSha256 = "sha256-wKCANWznOJMlQ8T2q39NNNRmgPYMpbkJhXpxojusNsE="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/nixpkgs/pkgs/tools/misc/cp437/default.nix b/nixpkgs/pkgs/tools/misc/cp437/default.nix index ac9282ae4344..c08214ff548b 100644 --- a/nixpkgs/pkgs/tools/misc/cp437/default.nix +++ b/nixpkgs/pkgs/tools/misc/cp437/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let version = "0.6"; -in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "cp437"; - inherit version; + version = "0.6"; src = fetchFromGitHub { owner = "keaston"; diff --git a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix index b7d0f2c3aad9..2a85c0dc2b8f 100644 --- a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { ddccontrol-db ]; + configureFlags = [ + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + ]; + prePatch = '' oldPath="\$""{datadir}/ddccontrol-db" newPath="${ddccontrol-db}/share/ddccontrol-db" diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index e57caa8cc7f8..88a9846e8352 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "177"; + version = "178"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-yTOaDhAKtMhQYxolALnuc7FuXoMUOhjmsabtS1FeW/Q="; + sha256 = "sha256-uJbTQshf7vRd6EyaaV0itJVrMc/6o+pPXhtUgrjFnzM="; }; outputs = [ "out" "man" ]; @@ -72,6 +72,7 @@ python3Packages.buildPythonApplication rec { "test_sbin_added_to_path" "test_diff_meta" "test_diff_meta2" + "test_obj_no_differences" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/dijo/default.nix b/nixpkgs/pkgs/tools/misc/dijo/default.nix index 9a6bd7999212..606bba0dff92 100644 --- a/nixpkgs/pkgs/tools/misc/dijo/default.nix +++ b/nixpkgs/pkgs/tools/misc/dijo/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.7"; in -rustPlatform.buildRustPackage { + +rustPlatform.buildRustPackage rec { pname = "dijo"; - inherit version; + version = "0.2.7"; buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin CoreServices; src = fetchFromGitHub { owner = "NerdyPepper"; diff --git a/nixpkgs/pkgs/tools/misc/diskscan/default.nix b/nixpkgs/pkgs/tools/misc/diskscan/default.nix index 1e7bbd6bfcec..265218dfcfd5 100644 --- a/nixpkgs/pkgs/tools/misc/diskscan/default.nix +++ b/nixpkgs/pkgs/tools/misc/diskscan/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "Scan HDD/SSD for failed and near failed sectors"; platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; - inherit version; license = licenses.gpl3; }; } diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 20288bf3f5e7..0c3d319f2a70 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, Foundation }: rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.13.1"; + version = "2.14.2"; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-6xSRsLM1DD1xMjOGzHMDVLibrJlu9lN9OoSV7B/WMT0="; + sha256 = "sha256-gUTDiUH/jlGAGbhOOCa63wfNy5Y8W6VWlSb9E+hQjHY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-udz1EtPchEHxkvvVFnkwSOpFz4XEBGOXRz8qWREyzvc="; + cargoSha256 = "sha256-P8QFeP5KD5YeD4Px7OQNwCrvErgT9ytr4OlFkXuPgGU="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/dust/default.nix b/nixpkgs/pkgs/tools/misc/dust/default.nix index dc8dc5af97c3..85055ccba5eb 100644 --- a/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-15n8CpyyC41oJRrFlNHYXF5UjOyYPX93Zrq7jcU2DVM="; + sha256 = "sha256-SgTEawxuz9gRxSZ9edNz2NwfJWSAwxKXxDJVpU6oTBg="; # 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 = "sha256-rqNj3EwszSIn2cMmslO6T3K5NxQJ9u56m37TU1GwtVI="; + cargoSha256 = "sha256-/kDF1ZOzu32Dwd5fWZGhMlEf65TAKLMPFu+ZnZxOAms="; doCheck = false; @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; maintainers = with maintainers; [ infinisil SuperSandro2000 ]; + mainProgram = "dust"; }; } diff --git a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix index 99a21e28b075..f39fc1b55243 100644 --- a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix +++ b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchgit }: -let - version = "2018-12-06"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "edid-decode-unstable"; - inherit version; + version = "unstable-2018-12-06"; src = fetchgit { url = "git://linuxtv.org/edid-decode.git"; diff --git a/nixpkgs/pkgs/tools/misc/edid-generator/default.nix b/nixpkgs/pkgs/tools/misc/edid-generator/default.nix index 89ac21db5f57..d3abb37b9f47 100644 --- a/nixpkgs/pkgs/tools/misc/edid-generator/default.nix +++ b/nixpkgs/pkgs/tools/misc/edid-generator/default.nix @@ -6,11 +6,10 @@ , zsh , modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync }: -let - version = "unstable-2018-03-15"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "edid-generator"; - inherit version; + version = "unstable-2018-03-15"; src = fetchFromGitHub { owner = "akatrevorjay"; diff --git a/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock b/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock index e6c694bffb33..c5b48135993f 100644 --- a/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock +++ b/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock @@ -4,4 +4,4 @@ version = 3 [[package]] name = "elfcat" -version = "0.1.3" +version = "0.1.4" diff --git a/nixpkgs/pkgs/tools/misc/elfcat/default.nix b/nixpkgs/pkgs/tools/misc/elfcat/default.nix index 38b1cc9b64f0..a9691e43c6a9 100644 --- a/nixpkgs/pkgs/tools/misc/elfcat/default.nix +++ b/nixpkgs/pkgs/tools/misc/elfcat/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "ruslashev"; repo = pname; rev = version; - sha256 = "sha256-s56FyRoD2IhgdwEV63jMaB265CodHUlvmrWzmXAmonY="; + sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY="; }; cargoLock.lockFile = ./Cargo.lock; diff --git a/nixpkgs/pkgs/tools/misc/emv/default.nix b/nixpkgs/pkgs/tools/misc/emv/default.nix index 1dbb5199f754..3e5a348c5823 100644 --- a/nixpkgs/pkgs/tools/misc/emv/default.nix +++ b/nixpkgs/pkgs/tools/misc/emv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "7e0e12afa45ef5ed8025e5f2c6deea0ff5f512644a721f7b1b95b63406a8f7ce"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -pv $out/bin diff --git a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix index a701fbd73b52..beaffadab97e 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20210623.0"; + version = "20210719.0"; src = fetchPypi { inherit pname version; - sha256 = "0fc6xgi1naydm3wgk5lljnf6zggzdk6558cpyqlriw031gqnab77"; + sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc="; }; # no tests diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index 945af40a7171..69a67a6e9181 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -8,17 +8,21 @@ }: let - esphome-dashboard = pkgs.callPackage ./dashboard.nix {}; + python = python3.override { + packageOverrides = self: super: { + esphome-dashboard = pkgs.callPackage ./dashboard.nix {}; + }; + }; in -python3.pkgs.buildPythonApplication rec { +with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "1.19.4"; + version = "1.20.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "029ykjk24h21b0s0gha6kv9pvgallin6marzkb2vfbvr3icsmbz2"; + sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4="; }; patches = [ @@ -32,12 +36,6 @@ python3.pkgs.buildPythonApplication rec { # drop coverage testing sed -i '/--cov/d' pytest.ini - - # migrate use of hypothesis internals to be compatible with hypothesis>=5.32.1 - # https://github.com/esphome/issues/issues/2021 - substituteInPlace tests/unit_tests/strategies.py --replace \ - "@st.defines_strategy_with_reusable_values" \ - "@st.defines_strategy(force_reusable_values=True)" ''; # Remove esptool and platformio from requirements @@ -49,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { # They have validation functions like: # - validate_cryptography_installed # - validate_pillow_installed - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ click colorama cryptography @@ -73,7 +71,7 @@ python3.pkgs.buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - checkInputs = with python3.pkgs; [ + checkInputs = [ hypothesis mock pytest-asyncio @@ -82,6 +80,13 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; + disabledTestPaths = [ + # requires hypothesis 5.49, we have 6.x + # ImportError: cannot import name 'ip_addresses' from 'hypothesis.provisional' + "tests/unit_tests/test_core.py" + "tests/unit_tests/test_helpers.py" + ]; + postCheck = '' $out/bin/esphome --help > /dev/null ''; diff --git a/nixpkgs/pkgs/tools/misc/esptool/default.nix b/nixpkgs/pkgs/tools/misc/esptool/default.nix index 7c7f91621b82..3fc6e96e228b 100644 --- a/nixpkgs/pkgs/tools/misc/esptool/default.nix +++ b/nixpkgs/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1y022qlcdgdx5a88lkc3sqavklz494afbfyh100lp7xfk3f2mjln"; + sha256 = "sha256-GaGrV8L//pU4kt4HJmY88l5BNtT0IcZox7b24AFjPCI="; }; checkInputs = with python3.pkgs; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/etcher/default.nix b/nixpkgs/pkgs/tools/misc/etcher/default.nix index 9bda86db9bf2..d0fae336d9d3 100644 --- a/nixpkgs/pkgs/tools/misc/etcher/default.nix +++ b/nixpkgs/pkgs/tools/misc/etcher/default.nix @@ -10,7 +10,7 @@ let sha256 = { - "x86_64-linux" = "sha256-nGIUOS4LzfeXamcT0uigbQsVkULH2R3bli0DDEpg3ns="; + "x86_64-linux" = "sha256-FRZTUOlOK1bIbrHdR9yQv45zMhby3tWbMPpaPPq3L9s="; "i686-linux" = "0z6y45sz086njpywg7f0jn6n02qynb1qbi889g2kcgwbfjvmcpm1"; }."${stdenv.system}"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.120"; + version = "1.5.121"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; diff --git a/nixpkgs/pkgs/tools/misc/fcp/default.nix b/nixpkgs/pkgs/tools/misc/fcp/default.nix new file mode 100644 index 000000000000..7124e9078457 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/fcp/default.nix @@ -0,0 +1,33 @@ +{ expect, fetchFromGitHub, lib, rustPlatform, stdenv }: + +rustPlatform.buildRustPackage rec { + pname = "fcp"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "svetlitski"; + repo = pname; + rev = "v${version}"; + sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; + }; + + cargoSha256 = "0gw7gjfwc4r03rg6z65ml0y37sh4yf716isqs0mb4jqkp7rwfbc9"; + + nativeBuildInputs = [ expect ]; + + # character_device fails with "File name too long" on darwin + doCheck = !stdenv.isDarwin; + + postPatch = '' + patchShebangs tests/*.exp + ''; + + meta = with lib; { + description = "A significantly faster alternative to the classic Unix cp(1) command"; + homepage = "https://github.com/svetlitski/fcp"; + changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/fend/default.nix b/nixpkgs/pkgs/tools/misc/fend/default.nix index 6c4160b06e32..4ed308643e56 100644 --- a/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.17"; + version = "0.1.21"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xq2UjeZiKy9BjNQ9xnC7tppEwrEtg8ZN5BVDz1bUOmw="; + sha256 = "sha256-LrHZsnW96+QsXuGxWoGqIEKTE86m3tMnh4fpDPIhd1w="; }; - cargoSha256 = "sha256-Bf3fYHhpoX05AmTdwwdRU2YRfGVb1EmaGDm75i+Vs2w="; + cargoSha256 = "sha256-GZ4Yt5iQkgupJMTYIbvCPtz19985MFf8IDy3ui0M6DE="; doInstallCheck = true; diff --git a/nixpkgs/pkgs/tools/misc/flameshot/default.nix b/nixpkgs/pkgs/tools/misc/flameshot/default.nix index f0ed87bcc22b..838572d92973 100644 --- a/nixpkgs/pkgs/tools/misc/flameshot/default.nix +++ b/nixpkgs/pkgs/tools/misc/flameshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "flameshot"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "sha256-E5J61k1tVpbwlzYHbCY1rf9+GODcJRRAQwb0jR4s7BU="; + sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2"; }; nativeBuildInputs = [ cmake qttools qtsvg ]; @@ -17,8 +17,8 @@ mkDerivation rec { meta = with lib; { description = "Powerful yet simple to use screenshot software"; homepage = "https://github.com/flameshot-org/flameshot"; - maintainers = [ maintainers.scode ]; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ scode ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/fsql/default.nix b/nixpkgs/pkgs/tools/misc/fsql/default.nix index 100e70232321..dac33eaedb30 100644 --- a/nixpkgs/pkgs/tools/misc/fsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsql/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/misc/fwup/default.nix b/nixpkgs/pkgs/tools/misc/fwup/default.nix index de2b809eea52..69b76cf648d8 100644 --- a/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -21,17 +21,15 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "sha256-ayfcnIZ7MuBsCy1giwmY2D2C6AukwS+fevmXqGa4c1w="; + sha256 = "sha256-NaSA3mFWf3C03SAGssMqLT0vr5KMfxD5y/iragGNKjw="; }; - patches = [ ./fix-testrunner-darwin.patch ]; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -44,8 +42,7 @@ stdenv.mkDerivation rec { libsodium xz zlib - ] - ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ DiskArbitration ]; diff --git a/nixpkgs/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch b/nixpkgs/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch deleted file mode 100644 index b04b436ff5b1..000000000000 --- a/nixpkgs/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tests/common-orig.sh b/tests/common.sh -index 1f2673f..79dcf74 100755 ---- a/tests/common-orig.sh -+++ b/tests/common.sh -@@ -21,20 +21,6 @@ else - fi - - case "$HOST_OS" in -- Darwin) -- # BSD stat -- STAT_FILESIZE_FLAGS="-f %z" -- -- # Not -d? -- BASE64_DECODE=-D -- -- READLINK=/usr/local/bin/greadlink -- [ -e $READLINK ] || ( echo "Please run 'brew install coreutils' to install greadlink"; exit 1 ) -- [ -e /usr/local/bin/mdir ] || ( echo "Please run 'brew install mtools' to install mdir"; exit 1 ) -- -- FSCK_FAT=fsck_msdos -- TIMEOUT=gtimeout -- ;; - FreeBSD|NetBSD|OpenBSD|DragonFly) - # BSD stat - STAT_FILESIZE_FLAGS="-f %z" diff --git a/nixpkgs/pkgs/tools/misc/gibo/default.nix b/nixpkgs/pkgs/tools/misc/gibo/default.nix index 70d0eb19ca85..6ee4698d750c 100644 --- a/nixpkgs/pkgs/tools/misc/gibo/default.nix +++ b/nixpkgs/pkgs/tools/misc/gibo/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { sha256 = "07j3sv9ar9l074krajw8nfmsfmdp836irsbd053dbqk2v880gfm6"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/bin $out/share/bash-completion/completions cp gibo $out/bin diff --git a/nixpkgs/pkgs/tools/misc/gitlint/default.nix b/nixpkgs/pkgs/tools/misc/gitlint/default.nix index 014cc76e7138..267cdee72338 100644 --- a/nixpkgs/pkgs/tools/misc/gitlint/default.nix +++ b/nixpkgs/pkgs/tools/misc/gitlint/default.nix @@ -2,12 +2,41 @@ , buildPythonApplication , fetchFromGitHub , gitMinimal -, arrow -, click -, sh -, wheel +, python3 }: +let + py = python3.override { + packageOverrides = self: super: { + + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "7.1.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"; + }; + }); + + arrow = super.arrow.overridePythonAttrs (oldAttrs: rec { + version = "1.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0793badh4hgbk2c5g70hmbl7n3d4g5d87bcflld0w9rjwy59r71r"; + }; + }); + + sh = super.sh.overridePythonAttrs (oldAttrs: rec { + version = "1.14.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "13hxgifab9ichla13qaa7sh8r0il7vs1r21js72s0n355zr9mair"; + }; + }); + }; + }; +in +with py.pkgs; + buildPythonApplication rec { pname = "gitlint"; version = "0.15.1"; @@ -19,7 +48,9 @@ buildPythonApplication rec { sha256 = "sha256-CqmE4V+svSuQAsoX0I3NpUqPU5CQf3fyCHJPrjUjHF4="; }; - nativeBuildInputs = [ wheel ]; + nativeBuildInputs = [ + wheel + ]; propagatedBuildInputs = [ arrow @@ -35,10 +66,10 @@ buildPythonApplication rec { gitMinimal ]; - meta = { + meta = with lib; { description = "Linting for your git commit messages"; - homepage = "http://jorisroovers.github.io/gitlint"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ethancedwards8 ]; + homepage = "https://jorisroovers.com/gitlint/"; + license = licenses.mit; + maintainers = with maintainers; [ ethancedwards8 fab ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 34195c2fffe0..5e805920b68a 100644 --- a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.173.1"; + version = "0.173.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v3Sln1qtYDdWCWJSKErxUoPAUzwWrTYM0j5X+mz+1xo="; + sha256 = "sha256-X7Tj50A0CwkGUyKGsCj6LBAlNZwMhFk/gDEgG1KNjx0="; }; vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM="; diff --git a/nixpkgs/pkgs/tools/misc/gparted/default.nix b/nixpkgs/pkgs/tools/misc/gparted/default.nix index f661f2cf97d5..08e4641fb4c1 100644 --- a/nixpkgs/pkgs/tools/misc/gparted/default.nix +++ b/nixpkgs/pkgs/tools/misc/gparted/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gparted"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz"; - sha256 = "sha256-jcGAJF3Z6kXm4vS8aVEvGH4Ivn95nJioJaCwTBYcvSo="; + sha256 = "sha256-Xu4ubXSxXvlrE7OiMQyGjtIpjgM0ECHn0SpamKHR4Qk="; }; # Tries to run `pkexec --version` to get version. diff --git a/nixpkgs/pkgs/tools/misc/gpick/default.nix b/nixpkgs/pkgs/tools/misc/gpick/default.nix new file mode 100644 index 000000000000..0d39bb810b93 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/gpick/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, glib, boost, pkg-config, gtk3, ragel, lua, lib }: + +stdenv.mkDerivation rec { + pname = "gpick"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "thezbyg"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-Z67EJRtKJZLoTUtdMttVTLkzTV2F5rKZ96vaothLiFo="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + buildInputs = [ boost gtk3 ragel lua ]; + + meta = with lib; { + description = "Advanced color picker written in C++ using GTK+ toolkit"; + homepage = "http://www.gpick.org/"; + license = licenses.bsd3; + maintainers = [ maintainers.vanilla ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/gringo/default.nix b/nixpkgs/pkgs/tools/misc/gringo/default.nix index f08bad03916a..87902de0cb03 100644 --- a/nixpkgs/pkgs/tools/misc/gringo/default.nix +++ b/nixpkgs/pkgs/tools/misc/gringo/default.nix @@ -3,13 +3,9 @@ libcxx }: -let - version = "4.5.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gringo"; - inherit version; + version = "4.5.4"; src = fetchurl { url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index fcf29beb1882..d9c4ceeca2c0 100644 --- a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -39,7 +39,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.06-rc1"; + version = "2.06"; in ( @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; rev = "${pname}-${version}"; - sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa"; + sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/grub/default.nix b/nixpkgs/pkgs/tools/misc/grub/default.nix index 6d747bf8c6e7..2371bdb0e055 100644 --- a/nixpkgs/pkgs/tools/misc/grub/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { ++ map fetchurl (import ./grub1.patches.nix) ; + preConfigure = '' + substituteInPlace ./configure.ac --replace 'AC_PREREQ(2.61)' 'AC_PREREQ(2.64)' + ''; + # autoreconfHook required for the splashimage patch. nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ texinfo ]; diff --git a/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix index 41de7ef5d28b..8ea863f46417 100644 --- a/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix @@ -1,24 +1,23 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: -let version = "0.0.7"; in -stdenv.mkDerivation { - pname = "hdaps-gl"; - inherit version; - src = fetchFromGitHub { - owner = "linux-thinkpad"; - repo = "hdaps-gl"; - rev = version; - sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; - }; +stdenv.mkDerivation rec { + pname = "hdaps-gl"; + version = "0.0.7"; + src = fetchFromGitHub { + owner = "linux-thinkpad"; + repo = "hdaps-gl"; + rev = version; + sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; + }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ freeglut libGL libGLU ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ freeglut libGL libGLU ]; - meta = with lib; { - description = "GL-based laptop model that rotates in real-time via hdaps"; - homepage = "https://github.com/linux-thinkpad/hdaps-gl"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.symphorien ]; - }; + meta = with lib; { + description = "GL-based laptop model that rotates in real-time via 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/hexyl/default.nix b/nixpkgs/pkgs/tools/misc/hexyl/default.nix index 3f11490fcc4d..dcab5f249fe5 100644 --- a/nixpkgs/pkgs/tools/misc/hexyl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hexyl/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "hexyl"; - version = "0.8.0"; + pname = "hexyl"; + version = "0.9.0"; src = fetchFromGitHub { - owner = "sharkdp"; - repo = pname; - rev = "v${version}"; - sha256 = "0aj2sysl0spf5zlcd5kfzlw97w7dzf9x93pv0d1v9blnbd1rz7lm"; + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hLDx5OzCE5iA492V3+dhaav2l8/rOVWyskrU4Gz1hf4="; }; - cargoSha256 = "08hn0csw12xaag95gb5rj4q7k2zyy9j9bf4iw3b0r3ndh66qqra2"; + cargoSha256 = "sha256-CGaCMrShagK4dAdwJtaeUMJlYOlG/cH+6E1QDYGrqL0="; meta = with lib; { changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}"; @@ -22,9 +22,8 @@ rustPlatform.buildRustPackage rec { printable ASCII characters, ASCII whitespace characters, other ASCII characters and non-ASCII). ''; - homepage = "https://github.com/sharkdp/hexyl"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir ]; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/sharkdp/hexyl"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ dywedir SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/idutils/default.nix b/nixpkgs/pkgs/tools/misc/idutils/default.nix index ac64fe9e8bc4..e43ab2ae8797 100644 --- a/nixpkgs/pkgs/tools/misc/idutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/idutils/default.nix @@ -1,27 +1,29 @@ -{ fetchurl, lib, stdenv, emacs }: +{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync, gawk}: stdenv.mkDerivation rec { - name = "idutils-4.6"; + pname = "idutils"; + version = "4.6"; src = fetchurl { - url = "mirror://gnu/idutils/${name}.tar.xz"; + url = "mirror://gnu/idutils/idutils-${version}.tar.xz"; sha256 = "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"; }; - preConfigure = - '' - # Fix for building on Glibc 2.16. Won't be needed once the - # gnulib in idutils is updated. - sed -i '/gets is a security hole/d' lib/stdio.in.h + preConfigure = '' + # replace embedded gnulib tests with those from gnulib package + bash -O extglob -c "cd gnulib-tests; rm -r !(Makefile.am)" + substituteInPlace ./configure.ac --replace "AC_PREREQ(2.61)" "AC_PREREQ(2.64)" + ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; buildInputs = lib.optional stdenv.isLinux emacs; + nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync gawk ]; doCheck = !stdenv.isDarwin; patches = [ ./nix-mapping.patch ]; - meta = { + meta = with lib; { description = "Text searching utility"; longDescription = '' @@ -46,10 +48,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/idutils/"; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with maintainers; [ gfrascadorio ]; platforms = lib.platforms.all; - broken = true; }; } diff --git a/nixpkgs/pkgs/tools/misc/infracost/default.nix b/nixpkgs/pkgs/tools/misc/infracost/default.nix index abe1872c67fd..3d91dd6d9abb 100644 --- a/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -1,25 +1,58 @@ -{ lib, buildGoModule, fetchFromGitHub, terraform }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, terraform }: buildGoModule rec { pname = "infracost"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-TM+7Am5hoiRk/StAwCh5yAN1GKv3oPun38pvhArBoJg="; + sha256 = "sha256-OQwMO9bhPK+Wjob8rAFYJQRpAYf1bPdRi2BjETjpSpE="; }; + vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8="; - vendorSha256 = "sha256-6sMtM7MTFTDXwH8AKr5Dxq8rPqE92xzcWqBTixcPi+8="; + ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; + + # Install completions post-install + nativeBuildInputs = [ installShellFiles ]; checkInputs = [ terraform ]; - checkPhase = "make test"; + checkPhase = '' + runHook preCheck + make test + runHook postCheck + ''; + + postInstall = '' + export INFRACOST_SKIP_UPDATE_CHECK=true + installShellCompletion --cmd infracost \ + --bash <($out/bin/infracost completion --shell bash) \ + --fish <($out/bin/infracost completion --shell fish) \ + --zsh <($out/bin/infracost completion --shell zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + export INFRACOST_SKIP_UPDATE_CHECK=true + $out/bin/infracost --help + $out/bin/infracost --version | grep "v${version}" + + runHook postInstallCheck + ''; meta = with lib; { + homepage = "https://infracost.io"; + changelog = "https://github.com/infracost/infracost/releases/tag/v${version}"; description = "Cloud cost estimates for Terraform in your CLI and pull requests"; - homepage = "https://github.com/infracost/infracost"; - license = [ licenses.asl20 ]; - maintainers = [ maintainers.davegallant ]; + longDescription = '' + Infracost shows hourly and monthly cost estimates for a Terraform project. + This helps developers, DevOps et al. quickly see the cost breakdown and + compare different deployment options upfront. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ davegallant jk ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/nixpkgs/pkgs/tools/misc/ipxe/default.nix index 641e86c22c4b..4be0b3d417e4 100644 --- a/nixpkgs/pkgs/tools/misc/ipxe/default.nix +++ b/nixpkgs/pkgs/tools/misc/ipxe/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools +{ stdenv, lib, fetchFromGitHub, perl, cdrkit, xz, openssl, gnu-efi, mtools +, syslinux ? null , embedScript ? null , additionalTargets ? {} }: @@ -8,12 +9,20 @@ let "bin-x86_64-efi/ipxe.efi" = null; "bin-x86_64-efi/ipxe.efirom" = null; "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; - } // { + } // lib.optionalAttrs (stdenv.isi686 || stdenv.isx86_64) { "bin/ipxe.dsk" = null; "bin/ipxe.usb" = null; "bin/ipxe.iso" = null; "bin/ipxe.lkrn" = null; "bin/undionly.kpxe" = null; + } // lib.optionalAttrs stdenv.isAarch32 { + "bin-arm32-efi/ipxe.efi" = null; + "bin-arm32-efi/ipxe.efirom" = null; + "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; + } // lib.optionalAttrs stdenv.isAarch64 { + "bin-arm64-efi/ipxe.efi" = null; + "bin-arm64-efi/ipxe.efirom" = null; + "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; }; in @@ -21,7 +30,7 @@ stdenv.mkDerivation rec { pname = "ipxe"; version = "1.21.1"; - nativeBuildInputs = [ perl cdrkit syslinux xz openssl gnu-efi mtools ]; + nativeBuildInputs = [ perl cdrkit xz openssl gnu-efi mtools ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) syslinux; src = fetchFromGitHub { owner = "ipxe"; @@ -37,6 +46,7 @@ stdenv.mkDerivation rec { makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. + ] ++ lib.optionals (stdenv.isi686 || stdenv.isx86_64) [ "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" "LDLINUX_C32=${syslinux}/share/syslinux/ldlinux.c32" ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; @@ -62,6 +72,8 @@ stdenv.mkDerivation rec { buildFlags = lib.attrNames targets; installPhase = '' + runHook preInstall + mkdir -p $out ${lib.concatStringsSep "\n" (lib.mapAttrsToList (from: to: if to == null @@ -71,6 +83,8 @@ stdenv.mkDerivation rec { # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending # let's provide it as a symlink to be compatible in this case. ln -s undionly.kpxe $out/undionly.kpxe.0 + + runHook postInstall ''; enableParallelBuilding = true; @@ -78,8 +92,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Network boot firmware"; homepage = "https://ipxe.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ehmry ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/ix/default.nix b/nixpkgs/pkgs/tools/misc/ix/default.nix index 83d8a7704192..95b53c3b6ccd 100644 --- a/nixpkgs/pkgs/tools/misc/ix/default.nix +++ b/nixpkgs/pkgs/tools/misc/ix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' install -Dm +x $src $out/bin/ix diff --git a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix index fb69610e4ef7..73d86e7dfc65 100644 --- a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation { stripRoot = false; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper libGLU libGL diff --git a/nixpkgs/pkgs/tools/misc/krapslog/default.nix b/nixpkgs/pkgs/tools/misc/krapslog/default.nix index c6f1cf8f8169..a499c3eb46b4 100644 --- a/nixpkgs/pkgs/tools/misc/krapslog/default.nix +++ b/nixpkgs/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-Ab5bY5r0tYx3JxYRRq7i9O7WFvdi6cRMSuru/pK50y8="; + sha256 = "sha256-IXbOmeWLhGOijO1xLItw1wzbHxl0Zyd0dHvfcaPWE8U="; }; - cargoSha256 = "sha256-k7jsWMFU/8XogREic4GB+qYocFtiTvSzvBAcORUFe0o="; + cargoSha256 = "sha256-2XCtjMV8ko6jnvXYtJhLlNvB1uc0QLO/aYsQX40deBk="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/nixpkgs/pkgs/tools/misc/lbdb/default.nix index ea4b2a9cbbc5..ce3a5acd4c9d 100644 --- a/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -7,12 +7,11 @@ }: let - version = "0.48.1"; perl' = perl.withPackages (p: with p; [ ConvertASN1 perlldap AuthenSASL ]); in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lbdb"; - inherit version; + version = "0.48.1"; src = fetchurl { url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; diff --git a/nixpkgs/pkgs/tools/misc/lilo/default.nix b/nixpkgs/pkgs/tools/misc/lilo/default.nix new file mode 100644 index 000000000000..2babcb2bedd7 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/lilo/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, fetchurl, dev86, sharutils }: + +stdenv.mkDerivation rec { + pname = "lilo"; + version = "24.2"; + src = fetchurl { + url = "https://www.joonet.de/lilo/ftp/sources/${pname}-${version}.tar.gz"; + hash = "sha256-4VjxneRWDJNevgUHwht5v/F2GLkjDYB2/oxf/5/b1bE="; + }; + nativeBuildInputs = [ dev86 sharutils ]; + DESTDIR = placeholder "out"; + + meta = with lib; { + homepage = "https://www.joonet.de/lilo/"; + description = "Linux bootloader"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/man-db/default.nix b/nixpkgs/pkgs/tools/misc/man-db/default.nix index 4ac11aa62c1b..9c8adc1d8d41 100644 --- a/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; platforms = lib.platforms.unix; + mainProgram = "man"; }; } diff --git a/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix b/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix deleted file mode 100644 index 0c021591e5e5..000000000000 --- a/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchurl, lib, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: - -let - system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; -in -stdenv.mkDerivation rec { - pname = "ocz-ssd-guru"; - version = "1.0.1170"; - - src = fetchurl { - url = "http://ocz.com/consumer/download/ssd-guru/SSDGuru_${version}.tar.gz"; - sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - libPath = lib.makeLibraryPath [ - xorg.libX11 - xorg.libxcb - freetype - fontconfig - xorg.libXext - xorg.libXi - xorg.libXrender - stdenv.cc.cc - glibc - libGLU libGL - ]; - - installPhase = '' - mkdir -p $out/bin - cp ${system}/SSDGuru $out/bin/ - rm -rf linux{32,64} - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath:$out \ - $out/bin/SSDGuru - - wrapProgram $out/bin/SSDGuru --prefix LD_LIBRARY_PATH : $libPath - ''; - - dontStrip = true; - dontPatchELF = true; - - meta = { - homepage = "http://ocz.com/ssd-guru"; - description = "SSD Management Tool for OCZ disks"; - license = lib.licenses.unfree; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jagajaga ]; - }; - -} diff --git a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index 8208459bc89a..062b49e8bbdc 100644 --- a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; - NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - meta = with lib; { description = "OpenStreetMap data to PostgreSQL converter"; homepage = "https://osm2pgsql.org"; diff --git a/nixpkgs/pkgs/tools/misc/plowshare/default.nix b/nixpkgs/pkgs/tools/misc/plowshare/default.nix index 2cfbf5ae91ac..1d15db020407 100644 --- a/nixpkgs/pkgs/tools/misc/plowshare/default.nix +++ b/nixpkgs/pkgs/tools/misc/plowshare/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontBuild = true; installPhase = '' make PREFIX="$out" install diff --git a/nixpkgs/pkgs/tools/misc/ponysay/default.nix b/nixpkgs/pkgs/tools/misc/ponysay/default.nix index 113c2b05ff59..b27aa32481c0 100644 --- a/nixpkgs/pkgs/tools/misc/ponysay/default.nix +++ b/nixpkgs/pkgs/tools/misc/ponysay/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, fetchurl, python3, texinfo, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python3, texinfo, makeWrapper }: -stdenv.mkDerivation { - name = "ponysay-3.0.3"; +stdenv.mkDerivation rec { + name = "ponysay"; + version = "3.0.3"; - src = fetchurl { - url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz"; - sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; + src = fetchFromGitHub { + owner = "erkin"; + repo = "ponysay"; + rev = version; + sha256 = "sha256-R2B0TU3ZSEncGsijKgvhaHIbcZa5Dx/jVPxrILBaoVw="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python3 texinfo ]; + buildInputs = [ python3 texinfo ]; inherit python3; - phases = "unpackPhase installPhase fixupPhase"; - installPhase = '' find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g" substituteInPlace setup.py --replace \ @@ -25,11 +26,11 @@ stdenv.mkDerivation { --with-bash ''; - meta = { + meta = with lib; { description = "Cowsay reimplemention for ponies"; homepage = "https://github.com/erkin/ponysay"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ bodil ]; - platforms = with lib.platforms; unix; + license = licenses.gpl3; + maintainers = with maintainers; [ bodil ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/poweralertd/default.nix b/nixpkgs/pkgs/tools/misc/poweralertd/default.nix index a00a5b9a4026..4121b0712bd7 100644 --- a/nixpkgs/pkgs/tools/misc/poweralertd/default.nix +++ b/nixpkgs/pkgs/tools/misc/poweralertd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "poweralertd"; - version = "0.1.0"; + version = "0.2.0"; outputs = [ "out" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "~kennylevinsen"; repo = "poweralertd"; rev = version; - sha256 = "136xcrp7prilh905a6v933vryqy20l7nw24ahc4ycax8f0s906x9"; + sha256 = "19rw9q4pcqw56nmzjfglfikzx5wwjl4n08awwdhg0jy1k0bm3dvp"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix index 2f6ff216dc87..004bebaebbea 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.21.0"; + version = "unstable-2021-07-15"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-IO3I5lvPdN73EF+S5Xo+TMEYaBtd1pOGMs+aQtRnHjE="; + rev = "f27435b26b5001c52ffb1aee454572c59494c81b"; + sha256 = "sha256-YB/WMprjXA5ZN6baT5nWahNj0xwbP8kzS7X/1tCwWiE="; }; vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; diff --git a/nixpkgs/pkgs/tools/misc/pws/default.nix b/nixpkgs/pkgs/tools/misc/pws/default.nix index e98323b75eea..783bb9b5a384 100644 --- a/nixpkgs/pkgs/tools/misc/pws/default.nix +++ b/nixpkgs/pkgs/tools/misc/pws/default.nix @@ -1,15 +1,16 @@ { stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript, xsel, makeWrapper }: stdenv.mkDerivation rec { - name = "pws-${(import ./gemset.nix).pws.version}"; + pname = "pws"; + version = (import ./gemset.nix).pws.version; nativeBuildInputs = [ makeWrapper ]; - phases = ["installPhase"]; + dontUnpack = true; installPhase = let env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-gems"; inherit ruby; diff --git a/nixpkgs/pkgs/tools/misc/rauc/default.nix b/nixpkgs/pkgs/tools/misc/rauc/default.nix index 41183a2f6e1e..667ce3cabe41 100644 --- a/nixpkgs/pkgs/tools/misc/rauc/default.nix +++ b/nixpkgs/pkgs/tools/misc/rauc/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" "--with-dbusinterfacesdir=${placeholder "out"}/share/dbus-1/interfaces" - "--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/systemd.d" + "--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/system.d" "--with-dbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" ]; diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index f5f8f87e9ca9..052e6198d4fb 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zXXjy90oxLO/Ac/TQC4J6rOvha2qGBMv0SAAXvDyITo="; + sha256 = "0wcldggdavmxajq6dkksdacs5f4729yvxvqiyb9vgalv4akik4yj"; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-TXmV1saqZ/XS4HxKpGXWu3HuoZ3WIptSc8oTNnPCqYE="; + cargoSha256 = "1ligh5mwids7crf2qh657sdij9fcw7pb3w7vqskpvkyk25h2z6r9"; preCheck = '' HOME=$TMPDIR diff --git a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 0e91b9c0e562..5514fd4e30f0 100644 --- a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "01q03v6a2rkw49z5nbm5mghm0qmmm12pq3amsiiiv5j6m9p0fdsy"; + sha256 = "0b0q4k5aacw2nna5higr6sk5lsdn62lw2l9lccfy5s3m530banni"; }; pythonPaths = [ cryptography pyyaml requests ]; @@ -43,6 +43,13 @@ in stdenv.mkDerivation rec { sh scripts/run-tests.sh -2 ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/svtplay-dl --help > /dev/null + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/spaam/svtplay-dl"; description = "Command-line tool to download videos from svtplay.se and other sites"; diff --git a/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix b/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix index 1ead06ed6e85..74f0807a7080 100644 --- a/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix @@ -21,7 +21,7 @@ ar p "$src" data.tar.xz | tar xJ ''; - buildPhase = ":"; + dontBuild = true; installPhase = '' mkdir -p $out/bin $out/share/sweep-visualizer diff --git a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix index 1781187481fb..aafdfe07ff9b 100644 --- a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix +++ b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "system-config-printer"; - version = "1.5.12"; + version = "1.5.15"; src = fetchFromGitHub { owner = "openPrinting"; repo = pname; - rev = version; - sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf"; + rev = "v${version}"; + sha256 = "0a3v8fp1dfb5cwwpadc3f6mv608b5yrrqd8ddkmnrngizqwlswsc"; }; prePatch = '' @@ -26,17 +26,6 @@ stdenv.mkDerivation rec { patches = [ ./detect_serverbindir.patch - - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104 - # (Fixes will be included in next upstream release.) - (fetchpatch { - url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch"; - sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n"; - }) - (fetchpatch { - url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch"; - sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23"; - }) ]; buildInputs = [ @@ -55,6 +44,10 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; + preConfigure = '' + intltoolize --copy --force --automake + ''; + configureFlags = [ "--with-udev-rules" "--with-udevdir=${placeholder "out"}/etc/udev" diff --git a/nixpkgs/pkgs/tools/misc/tea/default.nix b/nixpkgs/pkgs/tools/misc/tea/default.nix index 06e54559db9a..a7af4fec7ba4 100644 --- a/nixpkgs/pkgs/tools/misc/tea/default.nix +++ b/nixpkgs/pkgs/tools/misc/tea/default.nix @@ -1,11 +1,13 @@ -{ lib, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchFromGitea }: buildGoModule rec { pname = "tea"; version = "0.7.0"; - src = fetchgit { - url = "https://gitea.com/gitea/tea"; + src = fetchFromGitea { + domain = "gitea.com"; + owner = "gitea"; + repo = "tea"; rev = "v${version}"; sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY="; }; diff --git a/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix index e6fc7bf3f7fe..d9c9ad0451bb 100644 --- a/nixpkgs/pkgs/tools/misc/tfk8s/default.nix +++ b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, callPackage }: buildGoModule rec { pname = "tfk8s"; - version = "0.1.4"; + version = "0.1.5"; tag = "v${version}"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; rev = tag; - sha256 = "sha256-Ha/F8rCGZqFYqJzfemmKRyEBI5khaSIerJxvf2Pf2ao="; + sha256 = "sha256-T0zM2JOmzk8YyS3+De6yGwiwLgyb6Rwy6hT9b44wNxQ="; }; - vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE="; + vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; runVend = true; buildFlagsArray = [ @@ -30,6 +30,10 @@ buildGoModule rec { $out/bin/tfk8s --version | grep ${tag} > /dev/null ''; + passthru.tests = { + sample1 = callPackage ./tests/sample1 { }; + }; + meta = with lib; { description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/default.nix b/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/default.nix new file mode 100644 index 000000000000..6b06dbf32340 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/default.nix @@ -0,0 +1,11 @@ +{ runCommandCC, tfk8s }: + +runCommandCC "tfk8s-test-sample1" { + buildInputs = [ + tfk8s + ]; + meta.timeout = 60; + } + '' + cmp <(${tfk8s}/bin/tfk8s -f ${./input.yaml}) ${./output.tf} > $out + '' diff --git a/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml b/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml new file mode 100644 index 000000000000..58ed0eb11d76 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: test +data: + TEST: test diff --git a/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/output.tf b/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/output.tf new file mode 100644 index 000000000000..51d564400b55 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/tfk8s/tests/sample1/output.tf @@ -0,0 +1,12 @@ +resource "kubernetes_manifest" "configmap_test" { + manifest = { + "apiVersion" = "v1" + "data" = { + "TEST" = "test" + } + "kind" = "ConfigMap" + "metadata" = { + "name" = "test" + } + } +} diff --git a/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix b/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix index c3ceae7a0bd3..c248546fdb49 100644 --- a/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "2.0.3"; - source.sha256 = "0js43hl07is9nx1b17g8x2blh1q7ls8y4dshcb50r5dn7drpardh"; + version = "3.0.1"; + source.sha256 = "1vm96iyzbcy1388b3zyqivfhs4p63v87mp5qwlr4s8i2haq62xyf"; erubis = buildRubyGem rec { inherit ruby; diff --git a/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix b/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix index 9c0a68805a6f..5f6acfd9696f 100644 --- a/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix +++ b/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tremor"; - version = "0.11.2"; + version = "0.11.5"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-runtime"; rev = "v${version}"; - sha256 = "sha256-FedRwFVc+m25+Elj1Vp/fInbK6DVsUpniw29/dtecWo="; + sha256 = "sha256-fE0f0tCI2V+HqHZwn9cO+xs0o3o6w0nrJg9Et0zJMOE="; }; - cargoSha256 = "sha256-jxXoFOwoBSkn7pv10ctLpD7ko8bokc1ADkB7NQFRC7c="; + cargoHash = "sha256-dky9ejzMgKXlzpg+9bmkd7th+EHBpNmZJkgYt2pjuuI="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/trillian/default.nix b/nixpkgs/pkgs/tools/misc/trillian/default.nix index 8a96248e718a..9959fe9375be 100644 --- a/nixpkgs/pkgs/tools/misc/trillian/default.nix +++ b/nixpkgs/pkgs/tools/misc/trillian/default.nix @@ -5,28 +5,21 @@ buildGoModule rec { pname = "trillian"; - version = "1.3.11"; - vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l"; + version = "1.3.13"; + vendorSha256 = "1ad0vaw0k57njzk9x233iqjbplyvw66qjk8r9j7sx87pdc6a4lpb"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1lh19wba90y91l5jj8ilzjqxgmqqqdvyn7pzrwvmzv7iiy18wcmh"; + sha256 = "1ns394yd4js9g1psd1dkrffidyzixqvjp5lhw2x2iycrxbnm3y44"; }; - # Remove tests that require networking - postPatch = '' - rm cmd/get_tree_public_key/main_test.go - ''; - subPackages = [ "cmd/trillian_log_server" "cmd/trillian_log_signer" - "cmd/trillian_map_server" "cmd/createtree" "cmd/deletetree" - "cmd/get_tree_public_key" "cmd/updatetree" ]; diff --git a/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix index f69955020c72..d5dd47e0f669 100644 --- a/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix @@ -27,7 +27,8 @@ let in mkDerivation { name = "${src.name}-patched"; inherit src; - phases = [ "unpackPhase" "patchPhase" ]; + + dontInstall = true; patchPhase = with lib; '' # we don’t want prebuild binaries checked into version control! diff --git a/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix index 464183cf579e..d59b759503f8 100644 --- a/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Rewrite of unclutter using the X11 Xfixes extension"; platforms = platforms.unix; license = lib.licenses.mit; - inherit version; maintainers = [ maintainers.globin ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index 209a38cdcc10..8abfb077596a 100644 --- a/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,25 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-dnswE/DU2jCfxWW10Ctjw8woktwWZqyd3E9IuKkle1M="; + sha256 = "sha256-XI6061nCVyL8Q1s+QH75IesneJNhbhxGnILZxQCa5LU="; }; - postPatch = '' - # can be removed after https://github.com/uutils/coreutils/pull/1815 is included - substituteInPlace GNUmakefile \ - --replace uutils coreutils - ''; - cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-92BHPSVIPZLn399AcaJJjRq2WkxzDm8knKN3FIdAxAA="; + hash = "sha256-bfwWyeuslLjh4OCt+H8CM8hCrRFqlibOS8gS64lysa0="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index e8c3ed7cbe9e..d9e454d4ab81 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wtihrR19jMJ7Kgvy6XBzOUrC/WKNVl2MVx4lWgXYlvg="; + sha256 = "sha256-8ZsZyV6zlMiNTVYPwqQi7F1OJ4hV33IqrrGkvUb8JaY="; }; - cargoSha256 = "sha256-VYIzAqh5Xxmn1koxhh+UDb2G3WS2UVXffuBY7h5Kr7A="; + cargoSha256 = "sha256-t6KeyBwIfCQTfaennFiFX3K+8unFOsduBP7nRbAo9wI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/nixpkgs/pkgs/tools/misc/via/default.nix b/nixpkgs/pkgs/tools/misc/via/default.nix new file mode 100644 index 000000000000..5667c8a4c46c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/via/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "via"; + version = "1.3.1"; + name = "${pname}-${version}"; + nameExecutable = pname; + src = fetchurl { + url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage"; + name = "via-${version}-linux.AppImage"; + sha256 = "d2cd73d280a265149fedb24161ec7c575523596c4d30898ad6b5875e09b3f34a"; + }; + appimageContents = appimageTools.extractType2 { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + profile = '' + # Skip prompt to add udev rule. + # On NixOS you can add this rule with `services.udev.packages = [ pkgs.via ];`. + export DISABLE_SUDO_PROMPT=1 + ''; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/via.desktop -t $out/share/applications + substituteInPlace $out/share/applications/via.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + + mkdir -p $out/etc/udev/rules.d + echo 'KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666", TAG+="uaccess", TAG+="udev-acl"' > $out/etc/udev/rules.d/92-viia.rules + ''; + + meta = with lib; { + description = "Yet another keyboard configurator"; + homepage = "https://caniusevia.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ angustrau ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/vial/default.nix b/nixpkgs/pkgs/tools/misc/vial/default.nix new file mode 100644 index 000000000000..c8d38d826d1f --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/vial/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchurl, appimageTools }: +let + name = "vial-${version}"; + version = "0.4"; + pname = "Vial"; + + src = fetchurl { + url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; + sha256 = "sha256-4EDEVSqjQ6Ybqx4BoNwE4pT5yFLYM05FBHc5deQU9f8="; + }; + + appimageContents = appimageTools.extractType2 { inherit name src; }; +in +appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + cp -r ${appimageContents}/usr/share/icons $out/share + + mkdir -p $out/etc/udev/rules.d/ # https://get.vial.today/getting-started/linux-udev.html + echo 'KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666", TAG+="uaccess", TAG+="udev-acl"' > $out/etc/udev/rules.d/92-viia.rules + ''; + + meta = with lib; { + description = "An Open-source cross-platform (Windows, Linux and Mac) GUI and a QMK fork for configuring your keyboard in real time"; + homepage = "https://get.vial.today"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ kranzes ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix index 2e5063768516..06e886e4d04f 100644 --- a/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix +++ b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix @@ -3,8 +3,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://raw.githubusercontent.com/archlinux/svntogit-packages/9cb733cefa92af3fca608fb051d5251160c9bbff/trunk/xvfb-run"; sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; }; in diff --git a/nixpkgs/pkgs/tools/misc/yafetch/default.nix b/nixpkgs/pkgs/tools/misc/yafetch/default.nix index 8dad93d0debb..5a0821844007 100644 --- a/nixpkgs/pkgs/tools/misc/yafetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/yafetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yafetch"; - version = "unstable-2021-06-15"; + version = "unstable-2021-07-18"; src = fetchFromGitLab { owner = "cyberkitty"; repo = pname; - rev = "423a7d1f1ef8f0e4caf586710828620d3cb593e3"; - sha256 = "184yy7i8ca2fh6d1rxyhxi9gqb57fpz7ia0i56dl1zhg769m8b99"; + rev = "f3efbca54df1ffea22cc40034114af141ccff9c1"; + sha256 = "1cxhrjy9vzq87rzql4dcknkwca7nydysp1p1x4fh1qfw79dfdmxw"; }; # Use the provided NixOS logo automatically diff --git a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index cd04e2020b1c..209072da3b0b 100644 --- a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -12,12 +12,12 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - attrs ConfigArgParse ffmpeg future lxml requests + attrs configargparse ffmpeg future lxml requests ]; pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with python3Packages; [ ffmpeg pytest pytestrunner ]; + checkInputs = with python3Packages; [ ffmpeg pytest pytest-runner ]; meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 00e3ec1fbdcd..cb575adf75ee 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -59,7 +59,6 @@ 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/"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/tools/misc/zellij/default.nix b/nixpkgs/pkgs/tools/misc/zellij/default.nix index d55353682fdd..c7889b158735 100644 --- a/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-1GG3Bvw3P77dLhvJKwq48TUWMwg+bDgzWmtrw2JixLg="; + sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc="; }; - cargoSha256 = "sha256-cqm4QCGy6eTKtEBlE2ihmh93eO7d47zlCrLY8Gp0dxM="; + cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix index 61589345d702..51cfda5e0aa1 100644 --- a/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "zsh-autoenv"; - version = "2017-12-16"; + version = "unstable-2017-12-16"; src = fetchFromGitHub { owner = "Tarrasch"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "004svkfzhc3ab6q2qvwzgj36wvicg5bs8d2gcibx6adq042di7zj"; }; - buildPhase = ":"; + dontBuild = true; installPhase = '' mkdir -p $out/{bin,share} diff --git a/nixpkgs/pkgs/tools/networking/amass/default.nix b/nixpkgs/pkgs/tools/networking/amass/default.nix index bf8a1b8e4f83..5d539cc56978 100644 --- a/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.13.2"; + version = "3.13.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI="; + sha256 = "0zlkr0r06w3y34nx174wyfwk69i2q0bcq88kfvb0j3d28fdh5p31"; }; - vendorSha256 = "0nbj41ha31lkwraxwvyavdr94y9nnxl6z85jjkszxbd12a5g6v7h"; + vendorSha256 = "065n1vhj5003ay4pflp418w32s84jvza52lghj6cpcdzs0rwgc45"; outputs = [ "out" "wordlists" ]; @@ -24,6 +24,9 @@ buildGoModule rec { gzip $wordlists/*.txt ''; + # https://github.com/OWASP/Amass/issues/640 + doCheck = false; + meta = with lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' @@ -37,8 +40,8 @@ buildGoModule rec { Amass ships with a set of wordlist (to be used with the amass -w flag) that are found under the wordlists output. ''; - homepage = "https://www.owasp.org/index.php/OWASP_Amass_Project"; + homepage = "https://owasp.org/www-project-amass/"; license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit fab ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/cdpr/default.nix b/nixpkgs/pkgs/tools/networking/cdpr/default.nix new file mode 100644 index 000000000000..6ac69b95dba6 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/cdpr/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, libpcap }: + +stdenv.mkDerivation rec { + pname = "cdpr"; + version = "2.4"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tgz"; + sha256 = "1idyvyafkk0ifcbi7mc65b60qia6hpsdb6s66j4ggqp7if6vblrj"; + }; + + buildInputs = [ libpcap ]; + + installPhase = '' + install -Dm755 cdpr $out/bin/cdpr + ''; + + meta = with lib; { + description = "Cisco Discovery Protocol Reporter"; + homepage = "http://cdpr.sourceforge.net/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.sgo ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/corerad/default.nix b/nixpkgs/pkgs/tools/networking/corerad/default.nix index 341e1c13335c..8ba8109f2668 100644 --- a/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "1avbd0ldmzzkfay2pm6b88aln388cj8z7dzyw6i8m5k0lmmmmz9y"; + sha256 = "1xfqjxygf6r5wbf3brilx4d4hm0h518zaadmmzvkmbbz6w0fyl0k"; }; - vendorSha256 = "0cd6h5d4yjn86q296qp6lgxcykci1233s4s2fp8m0l3ywss69fck"; + vendorSha256 = "0ydyfdx9syrv719knwv64srfx4d1m9pzkivfc3q188bx5qx67pjw"; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/corkscrew/default.nix b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix index 58a43c30a935..3aacb0da6a2e 100644 --- a/nixpkgs/pkgs/tools/networking/corkscrew/default.nix +++ b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, automake }: stdenv.mkDerivation rec { - name = "corkscrew-2.0"; + pname = "corkscrew"; + version = "2.0"; src = fetchurl { - url = "http://agroman.net/corkscrew/${name}.tar.gz"; + url = "http://agroman.net/corkscrew/corkscrew-${version}.tar.gz"; sha256 = "0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be"; }; diff --git a/nixpkgs/pkgs/tools/networking/curlie/default.nix b/nixpkgs/pkgs/tools/networking/curlie/default.nix index 9ae9644eb940..9d3e4025a991 100644 --- a/nixpkgs/pkgs/tools/networking/curlie/default.nix +++ b/nixpkgs/pkgs/tools/networking/curlie/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "curlie"; - version = "1.6.0"; + version = "1.6.2"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rrwdqaKrC37BaI9RuTTv6EiOZ3ztgd7nGuplmeW02h8="; + sha256 = "sha256-2CZpqc1MnAY6M1UFakKLaqGjaifw+7bN4hxc0jWgSps="; }; vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; diff --git a/nixpkgs/pkgs/tools/networking/ddclient/default.nix b/nixpkgs/pkgs/tools/networking/ddclient/default.nix index 72daa0608a67..e4bb685b518e 100644 --- a/nixpkgs/pkgs/tools/networking/ddclient/default.nix +++ b/nixpkgs/pkgs/tools/networking/ddclient/default.nix @@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec { # perl packages by default get devdoc which isn't present outputs = [ "out" ]; - buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP ]; + buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP IOSocketInet6 ]; # Use iproute2 instead of ifconfig preConfigure = '' diff --git a/nixpkgs/pkgs/tools/networking/dhcp/default.nix b/nixpkgs/pkgs/tools/networking/dhcp/default.nix index 5d71f9641fd9..2a722d17c01f 100644 --- a/nixpkgs/pkgs/tools/networking/dhcp/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcp/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.isc.org/dhcp/"; - license = licenses.isc; + license = licenses.mpl20; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index c28e94a8218c..ffa2138ffa82 100644 --- a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.38.1"; + version = "0.38.3"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H0K38SX/mKsVjdQEa6vzx5TNRhqqomYk28+5Wl5H0sA="; + sha256 = "sha256-VfEfxcewKo8D8kNsMuCvrLOZNl632ZIFyD+RG8qzjQ4="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/getmail/default.nix b/nixpkgs/pkgs/tools/networking/getmail/default.nix index 44481802cc08..fc06ba0363d8 100644 --- a/nixpkgs/pkgs/tools/networking/getmail/default.nix +++ b/nixpkgs/pkgs/tools/networking/getmail/default.nix @@ -23,7 +23,6 @@ python2Packages.buildPythonApplication rec { platforms = lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; - inherit version; updateWalker = true; license = lib.licenses.gpl2Plus; }; diff --git a/nixpkgs/pkgs/tools/networking/getmail6/default.nix b/nixpkgs/pkgs/tools/networking/getmail6/default.nix index 910758fcf207..dc36a7d124a4 100644 --- a/nixpkgs/pkgs/tools/networking/getmail6/default.nix +++ b/nixpkgs/pkgs/tools/networking/getmail6/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.18"; + version = "6.18.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-n2ADzxkd7bO6cO8UioCdRdCqUu03G9jxs9biEZACSus="; + sha256 = "sha256-8tBSi9QzWcVL09j6aa2yWFhLlqaI6DREX2PpKvHC3qU="; }; # needs a Docker setup diff --git a/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix b/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix index 8383f82fd93c..014cce5ea4f1 100644 --- a/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; }; - buildInputs = [ net-snmp ]; + buildInputs = lib.optional stdenv.isLinux net-snmp; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/networking/innernet/default.nix b/nixpkgs/pkgs/tools/networking/innernet/default.nix index cee4956269e1..f643702d625b 100644 --- a/nixpkgs/pkgs/tools/networking/innernet/default.nix +++ b/nixpkgs/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tnwq86gAbi24O8/26134gJCf9+wol1zma980t9iHEKY="; + sha256 = "sha256-n+xNWhOkRCIcoBHR8u+xZK81fU0usIfFhYg3BO9yXik="; }; - cargoSha256 = "sha256-Wy+i1lmXpsy0Sy0GF5XUfXsLQHeV7cQo9nUxUEFnHOU="; + cargoSha256 = "sha256-cTqQtJpuwVlUKfAK8ASf6vq6PU2NE8PT/el/Hz4HgtA="; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/nixpkgs/pkgs/tools/networking/ip2unix/default.nix b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix index 992ee324cc50..7e2eef70b8a2 100644 --- a/nixpkgs/pkgs/tools/networking/ip2unix/default.nix +++ b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ip2unix"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "19c449h60b2m1d8kawnhpi4y9y4ddm24jmlh8kilqmx8m5l2khr6"; + sha256 = "1pl8ayadxb0zzh5s26yschkjhr1xffbzzv347m88f9y0jv34d24r"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/iwgtk/default.nix b/nixpkgs/pkgs/tools/networking/iwgtk/default.nix new file mode 100644 index 000000000000..5c89facd3fa3 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/iwgtk/default.nix @@ -0,0 +1,28 @@ +{ fetchFromGitHub, gtk3, lib, pkg-config, stdenv }: + +stdenv.mkDerivation rec { + pname = "iwgtk"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "j-lentz"; + repo = pname; + rev = "v${version}"; + sha256 = "129h7vq9b1r9a5c79hk8d06bj8lgzrnhq55x54hqri9c471jjh0s"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "Lightweight, graphical wifi management utility for Linux"; + homepage = "https://github.com/j-lentz/iwgtk"; + changelog = "https://github.com/j-lentz/iwgtk/blob/v${version}/CHANGELOG"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/kea/default.nix b/nixpkgs/pkgs/tools/networking/kea/default.nix index e852fdb1c2d4..e3e4a67c131f 100644 --- a/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -8,7 +8,9 @@ , libmysqlclient , log4cplus , postgresql -, python3 }: +, python3 +, nixosTests +}: stdenv.mkDerivation rec { pname = "kea"; @@ -48,11 +50,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) kea; + }; + meta = with lib; { 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 + Kea is a new open source DHCPv4/DHCPv6 server being developed by Internet Systems Consortium. The objective of this project is to provide a very high-performance, extensible DHCP server engine for use by enterprises and service providers, either as is or with @@ -60,6 +66,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mpl20; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz hexa ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix index 05da924c47e4..480321ad15fc 100644 --- a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix +++ b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ - ConfigArgParse + configargparse argcomplete beautifulsoup4 pyopenssl diff --git a/nixpkgs/pkgs/tools/networking/maphosts/default.nix b/nixpkgs/pkgs/tools/networking/maphosts/default.nix index 8e3d0cf9160c..6632485b7091 100644 --- a/nixpkgs/pkgs/tools/networking/maphosts/default.nix +++ b/nixpkgs/pkgs/tools/networking/maphosts/default.nix @@ -7,9 +7,10 @@ let gemdir = ./.; }; in stdenv.mkDerivation { - name = "maphosts-${env.gems.maphosts.version}"; + pname = "maphosts"; + version = env.gems.maphosts.version; - phases = ["installPhase"]; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 70b663edded5..06ec1b5a83f7 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-03-23T05-46-11Z"; + version = "2021-06-13T17-48-22Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-AtE9Zy8tRvcE+gYc0pqJDEFnXL4jSbJ4b6l3ZOe69Y4="; + sha256 = "sha256-u0WO7KSalDqlRwbN3b74FOb632fIGPZ2F0T8qLrvt+U="; }; - vendorSha256 = "sha256-cIr8d5jz4EfBFuOBZG4Kz20wSXy1Cni77V+JR6vLHwQ="; - - doCheck = false; + vendorSha256 = "sha256-BadW8AKHcrkCS3sXR7bqdgNhRYkfXIQOteMxIbiLvwg="; subPackages = [ "." ]; @@ -23,10 +21,15 @@ buildGoModule rec { sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/mc --version | grep ${version} > /dev/null + ''; + meta = with lib; { 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 ]; + maintainers = with maintainers; [ bachp eelco superherointj ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/nixpkgs/pkgs/tools/networking/n2n/default.nix b/nixpkgs/pkgs/tools/networking/n2n/default.nix new file mode 100644 index 000000000000..aec4a1c5f530 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/n2n/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + pname = "n2n"; + version = "2.8"; + + src = fetchFromGitHub { + owner = "ntop"; + repo = "n2n"; + rev = version; + hash = "sha256-2xJ8gYVZJZoKs6PZ/9GacgxQ+/3tmnRntT1AbPe1At4="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + postPatch = '' + patchShebangs autogen.sh + ''; + + preAutoreconf = '' + ./autogen.sh + ''; + + PREFIX = placeholder "out"; + + meta = with lib; { + description = "Peer-to-peer VPN"; + homepage = "https://www.ntop.org/products/n2n/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ malvo ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix index fbfab8d2f05a..2840b9d8400a 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix @@ -9,8 +9,7 @@ let versions = builtins.fromJSON (builtins.readFile ./versions.json); else if stdenv.isAarch64 then "arm64" else throw "Unsupported architecture"; os = if stdenv.isLinux then "linux" - else if (stdenv.isDarwin && stdenv.isx86_64) then "darwin" - else if stdenv.isDarwin then throw "Unsupported architecture" + else if stdenv.isDarwin then "darwin" else throw "Unsupported os"; versionInfo = versions."${os}-${arch}"; inherit (versionInfo) version sha256 url; diff --git a/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix b/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix new file mode 100644 index 000000000000..200b488cf714 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl }: + +let + pname = "ookla-speedtest"; + version = "1.0.0"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://install.speedtest.net/app/cli/${pname}-${version}-x86_64-linux.tgz"; + sha256 = "sha256-X+ICjw1EJ+T0Ix2fnPcOZpG7iQpwY211Iy/k2XBjMWg="; + }; + aarch64-linux = fetchurl { + url = "https://install.speedtest.net/app/cli/${pname}-${version}-aarch64-linux.tgz"; + sha256 = "sha256-BzaE3DSQUIygGwTFhV4Ez9eX/tM/bqam7cJt+8b2qp4="; + }; + }; +in + +stdenv.mkDerivation rec { + inherit pname version; + + src = srcs.${stdenv.hostPlatform.system}; + + setSourceRoot = '' + sourceRoot=$PWD + ''; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + install -D speedtest $out/bin/speedtest + install -D speedtest.5 $out/share/man/man5/speedtest.5 + ''; + + meta = with lib; { + description = "Command line internet speedtest tool by Ookla"; + homepage = "https://www.speedtest.net/apps/cli"; + license = licenses.unfree; + maintainers = with maintainers; [ kranzes ]; + platforms = lib.attrNames srcs; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index b195c655c93f..34d2c22fb242 100644 --- a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec { sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 306654f05d99..33eb33e10b06 100644 --- a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec { sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 0c0bc3705263..8d8069bec29e 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -17,15 +17,13 @@ stdenv.mkDerivation rec { pname = "gtk-gnutella"; - # NOTE: Please remove hardeningDisable on the next release, see: - # https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19 - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "gtk-gnutella"; repo = "gtk-gnutella"; rev = "v${version}"; - sha256 = "0j596dpajk68bkry0gmpqawsi61rphfciy4vji1dh890jyhkhdgy"; + sha256 = "sha256-Hk5KPXSJ2s0J/stW3Qgvu6p6RG5VCvuWx1UlMR+3JO4="; }; nativeBuildInputs = [ @@ -54,8 +52,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (!enableGui) [ "--topless" ] ; - hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; - enableParallelBuilding = true; postInstall = '' diff --git a/nixpkgs/pkgs/tools/networking/ppp/default.nix b/nixpkgs/pkgs/tools/networking/ppp/default.nix index 36d156a3994b..708932ac1c9d 100644 --- a/nixpkgs/pkgs/tools/networking/ppp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ppp/default.nix @@ -1,45 +1,37 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, substituteAll, libpcap, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, libpcap +, openssl +}: stdenv.mkDerivation rec { - version = "2.4.8"; + version = "2.4.9"; pname = "ppp"; src = fetchFromGitHub { - owner = "paulusmack"; - repo = "ppp"; - rev = "ppp-${version}"; - sha256 = "1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv"; + owner = "ppp-project"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-8+nbqRNfKPLDx+wmuKSkv+BSeG72hKJI4dNqypqeEK4="; }; - patches = - [ - ( substituteAll { - src = ./nix-purity.patch; - inherit libpcap; - glibc = stdenv.cc.libc.dev or stdenv.cc.libc; - openssl = openssl.dev; - }) - # Without nonpriv.patch, pppd --version doesn't work when not run as - # root. - ./nonpriv.patch - (fetchpatch { - name = "CVE-2015-3310.patch"; - url = "https://github.com/paulusmack/ppp/commit/858976b1fc3107f1261aae337831959b511b83c2.patch"; - sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4"; - }) - (fetchurl { - url = "https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch"; - sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; - }) - (fetchpatch { - name = "CVE-2020-8597.patch"; - url = "https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426.patch"; - sha256 = "129wnhwxmzvr3y9gzxv82jnb5y8m4yg8vkpa0xl2rwkl8anbzgkh"; - }) - ./musl-fix-headers.patch - ]; + patches = [ + (substituteAll { + src = ./nix-purity.patch; + glibc = stdenv.cc.libc.dev or stdenv.cc.libc; + openssl_dev = openssl.dev; + openssl_out = openssl.out; + }) + # Without nonpriv.patch, pppd --version doesn't work when not run as root. + ./nonpriv.patch + ]; - buildInputs = [ libpcap openssl ]; + buildInputs = [ + libpcap + openssl + ]; postPatch = '' # strip is not found when cross compiling with seemingly no way to point @@ -66,9 +58,14 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://ppp.samba.org/"; - description = "Point-to-point implementation for Linux and Solaris"; - license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ]; + homepage = "https://ppp.samba.org"; + description = "Point-to-point implementation to provide Internet connections over serial lines"; + license = with licenses; [ + bsdOriginal + publicDomain + gpl2 + lgpl2 + ]; platforms = platforms.linux; maintainers = [ ]; }; diff --git a/nixpkgs/pkgs/tools/networking/ppp/musl-fix-headers.patch b/nixpkgs/pkgs/tools/networking/ppp/musl-fix-headers.patch deleted file mode 100644 index d6252a52675b..000000000000 --- a/nixpkgs/pkgs/tools/networking/ppp/musl-fix-headers.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h -index b06eda5..dafa36c 100644 ---- a/include/net/ppp_defs.h -+++ b/include/net/ppp_defs.h -@@ -38,6 +38,8 @@ - #ifndef _PPP_DEFS_H_ - #define _PPP_DEFS_H_ - -+#include <sys/time.h> -+ - /* - * The basic PPP frame. - */ -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index a74c914..7acd2cf 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -126,7 +126,7 @@ LIBS += -lcrypt - endif - - ifdef USE_LIBUTIL --CFLAGS += -DHAVE_LOGWTMP=1 -+#CFLAGS += -DHAVE_LOGWTMP=1 - LIBS += -lutil - endif - -diff --git a/pppd/magic.h b/pppd/magic.h -index c81213b..305aece 100644 ---- a/pppd/magic.h -+++ b/pppd/magic.h -@@ -42,6 +42,8 @@ - * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ - */ - -+#include <sys/cdefs.h> -+ - void magic_init (void); /* Initialize the magic number generator */ - u_int32_t magic (void); /* Returns the next magic number */ - -diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c -index 91e9a57..9c0fac3 100644 ---- a/pppd/plugins/rp-pppoe/if.c -+++ b/pppd/plugins/rp-pppoe/if.c -@@ -30,10 +30,6 @@ static char const RCSID[] = - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif -diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c -index a8c2bb4..ca34d79 100644 ---- a/pppd/plugins/rp-pppoe/plugin.c -+++ b/pppd/plugins/rp-pppoe/plugin.c -@@ -46,7 +46,6 @@ static char const RCSID[] = - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> --#include <net/ethernet.h> - #include <net/if_arp.h> - #include <linux/ppp_defs.h> - #include <linux/if_pppox.h> -diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c -index 3d3bf4e..b5f82d3 100644 ---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -27,10 +27,6 @@ - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif -@@ -55,6 +51,8 @@ void die(int status) - exit(status); - } - -+#define error(x...) fprintf(stderr, x) -+ - /* Initialize frame types to RFC 2516 values. Some broken peers apparently - use different frame types... sigh... */ - -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index c4aaa6e..70aef85 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -88,18 +88,6 @@ typedef unsigned long UINT32_t; - #include <linux/if_ether.h> - #endif - --#ifdef HAVE_NETINET_IF_ETHER_H --#include <sys/types.h> -- --#ifdef HAVE_SYS_SOCKET_H --#include <sys/socket.h> --#endif --#ifndef HAVE_SYS_DLPI_H --#include <netinet/if_ether.h> --#endif --#endif -- -- - /* Ethernet frame types according to RFC 2516 */ - #define ETH_PPPOE_DISCOVERY 0x8863 - #define ETH_PPPOE_SESSION 0x8864 -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index 6d71530..86d224e 100644 ---- a/pppd/sys-linux.c -+++ b/pppd/sys-linux.c -@@ -102,19 +102,11 @@ - #define MAX_ADDR_LEN 7 - #endif - --#if !defined(__GLIBC__) || __GLIBC__ >= 2 - #include <asm/types.h> /* glibc 2 conflicts with linux/types.h */ - #include <net/if.h> - #include <net/if_arp.h> - #include <net/route.h> - #include <netinet/if_ether.h> --#else --#include <linux/types.h> --#include <linux/if.h> --#include <linux/if_arp.h> --#include <linux/route.h> --#include <linux/if_ether.h> --#endif - #include <netinet/in.h> - #include <arpa/inet.h> - diff --git a/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch b/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch index 975ea9db6096..c3363e0ccb64 100644 --- a/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch +++ b/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch @@ -1,31 +1,33 @@ diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 9664f70..d07e01e 100644 +index 22837c5..6f6fff5 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux -@@ -125,7 +125,7 @@ CFLAGS += -DHAS_SHADOW +@@ -111,8 +111,8 @@ endif + + # EAP SRP-SHA1 + ifdef USE_SRP +-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include +-LIBS += -lsrp -L/usr/local/ssl/lib ++CFLAGS += -DUSE_SRP -DOPENSSL -I@openssl_dev@/include/openssl ++LIBS += -lsrp -L@openssl_out@/lib + NEEDCRYPTOLIB = y + TARGETS += srp-entry + EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry +@@ -143,7 +143,7 @@ CFLAGS += -DHAS_SHADOW #LIBS += -lshadow $(LIBS) endif --ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),) +-ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) +ifneq ($(wildcard @glibc@/include/crypt.h),) CFLAGS += -DHAVE_CRYPT_H=1 - LIBS += -lcrypt + LIBS += -lcrypt endif -@@ -137,7 +137,7 @@ endif +@@ -155,7 +155,7 @@ endif ifdef NEEDDES ifndef USE_CRYPT -CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl -+CFLAGS += -I@openssl@/include/openssl - LIBS += -lcrypto ++CFLAGS += -I@openssl_dev@/include/openssl + NEEDCRYPTOLIB = y else CFLAGS += -DUSE_CRYPT=1 -@@ -188,7 +188,7 @@ LIBS += -ldl - endif - - ifdef FILTER --ifneq ($(wildcard /usr/include/pcap-bpf.h),) -+ifneq ($(wildcard @libpcap@/include/pcap-bpf.h),) - LIBS += -lpcap - CFLAGS += -DPPP_FILTER - endif diff --git a/nixpkgs/pkgs/tools/networking/siege/default.nix b/nixpkgs/pkgs/tools/networking/siege/default.nix index 3a7e64623afd..175595edafb8 100644 --- a/nixpkgs/pkgs/tools/networking/siege/default.nix +++ b/nixpkgs/pkgs/tools/networking/siege/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "siege"; - version = "4.0.9"; + version = "4.1.1"; src = fetchurl { url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; - sha256 = "0xzjfljhv9wcf58qw2c1sbpa5nqz1pb6rjpgvz7bxrv90n31bghx"; + sha256 = "1a74py0ib1gr3znv9ah5acw67ngl08b14dbc90ww9clvgdr2ag0l"; }; NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix b/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix index ebbaaa73fce1..ddccc9ac6358 100644 --- a/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.7.13"; + version = "3.8.2"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-nSajiRDpcFp3MwnQPnoBVB/OWnhVqkeSmS7OBrfhMnw="; + sha256 = "sha256-rkyAF1/kPI34nZ57Hqg8QivK0YERZ54jZ1HQ5oXYgxc="; meta = with lib; { description = "Unified hosts file with base extensions"; diff --git a/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/nixpkgs/pkgs/tools/networking/telepresence2/default.nix index 97c758e19b4d..54de621763c5 100644 --- a/nixpkgs/pkgs/tools/networking/telepresence2/default.nix +++ b/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.2.1"; + version = "2.3.6"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "0pr6vm68jr5ld7hy2b4dwmjziir59vg137c74rdn1wlhq3n8vr41"; + sha256 = "1bs4h450109vhy18kpyy6y4p5l9kvz4w09m56fxh5z547m5ax6k3"; }; - vendorSha256 = "0d0p879zchhrzrf6f5zc3vdcd5zi1ind7ibvb46y6wx6lp0f1nrp"; + vendorSha256 = "0xmw9mc0iy64kb12lsii4nn63ynh6gab9ls8z6mrizjjqz845sa5"; buildFlagsArray = '' -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} diff --git a/nixpkgs/pkgs/tools/networking/userhosts/default.nix b/nixpkgs/pkgs/tools/networking/userhosts/default.nix new file mode 100644 index 000000000000..6cec402638a1 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/userhosts/default.nix @@ -0,0 +1,23 @@ +{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: + +stdenv.mkDerivation rec { + pname = "userhosts"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "figiel"; + repo = "hosts"; + rev = "v${version}"; + hash = "sha256-9uF0fYl4Zz/Ia2UKx7CBi8ZU8jfWoBfy2QSgTSwXo5A"; + }; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A libc wrapper providing per-user hosts file"; + homepage = "https://github.com/figiel/hosts"; + maintainers = [ maintainers.bobvanderlinden ]; + license = licenses.cc0; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/vde2/default.nix b/nixpkgs/pkgs/tools/networking/vde2/default.nix index bc3be9122652..58fae3f9f157 100644 --- a/nixpkgs/pkgs/tools/networking/vde2/default.nix +++ b/nixpkgs/pkgs/tools/networking/vde2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Fix build with openssl 1.1.0 (fetchpatch { name = "vde_cryptcab-compile-against-openssl-1.1.0.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b11be49997fa94b603e366064690b7cc6bce61/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch"; sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi"; }) ] ++ lib.optional stdenv.hostPlatform.isMusl [ diff --git a/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix b/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix index 734c6d9f4ec8..776e8450d13c 100644 --- a/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , makeWrapper -, nettools, gawk, systemd, openresolv, coreutils, gnugrep +, nettools, gawk, systemd, openresolv, coreutils, gnugrep, iproute2 }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl" '' + '' wrapProgram $out/bin/vpnc-script \ - --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv ])}" + --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv iproute2 ])}" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/wavemon/default.nix b/nixpkgs/pkgs/tools/networking/wavemon/default.nix index 19bfd6ae4547..c54c4f8691ad 100644 --- a/nixpkgs/pkgs/tools/networking/wavemon/default.nix +++ b/nixpkgs/pkgs/tools/networking/wavemon/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; description = "Ncurses-based monitoring application for wireless network devices"; homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/networking/zssh/default.nix b/nixpkgs/pkgs/tools/networking/zssh/default.nix index 07b7a8441b8e..d512b03dbea5 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://raw.githubusercontent.com/archlinux/svntogit-community/0a7c92543f9309856d02e31196f06d7c3eaa8b67/trunk/fix_use_ptmx_on_arch.patch"; sha256 = "12daw9wpy58ql882zww945wk9cg2adwp8qsr5rvazx0xq0qawgbr"; }) ]; diff --git a/nixpkgs/pkgs/tools/nix/nar-serve/default.nix b/nixpkgs/pkgs/tools/nix/nar-serve/default.nix index 146165d880de..1d7fd6beb4a7 100644 --- a/nixpkgs/pkgs/tools/nix/nar-serve/default.nix +++ b/nixpkgs/pkgs/tools/nix/nar-serve/default.nix @@ -1,24 +1,19 @@ { buildGoModule , fetchFromGitHub , lib - }: -let - pname = "nar-serve"; - version = "0.3.0"; - -in buildGoModule rec { - inherit pname version; + pname = "nar-serve"; + version = "0.4.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nar-serve"; rev = "v${version}"; - sha256 = "000xxrar5ngrqqfi7ynx84i6wi27mirgm26brhyg0y4pygc9ykhz"; + hash = "sha256-h/pzKRXgcGTpr1YUKppDa+iTLKak/PGhbYa8ZczWj1U="; }; - vendorSha256 = "0qkzbr85wkx3r7qgnzg9pdl7vsli10bzcdbj2gqd1kdzwb8khszs"; + vendorSha256 = "sha256-eW+cul/5qJocpKV/6azxj7HTmkezDw6dNubPtAOP5HU="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/nix/nix-script/default.nix b/nixpkgs/pkgs/tools/nix/nix-script/default.nix index a755d933219e..f9077ef13871 100644 --- a/nixpkgs/pkgs/tools/nix/nix-script/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-script/default.nix @@ -15,13 +15,20 @@ stdenv.mkDerivation { (haskellPackages.ghcWithPackages (hs: with hs; [ posix-escape ])) ]; - phases = [ "buildPhase" "installPhase" "fixupPhase" ]; buildPhase = '' + runHook preBuild + mkdir -p $out/bin ghc -O2 $src/nix-script.hs -o $out/bin/nix-script -odir . -hidir . + + runHook postBuild ''; installPhase = '' + runHook preInstall + ln -s $out/bin/nix-script $out/bin/nix-scripti + + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/nix/nixos-option/CMakeLists.txt b/nixpkgs/pkgs/tools/nix/nixos-option/CMakeLists.txt new file mode 100644 index 000000000000..e5834598c4fd --- /dev/null +++ b/nixpkgs/pkgs/tools/nix/nixos-option/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required (VERSION 2.6) +project (nixos-option) + +add_executable(nixos-option nixos-option.cc libnix-copy-paste.cc) +target_link_libraries(nixos-option PRIVATE -lnixmain -lnixexpr -lnixstore -lnixutil) +target_compile_features(nixos-option PRIVATE cxx_std_17) + +install (TARGETS nixos-option DESTINATION bin) diff --git a/nixpkgs/pkgs/tools/nix/nixos-option/default.nix b/nixpkgs/pkgs/tools/nix/nixos-option/default.nix new file mode 100644 index 000000000000..216e2678e2e2 --- /dev/null +++ b/nixpkgs/pkgs/tools/nix/nixos-option/default.nix @@ -0,0 +1,12 @@ +{lib, stdenv, boost, cmake, pkg-config, nix, ... }: + +stdenv.mkDerivation rec { + name = "nixos-option"; + src = ./.; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost nix ]; + meta = with lib; { + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ chkno ]; + }; +} diff --git a/nixpkgs/pkgs/tools/nix/nixos-option/libnix-copy-paste.cc b/nixpkgs/pkgs/tools/nix/nixos-option/libnix-copy-paste.cc new file mode 100644 index 000000000000..875c07da6399 --- /dev/null +++ b/nixpkgs/pkgs/tools/nix/nixos-option/libnix-copy-paste.cc @@ -0,0 +1,83 @@ +// These are useful methods inside the nix library that ought to be exported. +// Since they are not, copy/paste them here. +// TODO: Delete these and use the ones in the library as they become available. + +#include <nix/config.h> // for nix/globals.hh's reference to SYSTEM + +#include "libnix-copy-paste.hh" +#include <boost/format/alt_sstream.hpp> // for basic_altstringbuf... +#include <boost/format/alt_sstream_impl.hpp> // for basic_altstringbuf... +#include <boost/format/format_class.hpp> // for basic_format +#include <boost/format/format_fwd.hpp> // for format +#include <boost/format/format_implementation.hpp> // for basic_format::basi... +#include <boost/optional/optional.hpp> // for get_pointer +#include <iostream> // for operator<<, basic_... +#include <nix/types.hh> // for Strings, Error +#include <string> // for string, basic_string + +using boost::format; +using nix::Error; +using nix::Strings; +using std::string; + +// From nix/src/libexpr/attr-path.cc +Strings parseAttrPath(const string & s) +{ + Strings res; + string cur; + string::const_iterator i = s.begin(); + while (i != s.end()) { + if (*i == '.') { + res.push_back(cur); + cur.clear(); + } else if (*i == '"') { + ++i; + while (1) { + if (i == s.end()) + throw Error(format("missing closing quote in selection path '%1%'") % s); + if (*i == '"') + break; + cur.push_back(*i++); + } + } else + cur.push_back(*i); + ++i; + } + if (!cur.empty()) + res.push_back(cur); + return res; +} + +// From nix/src/nix/repl.cc +bool isVarName(const string & s) +{ + if (s.size() == 0) + return false; + char c = s[0]; + if ((c >= '0' && c <= '9') || c == '-' || c == '\'') + return false; + for (auto & i : s) + if (!((i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z') || (i >= '0' && i <= '9') || i == '_' || i == '-' || + i == '\'')) + return false; + return true; +} + +// From nix/src/nix/repl.cc +std::ostream & printStringValue(std::ostream & str, const char * string) +{ + str << "\""; + for (const char * i = string; *i; i++) + if (*i == '\"' || *i == '\\') + str << "\\" << *i; + else if (*i == '\n') + str << "\\n"; + else if (*i == '\r') + str << "\\r"; + else if (*i == '\t') + str << "\\t"; + else + str << *i; + str << "\""; + return str; +} diff --git a/nixpkgs/pkgs/tools/nix/nixos-option/libnix-copy-paste.hh b/nixpkgs/pkgs/tools/nix/nixos-option/libnix-copy-paste.hh new file mode 100644 index 000000000000..2274e9a0f853 --- /dev/null +++ b/nixpkgs/pkgs/tools/nix/nixos-option/libnix-copy-paste.hh @@ -0,0 +1,9 @@ +#pragma once + +#include <iostream> +#include <nix/types.hh> +#include <string> + +nix::Strings parseAttrPath(const std::string & s); +bool isVarName(const std::string & s); +std::ostream & printStringValue(std::ostream & str, const char * string); diff --git a/nixpkgs/pkgs/tools/nix/nixos-option/nixos-option.cc b/nixpkgs/pkgs/tools/nix/nixos-option/nixos-option.cc new file mode 100644 index 000000000000..f779d82edbd6 --- /dev/null +++ b/nixpkgs/pkgs/tools/nix/nixos-option/nixos-option.cc @@ -0,0 +1,643 @@ +#include <nix/config.h> // for nix/globals.hh's reference to SYSTEM + +#include <exception> // for exception_ptr, current_exception +#include <functional> // for function +#include <iostream> // for operator<<, basic_ostream, ostrin... +#include <iterator> // for next +#include <list> // for _List_iterator +#include <memory> // for allocator, unique_ptr, make_unique +#include <new> // for operator new +#include <nix/args.hh> // for argvToStrings, UsageError +#include <nix/attr-path.hh> // for findAlongAttrPath +#include <nix/attr-set.hh> // for Attr, Bindings, Bindings::iterator +#include <nix/common-eval-args.hh> // for MixEvalArgs +#include <nix/eval-inline.hh> // for EvalState::forceValue +#include <nix/eval.hh> // for EvalState, initGC, operator<< +#include <nix/globals.hh> // for initPlugins, Settings, settings +#include <nix/nixexpr.hh> // for Pos +#include <nix/shared.hh> // for getArg, LegacyArgs, printVersion +#include <nix/store-api.hh> // for openStore +#include <nix/symbol-table.hh> // for Symbol, SymbolTable +#include <nix/types.hh> // for Error, Path, Strings, PathSet +#include <nix/util.hh> // for absPath, baseNameOf +#include <nix/value.hh> // for Value, Value::(anonymous), Value:... +#include <string> // for string, operator+, operator== +#include <utility> // for move +#include <variant> // for get, holds_alternative, variant +#include <vector> // for vector<>::iterator, vector + +#include "libnix-copy-paste.hh" + +using nix::absPath; +using nix::Bindings; +using nix::Error; +using nix::EvalError; +using nix::EvalState; +using nix::Path; +using nix::PathSet; +using nix::Strings; +using nix::Symbol; +using nix::tAttrs; +using nix::ThrownError; +using nix::tLambda; +using nix::tString; +using nix::UsageError; +using nix::Value; + +// An ostream wrapper to handle nested indentation +class Out +{ + public: + class Separator + {}; + const static Separator sep; + enum LinePolicy + { + ONE_LINE, + MULTI_LINE + }; + explicit Out(std::ostream & ostream) : ostream(ostream), policy(ONE_LINE), writeSinceSep(true) {} + Out(Out & o, const std::string & start, const std::string & end, LinePolicy policy); + Out(Out & o, const std::string & start, const std::string & end, int count) + : Out(o, start, end, count < 2 ? ONE_LINE : MULTI_LINE) + {} + Out(const Out &) = delete; + Out(Out &&) = default; + Out & operator=(const Out &) = delete; + Out & operator=(Out &&) = delete; + ~Out() { ostream << end; } + + private: + std::ostream & ostream; + std::string indentation; + std::string end; + LinePolicy policy; + bool writeSinceSep; + template <typename T> friend Out & operator<<(Out & o, T thing); +}; + +template <typename T> Out & operator<<(Out & o, T thing) +{ + if (!o.writeSinceSep && o.policy == Out::MULTI_LINE) { + o.ostream << o.indentation; + } + o.writeSinceSep = true; + o.ostream << thing; + return o; +} + +template <> Out & operator<<<Out::Separator>(Out & o, Out::Separator /* thing */) +{ + o.ostream << (o.policy == Out::ONE_LINE ? " " : "\n"); + o.writeSinceSep = false; + return o; +} + +Out::Out(Out & o, const std::string & start, const std::string & end, LinePolicy policy) + : ostream(o.ostream), indentation(policy == ONE_LINE ? o.indentation : o.indentation + " "), + end(policy == ONE_LINE ? end : o.indentation + end), policy(policy), writeSinceSep(true) +{ + o << start; + *this << Out::sep; +} + +// Stuff needed for evaluation +struct Context +{ + Context(EvalState & state, Bindings & autoArgs, Value optionsRoot, Value configRoot) + : state(state), autoArgs(autoArgs), optionsRoot(optionsRoot), configRoot(configRoot), + underscoreType(state.symbols.create("_type")) + {} + EvalState & state; + Bindings & autoArgs; + Value optionsRoot; + Value configRoot; + Symbol underscoreType; +}; + +Value evaluateValue(Context & ctx, Value & v) +{ + ctx.state.forceValue(v); + if (ctx.autoArgs.empty()) { + return v; + } + Value called{}; + ctx.state.autoCallFunction(ctx.autoArgs, v, called); + return called; +} + +bool isOption(Context & ctx, const Value & v) +{ + if (v.type != tAttrs) { + return false; + } + const auto & actualType = v.attrs->find(ctx.underscoreType); + if (actualType == v.attrs->end()) { + return false; + } + try { + Value evaluatedType = evaluateValue(ctx, *actualType->value); + if (evaluatedType.type != tString) { + return false; + } + return static_cast<std::string>(evaluatedType.string.s) == "option"; + } catch (Error &) { + return false; + } +} + +// Add quotes to a component of a path. +// These are needed for paths like: +// fileSystems."/".fsType +// systemd.units."dbus.service".text +std::string quoteAttribute(const std::string & attribute) +{ + if (isVarName(attribute)) { + return attribute; + } + std::ostringstream buf; + printStringValue(buf, attribute.c_str()); + return buf.str(); +} + +const std::string appendPath(const std::string & prefix, const std::string & suffix) +{ + if (prefix.empty()) { + return quoteAttribute(suffix); + } + return prefix + "." + quoteAttribute(suffix); +} + +bool forbiddenRecursionName(std::string name) { return (!name.empty() && name[0] == '_') || name == "haskellPackages"; } + +void recurse(const std::function<bool(const std::string & path, std::variant<Value, std::exception_ptr>)> & f, + Context & ctx, Value v, const std::string & path) +{ + std::variant<Value, std::exception_ptr> evaluated; + try { + evaluated = evaluateValue(ctx, v); + } catch (Error &) { + evaluated = std::current_exception(); + } + if (!f(path, evaluated)) { + return; + } + if (std::holds_alternative<std::exception_ptr>(evaluated)) { + return; + } + const Value & evaluated_value = std::get<Value>(evaluated); + if (evaluated_value.type != tAttrs) { + return; + } + for (const auto & child : evaluated_value.attrs->lexicographicOrder()) { + if (forbiddenRecursionName(child->name)) { + continue; + } + recurse(f, ctx, *child->value, appendPath(path, child->name)); + } +} + +bool optionTypeIs(Context & ctx, Value & v, const std::string & soughtType) +{ + try { + const auto & typeLookup = v.attrs->find(ctx.state.sType); + if (typeLookup == v.attrs->end()) { + return false; + } + Value type = evaluateValue(ctx, *typeLookup->value); + if (type.type != tAttrs) { + return false; + } + const auto & nameLookup = type.attrs->find(ctx.state.sName); + if (nameLookup == type.attrs->end()) { + return false; + } + Value name = evaluateValue(ctx, *nameLookup->value); + if (name.type != tString) { + return false; + } + return name.string.s == soughtType; + } catch (Error &) { + return false; + } +} + +bool isAggregateOptionType(Context & ctx, Value & v) +{ + return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf"); +} + +MakeError(OptionPathError, EvalError); + +Value getSubOptions(Context & ctx, Value & option) +{ + Value getSubOptions = evaluateValue(ctx, *findAlongAttrPath(ctx.state, "type.getSubOptions", ctx.autoArgs, option)); + if (getSubOptions.type != tLambda) { + throw OptionPathError("Option's type.getSubOptions isn't a function"); + } + Value emptyString{}; + nix::mkString(emptyString, ""); + Value v; + ctx.state.callFunction(getSubOptions, emptyString, v, nix::Pos{}); + return v; +} + +// Carefully walk an option path, looking for sub-options when a path walks past +// an option value. +struct FindAlongOptionPathRet +{ + Value option; + std::string path; +}; +FindAlongOptionPathRet findAlongOptionPath(Context & ctx, const std::string & path) +{ + Strings tokens = parseAttrPath(path); + Value v = ctx.optionsRoot; + std::string processedPath; + for (auto i = tokens.begin(); i != tokens.end(); i++) { + const auto & attr = *i; + try { + bool lastAttribute = std::next(i) == tokens.end(); + v = evaluateValue(ctx, v); + if (attr.empty()) { + throw OptionPathError("empty attribute name"); + } + if (isOption(ctx, v) && optionTypeIs(ctx, v, "submodule")) { + v = getSubOptions(ctx, v); + } + if (isOption(ctx, v) && isAggregateOptionType(ctx, v)) { + auto subOptions = getSubOptions(ctx, v); + if (lastAttribute && subOptions.attrs->empty()) { + break; + } + v = subOptions; + // Note that we've consumed attr, but didn't actually use it. This is the path component that's looked + // up in the list or attribute set that doesn't name an option -- the "root" in "users.users.root.name". + } else if (v.type != tAttrs) { + throw OptionPathError("Value is %s while a set was expected", showType(v)); + } else { + const auto & next = v.attrs->find(ctx.state.symbols.create(attr)); + if (next == v.attrs->end()) { + throw OptionPathError("Attribute not found", attr, path); + } + v = *next->value; + } + processedPath = appendPath(processedPath, attr); + } catch (OptionPathError & e) { + throw OptionPathError("At '%s' in path '%s': %s", attr, path, e.msg()); + } + } + return {v, processedPath}; +} + +// Calls f on all the option names at or below the option described by `path`. +// Note that "the option described by `path`" is not trivial -- if path describes a value inside an aggregate +// option (such as users.users.root), the *option* described by that path is one path component shorter +// (eg: users.users), which results in f being called on sibling-paths (eg: users.users.nixbld1). If f +// doesn't want these, it must do its own filtering. +void mapOptions(const std::function<void(const std::string & path)> & f, Context & ctx, const std::string & path) +{ + auto root = findAlongOptionPath(ctx, path); + recurse( + [f, &ctx](const std::string & path, std::variant<Value, std::exception_ptr> v) { + bool isOpt = std::holds_alternative<std::exception_ptr>(v) || isOption(ctx, std::get<Value>(v)); + if (isOpt) { + f(path); + } + return !isOpt; + }, + ctx, root.option, root.path); +} + +// Calls f on all the config values inside one option. +// Simple options have one config value inside, like sound.enable = true. +// Compound options have multiple config values. For example, the option +// "users.users" has about 1000 config values inside it: +// users.users.avahi.createHome = false; +// users.users.avahi.cryptHomeLuks = null; +// users.users.avahi.description = "`avahi-daemon' privilege separation user"; +// ... +// users.users.avahi.openssh.authorizedKeys.keyFiles = [ ]; +// users.users.avahi.openssh.authorizedKeys.keys = [ ]; +// ... +// users.users.avahi.uid = 10; +// users.users.avahi.useDefaultShell = false; +// users.users.cups.createHome = false; +// ... +// users.users.cups.useDefaultShell = false; +// users.users.gdm = ... ... ... +// users.users.messagebus = ... .. ... +// users.users.nixbld1 = ... .. ... +// ... +// users.users.systemd-timesync = ... .. ... +void mapConfigValuesInOption( + const std::function<void(const std::string & path, std::variant<Value, std::exception_ptr> v)> & f, + const std::string & path, Context & ctx) +{ + Value * option; + try { + option = findAlongAttrPath(ctx.state, path, ctx.autoArgs, ctx.configRoot); + } catch (Error &) { + f(path, std::current_exception()); + return; + } + recurse( + [f, ctx](const std::string & path, std::variant<Value, std::exception_ptr> v) { + bool leaf = std::holds_alternative<std::exception_ptr>(v) || std::get<Value>(v).type != tAttrs || + ctx.state.isDerivation(std::get<Value>(v)); + if (!leaf) { + return true; // Keep digging + } + f(path, v); + return false; + }, + ctx, *option, path); +} + +std::string describeError(const Error & e) { return "«error: " + e.msg() + "»"; } + +void describeDerivation(Context & ctx, Out & out, Value v) +{ + // Copy-pasted from nix/src/nix/repl.cc :( + Bindings::iterator i = v.attrs->find(ctx.state.sDrvPath); + PathSet pathset; + try { + Path drvPath = i != v.attrs->end() ? ctx.state.coerceToPath(*i->pos, *i->value, pathset) : "???"; + out << "«derivation " << drvPath << "»"; + } catch (Error & e) { + out << describeError(e); + } +} + +Value parseAndEval(EvalState & state, const std::string & expression, const std::string & path) +{ + Value v{}; + state.eval(state.parseExprFromString(expression, absPath(path)), v); + return v; +} + +void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr> maybeValue, const std::string & path); + +void printList(Context & ctx, Out & out, Value & v) +{ + Out listOut(out, "[", "]", v.listSize()); + for (unsigned int n = 0; n < v.listSize(); ++n) { + printValue(ctx, listOut, *v.listElems()[n], ""); + listOut << Out::sep; + } +} + +void printAttrs(Context & ctx, Out & out, Value & v, const std::string & path) +{ + Out attrsOut(out, "{", "}", v.attrs->size()); + for (const auto & a : v.attrs->lexicographicOrder()) { + std::string name = a->name; + if (!forbiddenRecursionName(name)) { + attrsOut << name << " = "; + printValue(ctx, attrsOut, *a->value, appendPath(path, name)); + attrsOut << ";" << Out::sep; + } + } +} + +void multiLineStringEscape(Out & out, const std::string & s) +{ + int i; + for (i = 1; i < s.size(); i++) { + if (s[i - 1] == '$' && s[i] == '{') { + out << "''${"; + i++; + } else if (s[i - 1] == '\'' && s[i] == '\'') { + out << "'''"; + i++; + } else { + out << s[i - 1]; + } + } + if (i == s.size()) { + out << s[i - 1]; + } +} + +void printMultiLineString(Out & out, const Value & v) +{ + std::string s = v.string.s; + Out strOut(out, "''", "''", Out::MULTI_LINE); + std::string::size_type begin = 0; + while (begin < s.size()) { + std::string::size_type end = s.find('\n', begin); + if (end == std::string::npos) { + multiLineStringEscape(strOut, s.substr(begin, s.size() - begin)); + break; + } + multiLineStringEscape(strOut, s.substr(begin, end - begin)); + strOut << Out::sep; + begin = end + 1; + } +} + +void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr> maybeValue, const std::string & path) +{ + try { + if (auto ex = std::get_if<std::exception_ptr>(&maybeValue)) { + std::rethrow_exception(*ex); + } + Value v = evaluateValue(ctx, std::get<Value>(maybeValue)); + if (ctx.state.isDerivation(v)) { + describeDerivation(ctx, out, v); + } else if (v.isList()) { + printList(ctx, out, v); + } else if (v.type == tAttrs) { + printAttrs(ctx, out, v, path); + } else if (v.type == tString && std::string(v.string.s).find('\n') != std::string::npos) { + printMultiLineString(out, v); + } else { + ctx.state.forceValueDeep(v); + out << v; + } + } catch (ThrownError & e) { + if (e.msg() == "The option `" + path + "' is used but not defined.") { + // 93% of errors are this, and just letting this message through would be + // misleading. These values may or may not actually be "used" in the + // config. The thing throwing the error message assumes that if anything + // ever looks at this value, it is a "use" of this value. But here in + // nixos-option, we are looking at this value only to print it. + // In order to avoid implying that this undefined value is actually + // referenced, eat the underlying error message and emit "«not defined»". + out << "«not defined»"; + } else { + out << describeError(e); + } + } catch (Error & e) { + out << describeError(e); + } +} + +void printConfigValue(Context & ctx, Out & out, const std::string & path, std::variant<Value, std::exception_ptr> v) +{ + out << path << " = "; + printValue(ctx, out, std::move(v), path); + out << ";\n"; +} + +// Replace with std::starts_with when C++20 is available +bool starts_with(const std::string & s, const std::string & prefix) +{ + return s.size() >= prefix.size() && + std::equal(s.begin(), std::next(s.begin(), prefix.size()), prefix.begin(), prefix.end()); +} + +void printRecursive(Context & ctx, Out & out, const std::string & path) +{ + mapOptions( + [&ctx, &out, &path](const std::string & optionPath) { + mapConfigValuesInOption( + [&ctx, &out, &path](const std::string & configPath, std::variant<Value, std::exception_ptr> v) { + if (starts_with(configPath, path)) { + printConfigValue(ctx, out, configPath, v); + } + }, + optionPath, ctx); + }, + ctx, path); +} + +void printAttr(Context & ctx, Out & out, const std::string & path, Value & root) +{ + try { + printValue(ctx, out, *findAlongAttrPath(ctx.state, path, ctx.autoArgs, root), path); + } catch (Error & e) { + out << describeError(e); + } +} + +bool hasExample(Context & ctx, Value & option) +{ + try { + findAlongAttrPath(ctx.state, "example", ctx.autoArgs, option); + return true; + } catch (Error &) { + return false; + } +} + +void printOption(Context & ctx, Out & out, const std::string & path, Value & option) +{ + out << "Value:\n"; + printAttr(ctx, out, path, ctx.configRoot); + + out << "\n\nDefault:\n"; + printAttr(ctx, out, "default", option); + + out << "\n\nType:\n"; + printAttr(ctx, out, "type.description", option); + + if (hasExample(ctx, option)) { + out << "\n\nExample:\n"; + printAttr(ctx, out, "example", option); + } + + out << "\n\nDescription:\n"; + printAttr(ctx, out, "description", option); + + out << "\n\nDeclared by:\n"; + printAttr(ctx, out, "declarations", option); + + out << "\n\nDefined by:\n"; + printAttr(ctx, out, "files", option); + out << "\n"; +} + +void printListing(Out & out, Value & v) +{ + out << "This attribute set contains:\n"; + for (const auto & a : v.attrs->lexicographicOrder()) { + std::string name = a->name; + if (!name.empty() && name[0] != '_') { + out << name << "\n"; + } + } +} + +void printOne(Context & ctx, Out & out, const std::string & path) +{ + try { + auto result = findAlongOptionPath(ctx, path); + Value & option = result.option; + option = evaluateValue(ctx, option); + if (path != result.path) { + out << "Note: showing " << result.path << " instead of " << path << "\n"; + } + if (isOption(ctx, option)) { + printOption(ctx, out, result.path, option); + } else { + printListing(out, option); + } + } catch (Error & e) { + std::cerr << "error: " << e.msg() + << "\nAn error occurred while looking for attribute names. Are " + "you sure that '" + << path << "' exists?\n"; + } +} + +int main(int argc, char ** argv) +{ + bool recursive = false; + std::string path = "."; + std::string optionsExpr = "(import <nixpkgs/nixos> {}).options"; + std::string configExpr = "(import <nixpkgs/nixos> {}).config"; + std::vector<std::string> args; + + struct MyArgs : nix::LegacyArgs, nix::MixEvalArgs + { + using nix::LegacyArgs::LegacyArgs; + }; + + MyArgs myArgs(nix::baseNameOf(argv[0]), [&](Strings::iterator & arg, const Strings::iterator & end) { + if (*arg == "--help") { + nix::showManPage("nixos-option"); + } else if (*arg == "--version") { + nix::printVersion("nixos-option"); + } else if (*arg == "-r" || *arg == "--recursive") { + recursive = true; + } else if (*arg == "--path") { + path = nix::getArg(*arg, arg, end); + } else if (*arg == "--options_expr") { + optionsExpr = nix::getArg(*arg, arg, end); + } else if (*arg == "--config_expr") { + configExpr = nix::getArg(*arg, arg, end); + } else if (!arg->empty() && arg->at(0) == '-') { + return false; + } else { + args.push_back(*arg); + } + return true; + }); + + myArgs.parseCmdline(nix::argvToStrings(argc, argv)); + + nix::initPlugins(); + nix::initGC(); + nix::settings.readOnlyMode = true; + auto store = nix::openStore(); + auto state = std::make_unique<EvalState>(myArgs.searchPath, store); + + Value optionsRoot = parseAndEval(*state, optionsExpr, path); + Value configRoot = parseAndEval(*state, configExpr, path); + + Context ctx{*state, *myArgs.getAutoArgs(*state), optionsRoot, configRoot}; + Out out(std::cout); + + auto print = recursive ? printRecursive : printOne; + if (args.empty()) { + print(ctx, out, ""); + } + for (const auto & arg : args) { + print(ctx, out, arg); + } + + ctx.state.printStats(); + + return 0; +} diff --git a/nixpkgs/pkgs/tools/package-management/micromamba/default.nix b/nixpkgs/pkgs/tools/package-management/micromamba/default.nix new file mode 100644 index 000000000000..a7e563ce67e5 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/micromamba/default.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchFromGitHub, cmake +, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc +}: + +let + libsolv' = libsolv.overrideAttrs (oldAttrs: { + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DENABLE_CONDA=true" # Maybe enable this in the original libsolv package? No idea about the implications. + ]; + }); +in +stdenv.mkDerivation rec { + pname = "micromamba"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "mamba-org"; + repo = "mamba"; + rev = version; + sha256 = "0a5kmwk44ll4d8b2akjc0vm6ap9jfxclcw4fclvjxr2in3am9256"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + cli11 + nlohmann_json + curl + libarchive + libyamlcpp + libsolv' + reproc + # python3Packages.pybind11 # Would be necessary if someone wants to build with bindings I guess. + ]; + + cmakeFlags = [ + "-DBUILD_BINDINGS=OFF" # Fails to build, I don't think it's necessary for now. + "-DBUILD_EXE=ON" + ]; + + CXXFLAGS = "-DMAMBA_USE_STD_FS"; + + meta = with lib; { + description = "Reimplementation of the conda package manager"; + homepage = "https://github.com/mamba-org/mamba"; + license = licenses.bsd3; + maintainers = with maintainers; [ mausch ]; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix b/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix index af83d04e8110..e12bed7d925c 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "1s0nlbn5fcgqfns8gpx3i87k5qivd8ar59rklvd7fbn6ckrmzi6m"; + sha256 = "0yx5y90shdjwihbjrvv2m3bycgpdalafc9q4acfczfaymag8ggad"; }; doCheck = true; @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "0xmw3fyic0fcg7a6z8dr3lv367bxqdhdrlrl2hhlz59xg5kq8b3f"; + cargoSha256 = "11bcn111j4iqwqwpp26w7rnycasbhiixaqb1rq4ry2402hvl90j7"; meta = with lib; { description = "An interactive Nix documentation tool"; longDescription = "An interactive Nix documentation tool providing a CLI for function search, a Nix plugin for docs in the REPL, and a ctags implementation for Nix script"; homepage = "https://github.com/lf-/nix-doc"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = [ maintainers.lf- ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix b/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix index b9ae0b5b4b0b..5936429c7a45 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,33 +1,22 @@ { lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk -, gnugrep, gnused, jq, nix, fetchpatch }: +, gnugrep, gnused, jq, nix }: -let - binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "nix-prefetch"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "msteen"; repo = "nix-prefetch"; rev = version; - sha256 = "11792677zyi06jw641xi9aywwgh9002b8406w6qids212c14va6n"; + sha256 = "0bwv6x651gyq703pywrhb7lfby6xwnd1iwnrzzjihipn7x3v2hz9"; # the stat call has to be in a subshell or we get the current date extraPostFetch = '' echo $(stat -c %Y $out) > $out/.timestamp ''; }; - patches = [ - # Fix input_type regex for macOS systems: https://github.com/msteen/nix-prefetch/pull/24 - (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/08282891bdb108e886eaf39be2030ba1feda1cb1.patch"; - sha256 = "1v6ask54ind6f3784pbncv0dfg6draaaicg0q46jfvp0lafms70x"; - }) - ]; - postPatch = '' lib=$out/lib/${pname} @@ -63,7 +52,7 @@ in stdenv.mkDerivation rec { install -Dm555 -t $lib src/*.sh install -Dm444 -t $lib lib/* makeWrapper $lib/main.sh $out/bin/${pname} \ - --prefix PATH : ${binPath} + --prefix PATH : ${lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]} installManPage doc/nix-prefetch.? @@ -77,6 +66,7 @@ in stdenv.mkDerivation rec { description = "Prefetch any fetcher function call, e.g. package sources"; license = licenses.mit; maintainers = with maintainers; [ msteen ]; - inherit (src.meta) homepage; + homepage = "https://github.com/msteen/nix-prefetch"; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix b/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix index f85adee4917f..a1edfdd1367f 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, - bzip2, nix, perl, makeWrapper, +{ lib +, stdenv +, fetchFromGitHub +, bzip2 +, nix +, perl +, makeWrapper +, nixosTests }: with lib; @@ -30,6 +36,8 @@ stdenv.mkDerivation { --add-flags $out/libexec/nix-serve/nix-serve.psgi ''; + passthru.tests.nix-serve = nixosTests.nix-serve; + meta = { homepage = "https://github.com/edolstra/nix-serve"; description = "A utility for sharing a Nix store as a binary cache"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-template/default.nix b/nixpkgs/pkgs/tools/package-management/nix-template/default.nix index 0345830fb9dd..13c254cbee29 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-template/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-template/default.nix @@ -1,17 +1,45 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub +, installShellFiles +, makeWrapper +, nix +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "nix-template"; - version = "0.1.0"; + version = "0.1.4"; src = fetchFromGitHub { + name = "${pname}-${version}-src"; owner = "jonringer"; repo = pname; rev = "v${version}"; - sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig"; + sha256 = "sha256-kNFhSfHUYBUOCXoD6m7thMho4tOIpRHfHGcsW8FTgkc="; }; - cargoSha256 = "0hp31b5q4s6grkha2jz55945cbjkqdpvx1l8m49zv5prczhd7mz5"; + cargoSha256 = "sha256-7PthFLCEt+E/Gx5//aulHYYBKZqapNEWKtKfRlDr3Pw="; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; + + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin Security; + + # needed for nix-prefetch-url + postInstall = '' + wrapProgram $out/bin/nix-template \ + --prefix PATH : ${lib.makeBinPath [ nix ]} + + installShellCompletion --cmd nix-template \ + --bash <($out/bin/nix-template completions bash) \ + --fish <($out/bin/nix-template completions fish) \ + --zsh <($out/bin/nix-template completions zsh) + ''; meta = with lib; { description = "Make creating nix expressions easy"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-top/default.nix b/nixpkgs/pkgs/tools/package-management/nix-top/default.nix index da64ec138a60..eedd4f97db61 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-top/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-top/default.nix @@ -48,6 +48,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux ++ platforms.darwin; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index 6ba5135fdd6c..e60cf5804261 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -193,38 +193,57 @@ common = preBuild = "unset NIX_INDENT_MAKE"; }); + inherit boehmgc; }; }; in nix; + boehmgc_nix = boehmgc.override { + enableLargeConfig = true; + }; + + boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: { + patches = (drv.patches or []) ++ [ + # Part of the GC solution in https://github.com/NixOS/nix/pull/4944 + (fetchpatch { + url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff; + sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI="; + }) + ]; + }); + in rec { nix = nixStable; nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.12"; + version = "2.3.14"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ITp9ScRhB5syNh5NAI0kjX9o400syTR/Oo/5Ap+a+10="; + sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nix; + + inherit storeDir stateDir confDir; }); nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210601_5985b8b"; + suffix = "pre20210707_02dd6bb"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d"; - sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc="; + rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2"; + sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nixUnstable; + + inherit storeDir stateDir confDir; }); diff --git a/nixpkgs/pkgs/tools/package-management/nixops/default.nix b/nixpkgs/pkgs/tools/package-management/nixops/default.nix index 16ecc7f11de8..5b4729e2abd7 100644 --- a/nixpkgs/pkgs/tools/package-management/nixops/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixops/default.nix @@ -2,12 +2,9 @@ , fetchurl, fetchpatch }: -let - version = "1.7"; - -in python2Packages.buildPythonApplication { +python2Packages.buildPythonApplication rec { pname = "nixops"; - inherit version; + version = "1.7"; src = fetchurl { url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/security/aws-okta/default.nix b/nixpkgs/pkgs/tools/security/aws-okta/default.nix index 08508dd157a0..363abbd39507 100644 --- a/nixpkgs/pkgs/tools/security/aws-okta/default.nix +++ b/nixpkgs/pkgs/tools/security/aws-okta/default.nix @@ -21,7 +21,6 @@ buildGoPackage rec { buildInputs = [ libusb1 libiconv ]; meta = with lib; { - inherit version; description = "aws-vault like tool for Okta authentication"; license = licenses.mit; maintainers = with maintainers; [imalsogreg Chili-Man]; diff --git a/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/nixpkgs/pkgs/tools/security/bitwarden/default.nix index 39756c9e9a78..e0bbad3486ca 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.27.0"; + x86_64-linux = "1.27.1"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-Ik+g7jkTBHRbGwDhbiJGQorMmt6GhCXVUd82Sug9a28="; + x86_64-linux = "sha256-CqyIARPHri018AOgI1rFJ9Td3K8OamXVgupAINME7BY="; }.${system} or ""; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/security/cewl/Gemfile b/nixpkgs/pkgs/tools/security/cewl/Gemfile new file mode 100644 index 000000000000..97d9ae757acc --- /dev/null +++ b/nixpkgs/pkgs/tools/security/cewl/Gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' +gem 'mime' +gem 'mime-types', ">=3.3.1" +gem 'mini_exiftool' +gem 'nokogiri' +gem 'rexml' +gem 'rubyzip' +gem 'spider' diff --git a/nixpkgs/pkgs/tools/security/cewl/Gemfile.lock b/nixpkgs/pkgs/tools/security/cewl/Gemfile.lock new file mode 100644 index 000000000000..85bb2eb4b822 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/cewl/Gemfile.lock @@ -0,0 +1,31 @@ +GEM + remote: https://rubygems.org/ + specs: + mime (0.4.4) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0704) + mini_exiftool (2.10.2) + mini_portile2 (2.5.3) + nokogiri (1.11.7) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + racc (1.5.2) + rexml (3.2.5) + rubyzip (2.3.2) + spider (0.5.4) + +PLATFORMS + ruby + +DEPENDENCIES + mime + mime-types (>= 3.3.1) + mini_exiftool + nokogiri + rexml + rubyzip + spider + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/tools/security/cewl/default.nix b/nixpkgs/pkgs/tools/security/cewl/default.nix new file mode 100644 index 000000000000..06d983c14e36 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/cewl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, bundlerEnv }: + +let + rubyEnv = bundlerEnv { + name = "cewl-ruby-env"; + gemdir = ./.; + }; +in +stdenv.mkDerivation rec { + pname = "cewl"; + version = "5.5.2"; + src = fetchFromGitHub { + owner = "digininja"; + repo = "CeWL"; + rev = version; + sha256 = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc="; + }; + + buildInputs = [ rubyEnv.wrappedRuby ]; + + installPhase = '' + mkdir -p $out/bin + cp *.rb $out/bin/ + mv $out/bin/cewl.rb $out/bin/cewl + ''; + + meta = with lib; { + description = "Custom wordlist generator"; + homepage = "https://digi.ninja/projects/cewl.php/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/cewl/gemset.nix b/nixpkgs/pkgs/tools/security/cewl/gemset.nix new file mode 100644 index 000000000000..851a6d2442d3 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/cewl/gemset.nix @@ -0,0 +1,104 @@ +{ + mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr"; + type = "gem"; + }; + version = "0.4.4"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; + type = "gem"; + }; + version = "3.2021.0704"; + }; + mini_exiftool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ir4wigpm6nkd3f40wcjdqrhjx3l60w1hwcg143is1a95ypnvqhr"; + type = "gem"; + }; + version = "2.10.2"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; + type = "gem"; + }; + version = "2.5.3"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + type = "gem"; + }; + version = "1.11.7"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + spider = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fix7zhnvlfqg66bxwdpbsffbynzdnaifnxpakn07bjh3rdj75cx"; + type = "gem"; + }; + version = "0.5.4"; + }; +} diff --git a/nixpkgs/pkgs/tools/security/cosign/default.nix b/nixpkgs/pkgs/tools/security/cosign/default.nix index 31088e262711..bdc32570dfa7 100644 --- a/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -1,29 +1,30 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC, pivKeySupport ? true }: buildGoModule rec { pname = "cosign"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "0g60qwdxk6pmkzj0zz9iyc8b0bzh751fj2yyz0vilkgcjq47xjk8"; + sha256 = "1h0lhbcrynaiwpgpkcn10yrn90j03g00w9hr2lvsj3cwmdbz0rcz"; }; buildInputs = - lib.optional stdenv.isLinux (lib.getDev pcsclite) - ++ lib.optionals stdenv.isDarwin [ PCSC ]; + lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) + ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ]; nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "0agmnl5d00hm854sj1iipng36pf7hcc26iwcmpcr1rsmc7v522z4"; + vendorSha256 = "0f3al6ds0kqyv2fapgdg9i38rfx6h169pmj6az0sfnkh2psq73ia"; subPackages = [ "cmd/cosign" ]; preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}") + buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"}) ''; + ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}"]; meta = with lib; { homepage = "https://github.com/sigstore/cosign"; diff --git a/nixpkgs/pkgs/tools/security/dnsrecon/default.nix b/nixpkgs/pkgs/tools/security/dnsrecon/default.nix index 5eda4e75f94b..163728a37c68 100644 --- a/nixpkgs/pkgs/tools/security/dnsrecon/default.nix +++ b/nixpkgs/pkgs/tools/security/dnsrecon/default.nix @@ -1,8 +1,11 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib +, fetchFromGitHub +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "darkoperator"; @@ -19,8 +22,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace dnsrecon.py \ - --replace "namelist.txt" "../share/namelist.txt" \ - --replace "0.9.0" "${version}" + --replace "namelist.txt" "../share/namelist.txt" ''; installPhase = '' @@ -37,8 +39,8 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "DNS Enumeration Script"; homepage = "https://github.com/darkoperator/dnsrecon"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; - maintainers = with maintainers; [ c0bw3b ]; + maintainers = with maintainers; [ c0bw3b fab ]; }; } diff --git a/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix b/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix index bd558b7ab66d..e0252dac820a 100644 --- a/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix +++ b/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0gp4m22zc80814ng80s38hp930aa8r4zqihr7jr23m0m2iq4pdpg"; }; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/enpass/default.nix b/nixpkgs/pkgs/tools/security/enpass/default.nix index 2444d1f1d726..63f25bc12efe 100644 --- a/nixpkgs/pkgs/tools/security/enpass/default.nix +++ b/nixpkgs/pkgs/tools/security/enpass/default.nix @@ -61,7 +61,6 @@ let nativeBuildInputs = [ makeWrapper ]; buildInputs = [dpkg]; - phases = [ "unpackPhase" "installPhase" ]; unpackPhase = "dpkg -X $src ."; installPhase='' diff --git a/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 2c096d100e27..9509288b5819 100644 --- a/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-06"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-tRdA3GwU+jko+N+LOCHOA6RqFp3rkhyARwSTXRXoDww="; + sha256 = "sha256-pmi1oKam3t4iKqbisFghdVlzp1Ozmc9Nmn19JLrsams="; }; installPhase = '' diff --git a/nixpkgs/pkgs/tools/security/fido2luks/default.nix b/nixpkgs/pkgs/tools/security/fido2luks/default.nix index 1bc0d77878c8..b41f6bc67fcb 100644 --- a/nixpkgs/pkgs/tools/security/fido2luks/default.nix +++ b/nixpkgs/pkgs/tools/security/fido2luks/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "sha256-WOdbdJAcMZHSnf7AkGnEumjaDut9J8VwSJYjqLUtPXs="; + sha256 = "sha256-rrtPMCgp2Xe8LXzFN57rzay2kyPaLT1+2m1NZQ9EsW4="; }; buildInputs = [ cryptsetup ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; - cargoSha256 = "sha256-d6t/bvHpnH4lKv78tp/8DC/VrQBnaiZhnf8GrlcYhJw="; + cargoSha256 = "sha256-5CzQuzmKuEi4KTR1jNh4avwqA3qYzTj+rV/zbIeUjAM="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/nixpkgs/pkgs/tools/security/fulcio/default.nix b/nixpkgs/pkgs/tools/security/fulcio/default.nix new file mode 100644 index 000000000000..4539f10e50d2 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/fulcio/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "fulcio"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = pname; + rev = version; + sha256 = "sha256-+HWzhg+LTKpr9VJ9mzQghwOuGgp3EBb4/zltaqp0zHw="; + }; + vendorSha256 = "sha256-1tR1vUm5eFBS93kELQoKWEyFlfMF28GBI8VEHxTyeM4="; + + ldflags = [ "-s" "-w" ]; + + # Install completions post-install + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd fulcio \ + --bash <($out/bin/fulcio completion bash) \ + --fish <($out/bin/fulcio completion fish) \ + --zsh <($out/bin/fulcio completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/fulcio --help + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/sigstore/fulcio"; + changelog = "https://github.com/sigstore/fulcio/releases/tag/${version}"; + description = "A Root-CA for code signing certs - issuing certificates based on an OIDC email address"; + license = licenses.asl20; + maintainers = with maintainers; [ lesuisse jk ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix b/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix index 68aa7c488198..228271742c64 100644 --- a/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix +++ b/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ patchelf makeWrapper ]; - phases = [ "unpackPhase" "installPhase" ]; unpackCmd = '' mkdir gorilla; diff --git a/nixpkgs/pkgs/tools/security/gpg-tui/default.nix b/nixpkgs/pkgs/tools/security/gpg-tui/default.nix index 063265e51d81..ad912aee8391 100644 --- a/nixpkgs/pkgs/tools/security/gpg-tui/default.nix +++ b/nixpkgs/pkgs/tools/security/gpg-tui/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.6.2"; + version = "0.7.1"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-Iv5A+o4TNSHJeTZgZ2e0SCHclz1mGMVRJDdBAWilyT8="; + sha256 = "sha256-J1mdgcNWloQOnGdBjcCoAsv+ClQ77DXYQajM9B3sYHY="; }; - cargoSha256 = "sha256-ISG/0WtgWwZoQd8PsvaQ9L8UKwerzEhY/84DxkdZV2g="; + cargoSha256 = "sha256-I63Pevw0BjkjasszZn2wmT4TNeVk27pJy4mJR6nl9MI="; nativeBuildInputs = [ gpgme # for gpgme-config diff --git a/nixpkgs/pkgs/tools/security/grype/default.nix b/nixpkgs/pkgs/tools/security/grype/default.nix index 7df1090b2b0c..c24515dd1bbb 100644 --- a/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/nixpkgs/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fYeZFNtftG46/QHdV5UhCNCdP7ErOgwWfEB4V14ei5k="; + sha256 = "sha256-xiUDyuVNVkVT+kxOEFOq4RKxMc5nNjsom/ZTKzfkOhU="; }; vendorSha256 = "sha256-mW3e4WFa9pKSpyTZYmPA2j8nZz+94G2PqdqI0BDo3wc="; diff --git a/nixpkgs/pkgs/tools/security/hashcat/default.nix b/nixpkgs/pkgs/tools/security/hashcat/default.nix index 3f38493d752c..273e2837e06a 100644 --- a/nixpkgs/pkgs/tools/security/hashcat/default.nix +++ b/nixpkgs/pkgs/tools/security/hashcat/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "hashcat"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "0xbs3i5g2w8h5031jwgm13algs3f721k12fghnwfzi05fmzw8d0f"; + sha256 = "sha256-wL4cZpPuHzXHvvH3m/njCpVPcX70LQDjd4eq7/MnHlE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/kpcli/default.nix b/nixpkgs/pkgs/tools/security/kpcli/default.nix index 37af42e33ccf..176cc5e706bb 100644 --- a/nixpkgs/pkgs/tools/security/kpcli/default.nix +++ b/nixpkgs/pkgs/tools/security/kpcli/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/{bin,share} diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 79f85f2b3750..8b90f7dd5f99 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.51" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.53" diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 8248f6e8181b..53b1170b210f 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: d9aeac3fea255c475f553be4c55f3ae7cefc8542 - ref: refs/tags/6.0.51 + revision: b7cef30d11f0509b7e27334030dae6b8cb34e7f2 + ref: refs/tags/6.0.53 specs: - metasploit-framework (6.0.51) + metasploit-framework (6.0.53) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -85,6 +85,7 @@ GIT thin tzinfo tzinfo-data + unix-crypt warden windows_error xdr @@ -119,23 +120,23 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) arel (9.0.0) arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.473.0) - aws-sdk-core (3.115.0) + aws-partitions (1.478.0) + aws-sdk-core (3.117.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.246.0) + aws-sdk-ec2 (1.249.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.55.0) + aws-sdk-iam (1.56.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.44.0) @@ -145,7 +146,7 @@ GEM aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (1.2.4) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) bcrypt_pbkdf (1.1.0) @@ -173,19 +174,23 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.4.3) + faraday (1.5.1) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) + faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) @@ -195,7 +200,7 @@ GEM ed25519 (~> 1.2) http-cookie (1.0.4) domain_name (~> 0.5) - http_parser.rb (0.6.0) + http_parser.rb (0.7.0) i18n (1.8.10) concurrent-ruby (~> 1.0) io-console (0.5.9) @@ -208,7 +213,7 @@ GEM loofah (2.10.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - metasm (1.0.4) + metasm (1.0.5) metasploit-concern (3.0.2) activemodel (~> 5.2.2) activesupport (~> 5.2.2) @@ -293,7 +298,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.3) + rake (13.0.6) rb-readline (0.5.5) recog (2.3.20) nokogiri @@ -308,7 +313,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.16) + rex-core (0.1.17) rex-encoder (0.1.5) metasm rex-arch @@ -327,7 +332,7 @@ GEM rex-arch rex-ole (0.1.7) rex-text - rex-powershell (0.1.90) + rex-powershell (0.1.91) rex-random_identifier rex-text ruby-rc4 @@ -352,7 +357,7 @@ GEM rkelly-remix (0.0.7) ruby-macho (2.5.1) ruby-rc4 (0.1.5) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) ruby_smb (2.0.10) bindata openssl-ccm @@ -360,7 +365,7 @@ GEM rubyntlm windows_error rubyntlm (0.6.3) - rubyzip (2.3.0) + rubyzip (2.3.2) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) @@ -389,6 +394,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) + unix-crypt (1.3.0) warden (1.2.9) rack (>= 2.0.9) webrick (1.7.0) diff --git a/nixpkgs/pkgs/tools/security/metasploit/default.nix b/nixpkgs/pkgs/tools/security/metasploit/default.nix index c48c5e1690ef..5217322fd6bb 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.51"; + version = "6.0.53"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ICVF4GVOyCq7dUAvzUUzhG+NuEiHSFvVWbQ8tAqUFFg="; + sha256 = "sha256-0tg2FSRtwo1LRxA5jNQ1Pxx54TPs3ZwErXim8uj24VI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index b52bff8aa8bb..ab8a1a21ca98 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -54,10 +54,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; afm = { groups = ["default"]; @@ -114,40 +114,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dw05k0l63lm631lwg5b1bx1nhkirds4rbc1v98bliwfjk5wf71a"; + sha256 = "0vsxqayzh04gxxan5i8vvfxh0n238dc9305bc89xs2mx2x1pw167"; type = "gem"; }; - version = "1.473.0"; + version = "1.478.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06cs5wj4njb2ivhv06v5d7rgy1i2g67a93c0kxly8h7fkkxh315q"; + sha256 = "1mcagbyzy7l39lxm9g85frvjwlv3yfd9x8jddd1pfc0xsy9y0rax"; type = "gem"; }; - version = "3.115.0"; + version = "3.117.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n3m2a8jnk64ai4wb1wh1a77i8c561ncjklvp650w8723avbj5bq"; + sha256 = "1n6yl7qbzmjlxp3rzm3a62vinzdg9a8rqspq7xdaa9sxrf4zsamf"; type = "gem"; }; - version = "1.246.0"; + version = "1.249.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03vs5wf96qpjl309vnrnr4d8hy4l8bvnflgc806bm9n130cyvs9m"; + sha256 = "0d30abab908434nmfi5j97vmv63466bmcvhvaknma27qc04s53ph"; type = "gem"; }; - version = "1.55.0"; + version = "1.56.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw"; + sha256 = "0cb9hsg0x9v4yk6sxif8968sg646qphmsjaqy9z8p7y3my5bkrf0"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.4"; }; bcrypt = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zmdsl6n05khwwq8gjssmfca0ifz6q82wwghf1qyzbxxjdna5mly"; + sha256 = "1xpq9w46alagszx2mx82mqxxmsmyni2bpxd08gygzpl03zwbpr63"; type = "gem"; }; - version = "1.4.3"; + version = "1.5.1"; }; faraday-em_http = { groups = ["default"]; @@ -389,6 +389,16 @@ }; version = "1.1.0"; }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; faraday-net_http = { groups = ["default"]; platforms = []; @@ -404,10 +414,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; + }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; }; faye-websocket = { groups = ["default"]; @@ -464,10 +484,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + sha256 = "1xha614fi6l04wryqjj1xmpalzlmhb6lb9qmlh8mmliycdhvcshp"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; i18n = { groups = ["default"]; @@ -544,10 +564,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mbmpc8vsi574s78f23bhiqk07sr6yrrrmk702lfv61ql4ah5l89"; + sha256 = "0dpjbkdvi4h6v0g01db7vlcsg15pfiyslkz3zd7wfk04yrc6g7wi"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; metasploit-concern = { groups = ["default"]; @@ -574,12 +594,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "d9aeac3fea255c475f553be4c55f3ae7cefc8542"; - sha256 = "0n0ljh5b8g5lb7amnj4792w8svw46d2wsbs0fnxjmj2fcph4a990"; + rev = "b7cef30d11f0509b7e27334030dae6b8cb34e7f2"; + sha256 = "0lp1yvlg59kqml29rpgc6ghpj71z6pa8qf8h8x5qvhkd4hakdn6j"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.51"; + version = "6.0.53"; }; metasploit-model = { groups = ["default"]; @@ -946,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; - version = "13.0.3"; + version = "13.0.6"; }; rb-readline = { groups = ["default"]; @@ -1016,10 +1036,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08krnf05mbq6x2d92fv34bl8xdz1d3yq2m0mp8bfbq5kd6a13l2w"; + sha256 = "0b0f9s18d2ax2k1xmwrvr97gxh8gfm79kfibv55fqmv846vgkkvk"; type = "gem"; }; - version = "0.1.16"; + version = "0.1.17"; }; rex-encoder = { groups = ["default"]; @@ -1086,10 +1106,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08a9s82y4bv2bis0szasrrqvz6imwx94ckg259f7w39ng1fbc7b1"; + sha256 = "0zrc0pr1pla0amw6hagllj82hyq8pyy6wb38xry2cxg7q70ghfq7"; type = "gem"; }; - version = "0.1.90"; + version = "0.1.91"; }; rex-random_identifier = { groups = ["default"]; @@ -1216,10 +1236,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; ruby_smb = { groups = ["default"]; @@ -1246,10 +1266,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.2"; }; sawyer = { groups = ["default"]; @@ -1401,6 +1421,16 @@ }; version = "0.0.7.7"; }; + unix-crypt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wflipsmmicmgvqilp9pml4x19b337kh6p6jgrzqrzpkq2z52gdq"; + type = "gem"; + }; + version = "1.3.0"; + }; warden = { groups = ["default"]; platforms = []; diff --git a/nixpkgs/pkgs/tools/security/nuclei/default.nix b/nixpkgs/pkgs/tools/security/nuclei/default.nix index e4c6039c456c..3f674bef7bcb 100644 --- a/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MrAJHYfTcziHTKJYRB6FW23XcHqdr9AGF+Cumw7hbcQ="; + sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A="; }; - vendorSha256 = "sha256-ZzpmHoMkrDAZcMXtD6smEaFEmT/EnRcKd7XYz/IK72Y="; + vendorSha256 = "sha256-Ok2VUwtqhlp6NwLbQX9KAaGiZtzmfWG0LcqtBBDk22A="; modRoot = "./v2"; subPackages = [ diff --git a/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix index a925d07cb7c8..e542a2ae7140 100644 --- a/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix +++ b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pam, xmlsec }: let + # TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream securityDependency = if stdenv.isDarwin then xmlsec else pam; @@ -16,6 +17,8 @@ in stdenv.mkDerivation rec { buildInputs = [ securityDependency ]; + configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ]; + passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/security/open-ecard/default.nix b/nixpkgs/pkgs/tools/security/open-ecard/default.nix index 5c07add90563..00ff112ba844 100644 --- a/nixpkgs/pkgs/tools/security/open-ecard/default.nix +++ b/nixpkgs/pkgs/tools/security/open-ecard/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = srcs.richclient; - phases = "installPhase"; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/ossec/default.nix b/nixpkgs/pkgs/tools/security/ossec/default.nix index 22374e1d302b..b86cb57bbde0 100644 --- a/nixpkgs/pkgs/tools/security/ossec/default.nix +++ b/nixpkgs/pkgs/tools/security/ossec/default.nix @@ -1,18 +1,16 @@ { lib, stdenv, fetchurl, which }: -stdenv.mkDerivation { - name = "ossec-client-2.6"; +stdenv.mkDerivation rec { + pname = "ossec-client"; + version = "2.6"; src = fetchurl { - url = "https://www.ossec.net/files/ossec-hids-2.6.tar.gz"; - + url = "https://www.ossec.net/files/ossec-hids-${version}.tar.gz"; sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; }; buildInputs = [ which ]; - phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; - patches = [ ./no-root.patch ]; buildPhase = '' @@ -30,11 +28,12 @@ yes " | ./install.sh ''; - meta = { + meta = with lib; { description = "Open source host-based instrusion detection system"; homepage = "https://www.ossec.net"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/security/quill/default.nix b/nixpkgs/pkgs/tools/security/quill/default.nix new file mode 100644 index 000000000000..74c7996a8964 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/quill/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, Security, libiconv, pkg-config, protobuf, which, buildPackages }: + +rustPlatform.buildRustPackage rec { + pname = "quill"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "dfinity"; + repo = "quill"; + rev = "v${version}"; + sha256 = "02ga2xkdxs36mfr4lv43cy6wkf27c28bdkzfkp3az5jvyk17mkfr"; + }; + + ic = fetchFromGitHub { + owner = "dfinity"; + repo = "ic"; + rev = "779549eccfcf61ac702dfc2ee6d76ffdc2db1f7f"; + sha256 = "1r31d5hab7k1n60a7y8fw79fjgfq04cgj9krwa6r9z4isi3919v6"; + }; + + registry = "file://local-registry"; + + preBuild = '' + export REGISTRY_TRANSPORT_PROTO_INCLUDES=${ic}/rs/registry/transport/proto + export IC_BASE_TYPES_PROTO_INCLUDES=${ic}/rs/types/base_types/proto + export IC_PROTOBUF_PROTO_INCLUDES=${ic}/rs/protobuf/def + export IC_NNS_COMMON_PROTO_INCLUDES=${ic}/rs/nns/common/proto + export PROTOC=${buildPackages.protobuf}/bin/protoc + export OPENSSL_DIR=${openssl.dev} + export OPENSSL_LIB_DIR=${openssl.out}/lib + ''; + + cargoSha256 = "142pzhyi73ljlqas5vbhjhn4vmp9w9ps1mv8q7s3kzg0h7jcvm1k"; + + nativeBuildInputs = [ pkg-config protobuf ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + + meta = with lib; { + homepage = "https://github.com/dfinity/quill"; + changelog = "https://github.com/dfinity/quill/releases/tag/v${version}"; + description = "Minimalistic ledger and governance toolkit for cold wallets on the Internet Computer."; + license = licenses.asl20; + maintainers = with maintainers; [ imalison ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 567d3727a16a..8ee2c9a4c4e4 100644 --- a/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, AppKit }: buildGoModule rec { pname = "saml2aws"; @@ -14,6 +14,8 @@ buildGoModule rec { runVend = true; vendorSha256 = "sha256-TieQVPSWtIteU0wTqX7si6GrPdYd4WD2eK4ZlLz0VJ8="; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + doCheck = false; subPackages = [ "." "cmd/saml2aws" ]; diff --git a/nixpkgs/pkgs/tools/security/sequoia/default.nix b/nixpkgs/pkgs/tools/security/sequoia/default.nix index a40e2ce33c99..d84f6f299005 100644 --- a/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { checkInputs = lib.optionals pythonSupport [ pythonPackages.pytest - pythonPackages.pytestrunner + pythonPackages.pytest-runner ]; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/sshuttle/default.nix b/nixpkgs/pkgs/tools/security/sshuttle/default.nix index 9fd57c82e88f..959712488a20 100644 --- a/nixpkgs/pkgs/tools/security/sshuttle/default.nix +++ b/nixpkgs/pkgs/tools/security/sshuttle/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , python3Packages , makeWrapper , coreutils @@ -10,24 +11,29 @@ python3Packages.buildPythonApplication rec { pname = "sshuttle"; - version = "1.0.3"; + version = "1.0.5"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0fff1c88669a20bb6a4e7331960673a3a02a2e04ff163e4c9299496646edcf61"; + sha256 = "fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd"; }; patches = [ ./sudo.patch ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace '--cov=sshuttle --cov-branch --cov-report=term-missing' "" + ''; + nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; - checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; + propagatedBuildInputs = [ python3Packages.psutil ]; - runtimeDeps = [ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ]; + checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ]; postInstall = '' wrapProgram $out/bin/sshuttle \ - --prefix PATH : "${lib.makeBinPath runtimeDeps}" \ + --prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ])}" \ ''; meta = with lib; { @@ -38,8 +44,7 @@ python3Packages.buildPythonApplication rec { target network (though it does require Python 2.7, Python 3.5 or later at both ends). Works with Linux and Mac OS and supports DNS tunneling. ''; - license = licenses.gpl2; + license = licenses.lgpl21; maintainers = with maintainers; [ domenkozar carlosdagos ]; - platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/security/ssss/default.nix b/nixpkgs/pkgs/tools/security/ssss/default.nix index 34407f5f5ad9..61d10111120e 100644 --- a/nixpkgs/pkgs/tools/security/ssss/default.nix +++ b/nixpkgs/pkgs/tools/security/ssss/default.nix @@ -1,28 +1,45 @@ -{ lib, stdenv, fetchurl, gmp }: +{ lib +, stdenv +, fetchFromGitHub +, gmp +, installShellFiles +}: -stdenv.mkDerivation { - name = "ssss-0.5"; +stdenv.mkDerivation rec { + pname = "ssss"; + version = "0.5.7"; - src = fetchurl { - url = "http://point-at-infinity.org/ssss/ssss-0.5.tar.gz"; - sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx"; + src = fetchFromGitHub { + owner = "MrJoy"; + repo = pname; + rev = "releases%2Fv${version}"; + sha256 = "18r1hwch6nq6gjijavr4pvrxz2plrlrvdx8ssqhdj2vmqvlqwbvd"; }; - buildInputs = [ gmp ]; + nativeBuildInputs = [ + installShellFiles + ]; - preBuild = - '' - sed -e s@/usr/@$out/@g -i Makefile - cp ssss.manpage.xml ssss.1 - cp ssss.manpage.xml ssss.1.html - mkdir -p $out/bin $out/share/man/man1 - echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile - ''; + buildInputs = [ + gmp + ]; - meta = { + preBuild = '' + sed -e s@/usr/@$out/@g -i Makefile + cp ssss.manpage.xml ssss.1 + mkdir -p $out/bin + echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile + ''; + + postInstall = '' + installManPage ssss.1 + ''; + + meta = with lib; { description = "Shamir Secret Sharing Scheme"; homepage = "http://point-at-infinity.org/ssss/"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/tools/security/step-cli/default.nix b/nixpkgs/pkgs/tools/security/step-cli/default.nix index a13eec71eb84..c91a83c0a0d7 100644 --- a/nixpkgs/pkgs/tools/security/step-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/step-cli/default.nix @@ -5,20 +5,27 @@ buildGoModule rec { pname = "step-cli"; - version = "0.15.16"; + version = "0.16.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/HqCG3LscwogLXvZlL2CVo2Pj1hVRnOMPCmG1hxrG/I="; + sha256 = "sha256-gMXvHPqWvaZmzWiWrxlknaMkUraS64yrKl+RzAF7c4I="; }; + ldflags = [ + "-w" + "-s" + "-X main.Version=${version}" + ]; + preCheck = '' # Tries to connect to smallstep.com rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-plQgIqs6QUbzndn8C0ByKceGtz/JxZ1Rx0fXWHNJ0kM="; + + vendorSha256 = "sha256-WF2UD0LwzCMkoW1EfcjV+9ZboPp1oWhmsSEryj13Kg0="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix b/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix index 53f99636b458..242da1a67bb4 100644 --- a/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix +++ b/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix @@ -22,7 +22,6 @@ buildGoPackage rec { ]; meta = with lib; { - inherit version; inherit (src.meta) homepage; description = "Get 1password access from iterm2"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/security/theharvester/default.nix b/nixpkgs/pkgs/tools/security/theharvester/default.nix index 2fae6c465d59..dc1596facdff 100644 --- a/nixpkgs/pkgs/tools/security/theharvester/default.nix +++ b/nixpkgs/pkgs/tools/security/theharvester/default.nix @@ -4,8 +4,8 @@ }: python3.pkgs.buildPythonApplication rec { - pname = "theHarvester"; - version = "3.2.3"; + pname = "theharvester"; + version = "4.0.0"; src = fetchFromGitHub { owner = "laramies"; @@ -16,6 +16,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ aiodns + aiofiles aiohttp aiomultiprocess aiosqlite @@ -23,8 +24,7 @@ python3.pkgs.buildPythonApplication rec { censys certifi dnspython - gevent - grequests + fastapi lxml netaddr plotly @@ -33,14 +33,23 @@ python3.pkgs.buildPythonApplication rec { requests retrying shodan - texttable + slowapi + starlette + uvicorn uvloop ]; - checkInputs = [ python3.pkgs.pytest ]; + checkInputs = with python3.pkgs; [ + pytest + pytest-asyncio + ]; - checkPhase = "runHook preCheck ; pytest tests/test_myparser.py ; runHook postCheck"; # We don't run other tests (discovery modules) because they require network access + checkPhase = '' + runHook preCheck + pytest tests/test_myparser.py + runHook postCheck + ''; meta = with lib; { description = "Gather E-mails, subdomains and names from different public sources"; diff --git a/nixpkgs/pkgs/tools/security/volatility/default.nix b/nixpkgs/pkgs/tools/security/volatility/default.nix index 6cc5ddbfb4cf..4abbbd2d1d1f 100644 --- a/nixpkgs/pkgs/tools/security/volatility/default.nix +++ b/nixpkgs/pkgs/tools/security/volatility/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; + propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ]; meta = with lib; { homepage = "https://www.volatilityfoundation.org/"; diff --git a/nixpkgs/pkgs/tools/security/vulnix/default.nix b/nixpkgs/pkgs/tools/security/vulnix/default.nix index a7ce0fb4b6e4..037adda92eb6 100644 --- a/nixpkgs/pkgs/tools/security/vulnix/default.nix +++ b/nixpkgs/pkgs/tools/security/vulnix/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "vulnix"; - version = "1.9.6"; + version = "1.10.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0anyxmqgn4kx102l3qjhh1f2b0cg7mnlapfhriyjw0zyy5gyqvng"; + sha256 = "1d5mqpc4g1wkqcwxp8m9k130i3ii3q7n1n4b1fyb5wijidmyn3xv"; }; outputs = [ "out" "doc" "man" ]; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ freezegun pytest - pytestcov + pytest-cov pytest-flake8 ]; diff --git a/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock b/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock index 96857239bda0..65e09d0aecfb 100644 --- a/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.3.2) + activesupport (6.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -9,10 +9,10 @@ GEM zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - cms_scanner (0.13.4) + cms_scanner (0.13.5) ethon (~> 0.14.0) get_process_mem (~> 0.2.5) - nokogiri (~> 1.11.0) + nokogiri (~> 1.11.4) opt_parse_validator (~> 1.9.4) public_suffix (~> 4.0.3) ruby-progressbar (>= 1.10, < 1.12) @@ -20,17 +20,17 @@ GEM typhoeus (>= 1.3, < 1.5) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) ethon (0.14.0) ffi (>= 1.15.0) - ffi (1.15.1) + ffi (1.15.3) get_process_mem (0.2.7) ffi (~> 1.0) i18n (1.8.10) concurrent-ruby (~> 1.0) mini_portile2 (2.5.3) minitest (5.14.4) - nokogiri (1.11.6) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) opt_parse_validator (1.9.4) @@ -46,8 +46,8 @@ GEM tzinfo (2.0.4) concurrent-ruby (~> 1.0) webrick (1.7.0) - wpscan (3.8.17) - cms_scanner (~> 0.13.3) + wpscan (3.8.18) + cms_scanner (~> 0.13.5) xmlrpc (0.3.2) webrick yajl-ruby (1.4.1) diff --git a/nixpkgs/pkgs/tools/security/wpscan/default.nix b/nixpkgs/pkgs/tools/security/wpscan/default.nix index e7a784c1a779..6a41611e67e0 100644 --- a/nixpkgs/pkgs/tools/security/wpscan/default.nix +++ b/nixpkgs/pkgs/tools/security/wpscan/default.nix @@ -11,11 +11,13 @@ bundlerApp { --prefix PATH : ${lib.makeBinPath [ curl ]} ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Black box WordPress vulnerability scanner"; - homepage = "https://wpscan.org/"; - license = licenses.unfreeRedistributable; + homepage = "https://wpscan.org/"; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ nyanloutre manveru ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/security/wpscan/gemset.nix b/nixpkgs/pkgs/tools/security/wpscan/gemset.nix index c3d79ea77fbc..80b5ec290c00 100644 --- a/nixpkgs/pkgs/tools/security/wpscan/gemset.nix +++ b/nixpkgs/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; + sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -27,20 +27,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xzkbk6a93sdhshzlkx1dcpln3fcw2apccb7g6jha0g1im7yhgcj"; + sha256 = "15qh28drxkyv294l1qcpsghfa875p71q0vkmmv5l6fbmpapmllrk"; type = "gem"; }; - version = "0.13.4"; + version = "0.13.5"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; ethon = { dependencies = ["ffi"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nn2v70rql15vb0pm9cg0f3xsaslwjkv6xgz0k5jh48idmfw9fi"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.1"; + version = "1.15.3"; }; get_process_mem = { dependencies = ["ffi"]; @@ -111,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z"; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; type = "gem"; }; - version = "1.11.6"; + version = "1.11.7"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jdn2v5cmxlzq9nkzh5lqnqr0mbiyn87g6bfc0074m19m38g19r9"; + sha256 = "01ig3fbxxm0gnvqkzmsc4zcipijprrw5xs84rnwp50w0crww842c"; type = "gem"; }; - version = "3.8.17"; + version = "3.8.18"; }; xmlrpc = { dependencies = ["webrick"]; diff --git a/nixpkgs/pkgs/tools/security/wpscan/update.sh b/nixpkgs/pkgs/tools/security/wpscan/update.sh new file mode 100755 index 000000000000..4e55a770fd4e --- /dev/null +++ b/nixpkgs/pkgs/tools/security/wpscan/update.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash bundix bundler + +set -e + +cd "$(dirname "${BASH_SOURCE[0]}")" + +rm -f Gemfile.lock Gemfile.lock +bundler lock +BUNDLE_GEMFILE=Gemfile bundler lock --lockfile=Gemfile.lock +bundix --gemfile=Gemfile --lockfile=Gemfile.lock --gemset=gemset.nix diff --git a/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix b/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix index 305f5a4fe799..baccb14faf43 100644 --- a/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix +++ b/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yubikey-agent"; - version = "unstable-2021-02-18"; + version = "0.1.4"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; - rev = "8cadc13d107757f8084d9d2b93ea64ff0c1748e8"; - sha256 = "1lklgq9qkqil5s0g56wbhs0vpr9c1bd4ir7bkrjwqj75ygxim8ml"; + rev = "v${version}"; + sha256 = "1b4522s7xkh6q74m0lprbnzg2hspg1pr9rzn94qmd06sry82d3fd"; }; buildInputs = @@ -17,15 +17,11 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper pkg-config ]; - # pull in go-piv/piv-go#75 - # once go-piv/piv-go#75 is merged and released, we should - # use the released version (and push upstream to do the same) - patches = [ ./use-piv-go-75.patch ]; postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; - vendorSha256 = "1zx1w2is61471v4dlmr4wf714zqsc8sppik671p7s4fis5vccsca"; + vendorSha256 = "0cpj4nj2g0ick6p79h4pnjg7ybnyz9p26jivv0awi6bmn378nbxn"; doCheck = false; @@ -35,12 +31,7 @@ buildGoModule rec { # ensure the nixpkgs-provided one is available postInstall = lib.optionalString stdenv.isDarwin '' wrapProgram $out/bin/yubikey-agent --suffix PATH : $(dirname ${pinentry_mac}/${pinentry_mac.binaryPath}) - '' - # Note: in the next release, upstream provides - # contrib/systemd/user/yubikey-agent.service, which we should use - # instead - # See https://github.com/FiloSottile/yubikey-agent/pull/43 - + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' mkdir -p $out/lib/systemd/user substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \ --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent" diff --git a/nixpkgs/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch b/nixpkgs/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch deleted file mode 100644 index 73967d817d96..000000000000 --- a/nixpkgs/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 547695fff9cbfc4037168cdeb07cfe16bd89b6db Mon Sep 17 00:00:00 2001 -From: Philip Potter <philip.g.potter@gmail.com> -Date: Sat, 25 Jul 2020 21:59:50 +0100 -Subject: [PATCH] Pull in piv-go#75 - ---- - go.mod | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/go.mod b/go.mod -index d4d13c8..f75be2d 100644 ---- a/go.mod -+++ b/go.mod -@@ -7,3 +7,5 @@ require ( - github.com/gopasspw/gopass v1.9.1 - golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 - ) -+ -+replace github.com/go-piv/piv-go => github.com/rawkode/piv-go v1.5.1-0.20200725154545-1c3200c75a28 --- -2.27.0 - diff --git a/nixpkgs/pkgs/tools/system/bottom/default.nix b/nixpkgs/pkgs/tools/system/bottom/default.nix index 036410f350ca..1401f2a78a90 100644 --- a/nixpkgs/pkgs/tools/system/bottom/default.nix +++ b/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-QCi6Oi5xk88ev2B4rlXwgR55qKZSUbIY/96t/jhJQ0Q="; + sha256 = "sha256-hXEaQL4jTd/MfEUVKUTs7oTRAffau1YA/IUUtD+V9KI="; }; prePatch = '' @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-RJ7xIp9EBiBLSMAchr7XYhrTITNJy+Yfok//vZr3Z38="; + cargoSha256 = "sha256-aeR6fcIWkY4AWZy8tVotUAVRVSiO/0S0DU/A9/ATrF4="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/system/collectd/data.nix b/nixpkgs/pkgs/tools/system/collectd/data.nix index 378eb62d6cc5..3867bd6bb3d9 100644 --- a/nixpkgs/pkgs/tools/system/collectd/data.nix +++ b/nixpkgs/pkgs/tools/system/collectd/data.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "collectd-data"; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/share/collectd diff --git a/nixpkgs/pkgs/tools/system/dd_rescue/default.nix b/nixpkgs/pkgs/tools/system/dd_rescue/default.nix index ba18c58becb9..ce996bf7c6f4 100644 --- a/nixpkgs/pkgs/tools/system/dd_rescue/default.nix +++ b/nixpkgs/pkgs/tools/system/dd_rescue/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "http://www.garloff.de/kurt/linux/ddrescue/"; license = licenses.gpl2Plus; - inherit version; updateWalker = true; }; } diff --git a/nixpkgs/pkgs/tools/system/fakechroot/default.nix b/nixpkgs/pkgs/tools/system/fakechroot/default.nix index fb56350aa72f..382a47039ba8 100644 --- a/nixpkgs/pkgs/tools/system/fakechroot/default.nix +++ b/nixpkgs/pkgs/tools/system/fakechroot/default.nix @@ -21,6 +21,24 @@ stdenv.mkDerivation rec { # and are uninteresting as well as unimportant for our purposes (since NEWS never leaves the build env). excludes = [ "NEWS.md" ]; }) + + # glibc 2.33 compat (https://github.com/dex4er/fakechroot/pull/85/) + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/commit/534e6d555736b97211523970d378dfb0db2608e9.patch"; + sha256 = "sha256-bUlGJZvOSrATPt8bxGqU1UETTUD9V/HhJyA5ZxsOLQU="; + }) + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/commit/75d7e6fa191c11a791faff06a0de86eaa7801d05.patch"; + sha256 = "sha256-vWN7zFkKlBd/F+h/66z21RiZqkSCn3UIzy9NHV7TYDg="; + }) + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/commit/693a3597ea7fccfb62f357503ff177bd3e3d5a89.patch"; + sha256 = "sha256-bFXsT0hWocJFbtS1cpzo7oIy/x66iUw6QE1/cEoZ+3k="; + }) + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/commit/e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5.patch"; + sha256 = "sha256-eX6kB4U1ZlXoRtkSVEIBTRjO/cTS/7z5a9S366DiRMg="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/nixpkgs/pkgs/tools/system/fakeroot/default.nix index 0e4f51c7ea6c..bf42e987c4d3 100644 --- a/nixpkgs/pkgs/tools/system/fakeroot/default.nix +++ b/nixpkgs/pkgs/tools/system/fakeroot/default.nix @@ -9,7 +9,23 @@ stdenv.mkDerivation rec { sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"; }; - patches = lib.optional stdenv.isLinux ./einval.patch + patches = lib.optionals stdenv.isLinux [ + ./einval.patch + + # glibc 2.33 patches from ArchLinux + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; + sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; + sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; + sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8="; + }) + ] # patchset from brew ++ lib.optionals stdenv.isDarwin [ (fetchpatch { diff --git a/nixpkgs/pkgs/tools/system/fancy-motd/default.nix b/nixpkgs/pkgs/tools/system/fancy-motd/default.nix index 2c30e7e93485..e8f21c6fbd31 100644 --- a/nixpkgs/pkgs/tools/system/fancy-motd/default.nix +++ b/nixpkgs/pkgs/tools/system/fancy-motd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fancy-motd"; - version = "unstable-2021-07-04"; + version = "unstable-2021-07-15"; src = fetchFromGitHub { owner = "bcyran"; repo = pname; - rev = "2cc3c3c164ef695c9dd465beca61716a364db32c"; - sha256 = "003p5rsyl216xwldrk8slpnzw6wdrcm8hpfdgy9a0mja5g1xdqzr"; + rev = "e8d2d2602d9b9fbc132ddc4f9fbf22428d715721"; + sha256 = "10fxr1grsiwvdc5m2wd4n51lvz0zd4sldg9rzviaim18nw68gdq3"; }; buildInputs = [ bc curl figlet fortune gawk iproute2 ]; diff --git a/nixpkgs/pkgs/tools/system/freeipmi/default.nix b/nixpkgs/pkgs/tools/system/freeipmi/default.nix index 8dbe4b5e0033..77828ae823d4 100644 --- a/nixpkgs/pkgs/tools/system/freeipmi/default.nix +++ b/nixpkgs/pkgs/tools/system/freeipmi/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice updateWalker = true; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/system/gdu/default.nix b/nixpkgs/pkgs/tools/system/gdu/default.nix index 5a84cd6ee3ff..c50b2a4c84ea 100644 --- a/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.1.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9o/njurf1AWt04A8u38FMFcteLZlRHDejbH9+ekDjKI="; + sha256 = "sha256-hf5jTEAN5oOPg2PaAlYjIDMYcwXkaFAqPtWTwZV98N0="; }; vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc="; diff --git a/nixpkgs/pkgs/tools/system/gotop/default.nix b/nixpkgs/pkgs/tools/system/gotop/default.nix index 1cc0ba877399..dffbaaa81832 100644 --- a/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -1,31 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gotop"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3t6I4ah9gUmPlIBRL86BdgiUaMNiKNEeoUSRMASz1Yc="; + sha256 = "15bsxaxqxp17wsr0p9fkpvgfyqnhhwm3j8jxkvcs4cdw73qaxdsy"; }; runVend = true; - vendorSha256 = "sha256-GcIaUIuTiSY1aKxRtclfl7hMNaZZx4uoVG7ahjF/4Hs="; + vendorSha256 = "06hl1npwmy9dvpf4kljvw8lwwiigm52wf106lmf9k6k2gi5ikprz"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; preCheck = '' export HOME=$(mktemp -d) ''; + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; homepage = "https://github.com/xxxserxxx/gotop"; - changelog = "https://github.com/xxxserxxx/gotop/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/system/hostctl/default.nix b/nixpkgs/pkgs/tools/system/hostctl/default.nix index 6f557e05cd12..54bc72144ea3 100644 --- a/nixpkgs/pkgs/tools/system/hostctl/default.nix +++ b/nixpkgs/pkgs/tools/system/hostctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hostctl"; - version = "1.0.14"; + version = "1.1.0"; src = fetchFromGitHub { owner = "guumaster"; repo = pname; rev = "v${version}"; - sha256 = "02bjii97l4fy43v2rb93m9b0ad8y6mjvbvp4sz6a5n0w9dm1z1q9"; + sha256 = "sha256-X07JvXN1mwOQE2XBfaYbqQnQ92fBSg/Erj0yUygAqmM="; }; - vendorSha256 = "1lqk3cda0frqp2vwkqa4b3xkdw814wgkbr7g9r2mwxn85fpdcq5c"; + vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/system/ipmiutil/default.nix b/nixpkgs/pkgs/tools/system/ipmiutil/default.nix index 4efc8024cc4a..a11890dabd6f 100644 --- a/nixpkgs/pkgs/tools/system/ipmiutil/default.nix +++ b/nixpkgs/pkgs/tools/system/ipmiutil/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.bsd3; downloadPage = "https://sourceforge.net/projects/ipmiutil/files/ipmiutil/"; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/system/jsvc/default.nix b/nixpkgs/pkgs/tools/system/jsvc/default.nix new file mode 100644 index 000000000000..442f8d904195 --- /dev/null +++ b/nixpkgs/pkgs/tools/system/jsvc/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, commonsDaemon, jdk, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "jsvc"; + version = "1.2.4"; + + src = fetchurl { + url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; + sha256 = "1nrr6ggy6h20r9zyv14vx6vc9p1w6l8fl9fn6i8dx2hrq6kk2bjw"; + }; + + buildInputs = [ commonsDaemon ]; + nativeBuildInputs = [ jdk makeWrapper ]; + + preConfigure = '' + cd ./src/native/unix/ + sh ./support/buildconf.sh + ''; + + preBuild = '' + export JAVA_HOME=${jre} + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp jsvc $out/bin/jsvc + chmod +x $out/bin/jsvc + wrapProgram $out/bin/jsvc --set JAVA_HOME "${jre}" + runHook postInstall + ''; + + meta = { + homepage = "https://commons.apache.org/proper/commons-daemon"; + description = "JSVC is part of the Apache Commons Daemon software, a set of utilities and Java support classes for running Java applications as server processes."; + maintainers = with lib.maintainers; [ rsynnest ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/tools/system/kmon/default.nix b/nixpkgs/pkgs/tools/system/kmon/default.nix index 4253ff3e7c9d..85d9df5df48d 100644 --- a/nixpkgs/pkgs/tools/system/kmon/default.nix +++ b/nixpkgs/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2cP3kZnjlMmN3nWRPh1M+hk+dyssGNpJjlluDsm702g="; + sha256 = "sha256-zbTS4nGb2jDYGhNYxoPaVv9kAc51CQOi9qiHiSLjAjo="; }; - cargoSha256 = "sha256-xxYfaGhAtLESpy4gdE3IjE29W+DGnI1ed020mxjT3TI="; + cargoSha256 = "sha256-ujVlOShZOuaV3B1ydggVJXLNMQHoTZC0dJaw+/ajVFg="; nativeBuildInputs = [ python3 ]; diff --git a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix index be4eaf5f0791..912afb7021ca 100644 --- a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix +++ b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; license = lib.licenses.ipl10; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 8d0539d118f3..669d1a9fbc6d 100644 --- a/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -4,8 +4,6 @@ , IOKit, ApplicationServices }: let - version = "7.2"; - dbrev = "5171"; drivedbBranch = "RELEASE_7_2_DRIVEDB"; driverdb = fetchurl { @@ -16,7 +14,7 @@ let in stdenv.mkDerivation rec { pname = "smartmontools"; - inherit version; + version = "7.2"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; @@ -40,5 +38,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ peti Frostman ]; platforms = with platforms; linux ++ darwin; + mainProgram = "smartctl"; }; } diff --git a/nixpkgs/pkgs/tools/system/tree/default.nix b/nixpkgs/pkgs/tools/system/tree/default.nix index dea7fd2e2b6c..ab76de74762c 100644 --- a/nixpkgs/pkgs/tools/system/tree/default.nix +++ b/nixpkgs/pkgs/tools/system/tree/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchurl }: let - version = "1.8.0"; - # These settings are found in the Makefile, but there seems to be no # way to select one ore the other setting other than editing the file # manually, so we have to duplicate the know how here. @@ -23,9 +21,9 @@ let '' else ""; # use linux flags by default in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "tree"; - inherit version; + version = "1.8.0"; src = fetchurl { url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz"; diff --git a/nixpkgs/pkgs/tools/system/uefitool/common.nix b/nixpkgs/pkgs/tools/system/uefitool/common.nix index 7d5ee82dcf98..7b9c8f2e57df 100644 --- a/nixpkgs/pkgs/tools/system/uefitool/common.nix +++ b/nixpkgs/pkgs/tools/system/uefitool/common.nix @@ -20,8 +20,10 @@ mkDerivation rec { buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake cmake zip ]; - configurePhase = ":"; - buildPhase = "bash unixbuild.sh"; + dontConfigure = true; + buildPhase = '' + bash unixbuild.sh + ''; installPhase = '' mkdir -p "$out"/bin diff --git a/nixpkgs/pkgs/tools/system/wsmancli/default.nix b/nixpkgs/pkgs/tools/system/wsmancli/default.nix index bb7a206ced8c..ac6a561bb0a6 100644 --- a/nixpkgs/pkgs/tools/system/wsmancli/default.nix +++ b/nixpkgs/pkgs/tools/system/wsmancli/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/Openwsman/wsmancli/releases"; inherit (openwsman.meta) homepage license maintainers platforms; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/text/choose/default.nix b/nixpkgs/pkgs/tools/text/choose/default.nix index 05b325126871..f5cded1beab6 100644 --- a/nixpkgs/pkgs/tools/text/choose/default.nix +++ b/nixpkgs/pkgs/tools/text/choose/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "choose"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "theryangeary"; repo = pname; rev = "v${version}"; - sha256 = "0j3861pxqw0lnamb201c7h5w7npzyiwwb6c1xzxjv72m2ccvz76j"; + sha256 = "sha256-QX0tAo1cGPpRhggiAPxsVhKXg6TgaVl1lcp3na7jUNw="; }; - cargoSha256 = "1fdcz7vnmrw92y7bx49napi7j2jjc41liz5k63kbijfwqnaaiswy"; + cargoSha256 = "sha256-3pK7y/zC5iZkto5p5Xerlpu3yfN6sB2kjLF2fURlUj0="; meta = with lib; { description = "A human-friendly and fast alternative to cut and (sometimes) awk"; diff --git a/nixpkgs/pkgs/tools/text/gawk/gawk-with-extensions.nix b/nixpkgs/pkgs/tools/text/gawk/gawk-with-extensions.nix index 751e5181bb58..1b82d798d330 100644 --- a/nixpkgs/pkgs/tools/text/gawk/gawk-with-extensions.nix +++ b/nixpkgs/pkgs/tools/text/gawk/gawk-with-extensions.nix @@ -1,7 +1,8 @@ { runCommand, gawk, extensions, makeWrapper }: runCommand "gawk-with-extensions" { - buildInputs = [ makeWrapper gawk ] ++ extensions; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gawk ] ++ extensions; } '' mkdir -p $out/bin for i in ${gawk}/bin/*; do diff --git a/nixpkgs/pkgs/tools/text/html-tidy/default.nix b/nixpkgs/pkgs/tools/text/html-tidy/default.nix index 6caa3d34a0c9..d4bb26a0a777 100644 --- a/nixpkgs/pkgs/tools/text/html-tidy/default.nix +++ b/nixpkgs/pkgs/tools/text/html-tidy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "html-tidy"; - version = "5.7.28"; + version = "5.8.0"; src = fetchFromGitHub { owner = "htacg"; repo = "tidy-html5"; rev = version; - sha256 = "sha256-Tny53PtaQWAMAEjqw4tKnmGURfZhhwFQNCJr9jjWZQY="; + sha256 = "sha256-ZMz0NySxzX2XHiqB8f5asvwjIG6kdIcq8Gb3EbAxBaU="; }; nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; diff --git a/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix b/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix index b3f48085d1db..12fe3a9c9e0b 100644 --- a/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix +++ b/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix @@ -26,11 +26,7 @@ in stdenv.mkDerivation rec { sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99"; }; - phases = [ - "unpackPhase" - "installPhase" - "fixupPhase" - ]; + dontBuild = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perlPackages.perl beancount ] ++ perlDeps; diff --git a/nixpkgs/pkgs/tools/text/mdcat/default.nix b/nixpkgs/pkgs/tools/text/mdcat/default.nix index e298a56c58c2..67f69ecc71d2 100644 --- a/nixpkgs/pkgs/tools/text/mdcat/default.nix +++ b/nixpkgs/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-bGXuYGQyrXa9gUEQfB7BF9K04z88r1UoM8R5gpL2nRM="; + sha256 = "sha256-PM6bx7qzEx4He9aX4WRO7ad/f9+wzT+gPGXKwYwG8+A="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-hmv4LNk7NEYjT/5XXUpMd+xGS19KHOW+HIgsiFEWeig="; + cargoSha256 = "sha256-GL9WGoyM1++QFAR+bzj0XkjaRaDCWcbcahles5amNpk="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/nixpkgs/pkgs/tools/text/namazu/default.nix b/nixpkgs/pkgs/tools/text/namazu/default.nix index e5b3f59db8c1..e748515b0513 100644 --- a/nixpkgs/pkgs/tools/text/namazu/default.nix +++ b/nixpkgs/pkgs/tools/text/namazu/default.nix @@ -1,30 +1,21 @@ -{ fetchurl, lib, stdenv, perl }: +{ fetchurl, lib, stdenv, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "namazu-2.0.21"; + pname = "namazu"; + version = "2.0.21"; src = fetchurl { - url = "http://namazu.org/stable/${name}.tar.gz"; + url = "http://namazu.org/stable/${pname}-${version}.tar.gz"; sha256 = "1xvi7hrprdchdpzhg3fvk4yifaakzgydza5c0m50h1yvg6vay62w"; }; - buildInputs = [ perl ]; + buildInputs = [ perl perlPackages.FileMMagic ]; + nativeBuildInputs = [ makeWrapper ]; - # First install the `File::MMagic' Perl module. - preConfigure = '' - ( cd File-MMagic && \ - perl Makefile.PL \ - LIB="$out/${perl.libPrefix}/${perl.version}" \ - INSTALLSITEMAN3DIR="$out/man" && \ - make && make install ) - export PERL5LIB="$out/${perl.libPrefix}/${perl.version}:$PERL5LIB" + postInstall = '' + wrapProgram $out/bin/mknmz --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.FileMMagic ]} ''; - # FIXME: The `tests/namazu-6' test fails on GNU/Linux, presumably because - # phrase searching is broken somehow. However, it doesn't fail on other - # platforms. - doCheck = !stdenv.isLinux; - meta = { description = "Full-text search engine"; @@ -39,6 +30,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; - broken = true; # File-MMagic is not compatible with our Perl version }; } diff --git a/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix index 0e13e4c5f35c..0dff6d76fffe 100644 --- a/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix +++ b/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix @@ -30,14 +30,13 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "11.7.3"; - disabled = ! python3Packages.isPy3k; + version = "12.3.0"; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0gs2w9kl5wwrs0hx2sivq3pdvpf3lkaifblwfbz5g31yl770blji"; + sha256 = "122yv3p0v4fbx30zgppcznwnm7svg97gv0sa103xb6zcld68ggn2"; }; nativeBuildInputs = with python3Packages; [ @@ -64,7 +63,7 @@ buildPythonApplication rec { pypdf2 pytest pytest-helpers-namespace - pytest_xdist + pytest-xdist pytest-cov python-xmp-toolkit pytestCheckHook diff --git a/nixpkgs/pkgs/tools/text/papertrail/default.nix b/nixpkgs/pkgs/tools/text/papertrail/default.nix index 57e79b08fda8..c3d005a97e08 100644 --- a/nixpkgs/pkgs/tools/text/papertrail/default.nix +++ b/nixpkgs/pkgs/tools/text/papertrail/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation { name = "papertrail-${(import ./gemset.nix).papertrail.version}"; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/tools/text/reckon/default.nix b/nixpkgs/pkgs/tools/text/reckon/default.nix index b37928fc7c5b..3af64e39ed17 100644 --- a/nixpkgs/pkgs/tools/text/reckon/default.nix +++ b/nixpkgs/pkgs/tools/text/reckon/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "reckon"; version = (import ./gemset.nix).reckon.version; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index e45eda3326a1..640bf49fc16b 100644 --- a/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.8.4"; + version = "0.8.5"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "1rbsngfw36lyc8s6qxl8hgb1pzj0gdzlb7yqkfblb8fpgs2z0ggyhnfszrqfir8s569i7a9yk9bdx2ggwqhjj56hmi2i4inlnb3rmni"; + sha512 = "0gvrjxvizpxm5xvw8v2jygmx244wdl9n75qxz4chqbzkwshk4gwscz38p7sq9qlsbq8jmnv4l095a9dl9b836kym38hh1bvzmdiflar"; }; nativeBuildInputs = [ which ] diff --git a/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix b/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix index 47256f9f7ee6..33f8481bc1a0 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -67,6 +67,5 @@ stdenv.mkDerivation rec { homepage = "https://jwilk.net/software/pdf2djvu"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix b/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix index 8365163c2fcb..6b64ee466090 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix @@ -44,6 +44,5 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; - inherit version; }; } diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md b/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md index 71c42917394f..86e650afd46f 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md @@ -35,13 +35,18 @@ See https://tug.org/texlive/acquire-mirror.html for instructions. ```bash -curl -L http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz \ - | xzcat | uniq -u | sed -rn -f ./tl2nix.sed > ./pkgs.nix +curl -L https://texlive.info/tlnet-archive/$YEAR/$MONTH/$DAY/tlnet/tlpkg/texlive.tlpdb.xz \ + | xzcat | sed -rn -f ./tl2nix.sed | uniq > ./pkgs.nix ``` -This will download a current snapshot of the CTAN package database `texlive.tlpdb.xz` +This will download the daily snapshot of the CTAN package database `texlive.tlpdb.xz` and regenerate all of the sha512 hashes for the current upstream distribution in `pkgs.nix`. +Use the url + +https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/$YEAR/tlnet-final/tlpkg/texlive.tlpdb.xz + +for the final TeX Live release. ### Build packages locally and generate fix hashes diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 32fba9a8e1f3..05c1644c8c7d 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -309,7 +309,7 @@ latexindent = perlPackages.buildPerlPackage rec { preConfigure = '' touch Makefile.PL ''; - buildPhase = ":"; + dontBuild = true; installPhase = '' install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent mkdir -p "$out"/${perl.libPrefix} diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index f553908d9ccb..1367d651a091 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -50,7 +50,8 @@ in (buildEnv { "/tex/generic/config" # make it a real directory for scheme-infraonly ]; - buildInputs = [ makeWrapper ] ++ pkgList.extraInputs; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = pkgList.extraInputs; # This is set primarily to help find-tarballs.nix to do its job passthru.packages = pkgList.all; @@ -120,25 +121,49 @@ in (buildEnv { mkdir $out/share/texmf-local ) '' + - # now filter hyphenation patterns, in a hacky way ATM + # now filter hyphenation patterns and formats (let - pnames = uniqueStrings (map (p: p.pname) pkgList.splitBin.wrong); + hyphens = lib.filter (p: p.hasHyphens or false && p.tlType == "run") pkgList.splitBin.wrong; + hyphenPNames = uniqueStrings (map (p: p.pname) hyphens); + formats = lib.filter (p: p.hasFormats or false && p.tlType == "run") pkgList.splitBin.wrong; + formatPNames = uniqueStrings (map (p: p.pname) formats); + # sed expression that prints the lines in /start/,/end/ except for /end/ + section = start: end: "/${start}/,/${end}/{ /${start}/p; /${end}/!p; };\n"; script = writeText "hyphens.sed" ( + # document how the file was generated (for language.dat) + "1{ s/^(% Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" # pick up the header - "1,/^% from/p;" + + "2,/^% from/{ /^% from/!p; };\n" # pick up all sections matching packages that we combine - + lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames + + lib.concatMapStrings (pname: section "^% from ${pname}:$" "^% from|^%%% No changes may be made beyond this point.$") hyphenPNames + # pick up the footer (for language.def) + + "/^%%% No changes may be made beyond this point.$/,$p;\n" + ); + scriptLua = + writeText "hyphens.lua.sed" ( + "1{ s/^(-- Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" + + "2,/^-- END of language.us.lua/p;\n" + + lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") hyphenPNames + + "$p;\n" + ); + fmtutilSed = + writeText "fmtutil.sed" ( + "1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" + + "2,/^# from/{ /^# from/!p; };\n" + + lib.concatMapStrings (pname: section "^# from ${pname}:$" "^# from") formatPNames ); in '' ( cd ./share/texmf/tex/generic/config/ - for fname in language.dat language.def; do - [ -e $fname ] || continue; - cnfOrig="$(realpath ./$fname)" - rm ./$fname - cat "$cnfOrig" | sed -n -f '${script}' > ./$fname + for fname in language.{dat,def}; do + [[ -e "$fname" ]] && sed -E -n -f '${script}' -i "$fname" done + [[ -e language.dat.lua ]] && sed -E -n -f '${scriptLua}' -i language.dat.lua + ) + ( + cd ./share/texmf/web2c/ + [[ -e fmtutil.cnf ]] && sed -E -n -f '${fmtutilSed}' -i fmtutil.cnf ) '') + @@ -200,7 +225,7 @@ in (buildEnv { perl `type -P mktexlsr.pl` ./share/texmf ${bin.texlinks} "$out/bin" && wrapBin - (perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose + perl `type -P fmtutil.pl` --sys --all | grep '^fmtutil' # too verbose #${bin.texlinks} "$out/bin" && wrapBin # do we need to regenerate format links? # Disable unavailable map files diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index c26b944522c9..4497cdfbed26 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -109,8 +109,13 @@ let pkgs = # tarball of a collection/scheme itself only contains a tlobj file [( if (attrs.hasRunfiles or false) then mkPkgV "run" - # the fake derivations are used for filtering of hyphenation patterns - else { inherit pname version; tlType = "run"; } + # the fake derivations are used for filtering of hyphenation patterns and formats + else { + inherit pname version; + tlType = "run"; + hasFormats = attrs.hasFormats or false; + hasHyphens = attrs.hasHyphens or false; + } )] ++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc") ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source") @@ -165,7 +170,11 @@ let src = fetchurl { inherit urls sha512; }; inherit stripPrefix; # metadata for texlive.combine - passthru = { inherit pname tlType version; }; + passthru = { + inherit pname tlType version; + hasFormats = args.hasFormats or false; + hasHyphens = args.hasHyphens or false; + }; } // lib.optionalAttrs (fixedHash != null) { outputHash = fixedHash; outputHashAlgo = "sha1"; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix index 6cdcde78cc56..a42b384803ac 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/pkgs.nix @@ -584,6 +584,7 @@ tl: { # no indentation deps."lambda" = tl."lambda"; deps."latex" = tl."latex"; deps."plain" = tl."plain"; + hasFormats = true; sha512.run = "7d9241eab3e1e34f8c1aef85c4f2278680cd147cc4f188194c8c27147df3b9bf2a3bee7c651227aac79996e0745124990950ddc010a4f6662fda4a2f72575211"; sha512.doc = "87de188abf9880f2e680d6582cfb20d8166eb0c3ed2d3a85971eeac6ba8abea2d7f46b8037c26b719c1289f778d4e94ae1813598e73f8f56f6224e3299852cf6"; }; @@ -862,6 +863,7 @@ tl: { # no indentation deps."knuth-lib" = tl."knuth-lib"; deps."plain" = tl."plain"; deps."tex" = tl."tex"; + hasFormats = true; sha512.run = "d52e4a817f839c95b7718c65b6cba571443f9f25533a9c7412a69b3f15c89e995494ed812ead2ddac9f0952e0e842216a7fd443ecf2360f50a36107241397c19"; sha512.doc = "ed91ca4af98a72f081aa021b598ed58888150a73346d5d8da9ef7171f7d757c6d690169e1eb4b3e409ed8b988b8ffff9475f35ca7a443074080c1c9568ebaa0d"; hasRunfiles = true; @@ -10423,6 +10425,7 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."stmaryrd" = tl."stmaryrd"; deps."xetex" = tl."xetex"; + hasFormats = true; sha512.run = "61fcc778837ecff88bb0e80e39e2acb3ee64e2c26e4069f7634e5dc6c74dc93caab78e4b0088ed58f494d6dcd3a5084bc55cd471baaeb292dc208cf2a241bf69"; sha512.doc = "ee4458cd6d45a41652ae24b3b82bea5cfa2d8b9c14cf4ba1357f9f07d6572f8ba83e350b74659c471ebf5068f33f5c5762a11669ab2a4f5adb3db41f392956dd"; hasRunfiles = true; @@ -11077,6 +11080,7 @@ tl: { # no indentation deps."latex-fonts" = tl."latex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "dd6b98eb22786f39c830a4c012396507dca694d727f1a7eb147a1c8c2d4442d8120e016de4c08c038239dfac866f828bc7686d8fd124d1af63edd0994db80f9f"; sha512.doc = "8ec3527c25c07641788b809cca4f4cc8bb034f63f1100b74270041b503dbc8926a410429a370692502596bd6ffec69a970a19b1c32178e4722f81acdbf0ea934"; sha512.source = "0563f453bf7e34b4948a29d832207f8148082c5186a6915a6bdc1c41d0c08399505491ccdea0b45e8bf326a8e8459d37eeaca546143d9f622ce4dacba11cac7f"; @@ -11094,6 +11098,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex" = tl."tex"; deps."tex-ini-files" = tl."tex-ini-files"; + hasFormats = true; sha512.run = "27fc3fbb1aa29693fcd1d39abf92e3248fa769b8c4e0171948c2a7957e52dad2e08759050321401f7cb900285de62246bc0013d22141281111a82681c11802e4"; hasRunfiles = true; version = "Mar._2021"; @@ -12018,6 +12023,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "ed2a3c4d91ecc125ecc2179594e66b5bbe66bb806c1b232ae1b71fdd0d29152a2d28e3dc6dbb2e1724650b8b8cb67e8c8bdf5b7506357207ba61c636768fb8c5"; sha512.doc = "e40955db986b94bb9bbbbf9daaf6a12d2898ae736741fb0a5626755b55908b056a2b4dbc1d87e9681201d7e45c99297393d6e1d2de17d135d8d74c732106897a"; hasRunfiles = true; @@ -13809,6 +13815,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "a5b93a081e9b2201a65bf7e7fb01381480f5c1f31aafaa78c5785981d895a384f1f8db1d474db845c06cd0850cf70ec4bec0e3935b67fe506b8b07512ee97479"; sha512.doc = "44d804287cdd427043f766ea9f5f352d93d65f941b3e18727dfc9276fc381f51fccb3a025707f24dca5efd59cccd1a340e5de0d452d928ec0296b4faa46abf67"; sha512.source = "8edb47575e32de1d7947bc2b7e1e354eeafe287cce6b4c7bafa1266d9d7c1bd4c8df363ecb4c17da9eb35cfc1e3393e2297ae6d90f9f4aa8147b4467e2ae1c89"; @@ -18001,6 +18008,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "0f969847994b3b377c752c23f802e8c51b4076efc2d43ad2560a72b83cea3bf0a64d7df18a59afe4289a4547a9f23cf81b0c365a499be85a2467579941fa9700"; hasRunfiles = true; }; @@ -18009,6 +18017,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "3f91560ecf78c5540fd4f5d9890f6aa7a57bcd3a41095985785505b82e40793b91a5da3a01bdc021b11c32db3dd7030a104686b34b496c9094acfb85509cd007"; hasRunfiles = true; }; @@ -18017,6 +18026,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "85012062097dd4b624cb39c68b293169a25ab3c9cd15b4474c3a3ffbe4b8ab13d6856c6c70a580da45a2d210952df2d9760682da3917cfd24d17772dc2ccce7f"; }; "hyphen-armenian" = { @@ -18024,6 +18034,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "59538414bf5a4701199100fbd9d5247999a36bc28c7c6ef2a28deb9024e01605d48839f00f345c848365853ac3a9f1aab7402f44860532d7a5c099d2f27ee189"; sha512.source = "d25e6347545e00a809db1dc8e48ef3fe67678b9ec93a1f3619d2a5a3d786d6e411c2e9f905120e3c5d01d9489c0a83035ce8025836249c88ee768bf07b8e2ca7"; hasRunfiles = true; @@ -18039,6 +18050,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "b90680dc5692824d60ca603e8bdd2fcade7cc772c8c0f9538d579704fb16165db2baf0c466ccaff46d92491b4a678fa86a127c0d106dbef6d640dfd2f887663d"; sha512.source = "75a20da77fa056c719ecc1f014bb09c67f62f1c4a3abe04b7cadf45c7a4e06e4492cb0d34a8025f19f3ee5e3330e488212885095335d4a7e97baa5b106576223"; hasRunfiles = true; @@ -18048,6 +18060,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "19b9bd10d2357d0cb6ecc9ddb5e46b65b3c0eec1b2917a78311f255c1609bbb86595ce617d331271a72de934ae4001597f4a04d61b3810e34f3b197b21cab193"; hasRunfiles = true; }; @@ -18056,6 +18069,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "9763e6ece053594b01cd9255a8a3551eb6b86ab082f6f9283664e256c55d43b9513b624774a650d83215d656334751f569496030187c1c78e2fe80f2d10f2f1f"; hasRunfiles = true; }; @@ -18064,6 +18078,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "37189e09ee902f2c5145f30180b51211091b07d7d04125c98f1b7c424ad27f6899424b78cd17c559509076eeeb957b4f268fb4130807e7fafb461174fed8200b"; hasRunfiles = true; }; @@ -18072,6 +18087,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a78b70095fcfe297e2d85a49108affd5d48451ff4740461eed46d395410a665011614c9a89dff37e9477ee3803de6ebaa68595ac39222f2968a4124355ea7fa7"; hasRunfiles = true; }; @@ -18080,6 +18096,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "c44b3f5fec7b44958336dcfb1a43c5b71fd1715262278863f5fcd74d7ec0cc6f1d572b741256d791e6979f15e4b0fcda8058725e27f17e1deb6e5df5fdb007ab"; hasRunfiles = true; }; @@ -18088,6 +18105,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "fe36adfe900e23f2b0c3e9c3a3d96b608c49bf597222537d355d6a68e2f87f587db78a1921ab1c9a80ea175529e353524c35e99b83ef7f5515ab7c0aacd2f680"; hasRunfiles = true; }; @@ -18096,6 +18114,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "8355d0aa95bb2e72bfc45015f9ae9f6a138f94441387a4daadfec5be4060878f6e69d05eab15432d99c256c1a3f68c122d5c915164fe343459d658a4543ddf42"; hasRunfiles = true; }; @@ -18104,6 +18123,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "f5c8b08c2db716dfa6d36fcf337b4e18372978d04e28ff2c8ed0a0b3866f4bb3efb7b498fedbfde5052fc504b8677ae553c2dce73701e219632d8c5460d7e826"; hasRunfiles = true; }; @@ -18112,6 +18132,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "954543a3fb81ff00d9c58315ba59d7a5e3430217dda6c1453bcb7ffb0516025dea4b877eb9d66c9f80ccc69d3d4895bdc6ae1b611d8394435fa647b8b806559d"; hasRunfiles = true; }; @@ -18120,6 +18141,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "111371e47ca29069a5a9144d694858dd899b19e2b38d0c793b1e4884c69ae2d62398aacb4cd89e23246fc025e42872875bc808c1f327ac1502fac88c962e6c14"; hasRunfiles = true; version = "1.1"; @@ -18129,6 +18151,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a305cf89138e4327844d43a7e21773e31ac97a4655e4d58ae9a46dc0df565e432330debf704c37b4ad552561357521eba0b676755544ceb9c4f21ace09d6dd2c"; hasRunfiles = true; }; @@ -18137,6 +18160,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "ed2976e9fb3eec5d2f0759348b284129e43bf161db571dd21270335388b8aec57e1b8393bc9b246f8a6e9cde22f93a4cb3c1a03dcadd64fdda3d70b576789050"; hasRunfiles = true; }; @@ -18145,6 +18169,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "0eb91153214aaca8c3b5816f5315f9afdeb7c19521c87c79ea2b35e82217bfb23c8bb774baf810206f4413fc663e441ebe6b4962880ca0dbcda9209d2acce3b8"; hasRunfiles = true; }; @@ -18153,6 +18178,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a1532603758e7f774acba7c13ee74f0046ff187598ca86b2e93b91da31317f03fdbab5d4d7c0814978fb2ac159bd6e5a48e6e734c19758da21ad0a031844f52b"; sha512.source = "9d6c8c1b0ce5c40d388937328461336a97fcf1fe780fa6198e029f12ef118d9d98f6eec03ea217743851f0217217d6548298df9336fcf33e6c4c196bbdb9eef0"; hasRunfiles = true; @@ -18162,6 +18188,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "5b02582769a55bb07d81e748e83170c16aca1c33b0a240cf547fa9c2212f2be52223e258229c760ddc5dd730419bd9e761614cc4fb3b3ba8102841bb779af511"; }; "hyphen-finnish" = { @@ -18169,6 +18196,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "6aa171d77952165cdcb1b667885f16dd382124ed70ed1db80a9a89553d972720d8ff5f0da1b36669e02c3030d9ff362ab77ba1fa2ba45cddfb460018f0c0191d"; hasRunfiles = true; }; @@ -18177,6 +18205,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "b9d2d05311a90f4caa6c4e8aa8a2e80e9c15fc3552f03f0ac6ec70d386610612715deb6e778247248355a3a209fb2413d6d2aee12f18bc35d5a334870b612507"; hasRunfiles = true; }; @@ -18185,6 +18214,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "d1775a9b6e6b7fa155e44c93271e2ccb41bd1ec143ea0cf624841ad48a123db924dd134e6e60b862a808ad2058ed5b86cb34d98e5728b9dccd3997ba2f06932e"; hasRunfiles = true; }; @@ -18193,6 +18223,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "2d707542f80dc94ad20c0daa776df23b773a5e6ccb261e11db675e1e89f5f303a4f5cd50d97f491cc7ea8b0f3c0d3f6391707812a95d4e72cca3afa7815e566f"; sha512.source = "b9925168b1f9ae5139ffc3bd34810cc05a27475cfae31e98fd0d7618575fc994ca95d7479506024abec2c33bb20121811244d69c490df18a29d6c93fe02174c6"; hasRunfiles = true; @@ -18202,6 +18233,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "edaf041a2f92b0f7dbf28042c81838e8fd781cf9c3ad529c314227c94917ce4e8728ca676f8bd42e2a81bae76b11aabc1e22896e3ef9cd38ca4b718bc58fa0cb"; hasRunfiles = true; }; @@ -18211,6 +18243,7 @@ tl: { # no indentation deps."dehyph" = tl."dehyph"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "bea7d4605b1a18d3e7845ccaa06951b62178b3abbdc13dc59d3cbece3fa95fc4fba7e4d60dd253cd9fc022f804975cae5c4996fb99d3037c29971ade9984abce"; hasRunfiles = true; }; @@ -18219,6 +18252,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "3da84f41aaf7e5d4be0ce609e4d119e65c9189ff6662051cb7e879e9e373d990ef1c59ac7cfead1bdbc6e55b52d4b3ed28d157b22dbec43e5226f16872d5a7de"; sha512.doc = "865aaf1f9f0fbe130f9006e41ef677713667832745fc24c28cffe805a540a19f7104a3f0fef3258ba0e16c1c456959904887899a4c584338c58de7fcc80c5419"; hasRunfiles = true; @@ -18229,6 +18263,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "868a4c3f4d0eda078054026bd1ec35e05c2f4013e093bf58147bfa2d861814242b55a900ce60384767558c9552ff9d41cf447e2a157bae83bd2877251012d96b"; sha512.doc = "164180f0485e16a49ba83dcb4721902e8a29f399032d4f5a59d55e424b8178a25dedd9fb99919d9d772142342fb78fe0dbf7a5303382a0b7feae4a381b76f8bb"; hasRunfiles = true; @@ -18238,6 +18273,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "69add7ccde189e86810e2a82692a260de9a9fcc0ba011352881d202d4f4c94c4dbd84fe36dff40ef9b9ad3e8e990947cc61022307790f13cad56744f3ef5e41f"; hasRunfiles = true; }; @@ -18246,6 +18282,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "765be1c13ef3445b056b61c24460cc2f18bad038c04541bf4773c7f61c6d26be25d3079b260a1b9623e2f01155ec52eb5bc87b0ea9234e50a5ca24dd8a7a5937"; hasRunfiles = true; }; @@ -18254,6 +18291,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "3f04a63010c02d77cb229c90aec9f1079557493958573be9ce992ac5ae3c229f01f9abc0cac785d9340ff48aa169a01f8b327ecb2e255bef57f1fe85d04d1d2a"; hasRunfiles = true; }; @@ -18262,6 +18300,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "dfed82ea70f25d452726b5cd03d8e060bddc23cbbc5deebab2ddad93ce6744c38d357327fbe570bf7a1444f62cee0cc422a6c7d066d6693a238d851b4fe46e32"; hasRunfiles = true; }; @@ -18270,6 +18309,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "478a77c4ab8231a3041c3427075f16c072f58a394eced8ff0cd5da6544f3f2fd65722f33fd8344e18060c96f09bd18b90af71f8508639fc9c59d29d704d9e348"; hasRunfiles = true; }; @@ -18278,6 +18318,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "4e79ee31893d6c948a3aac8588d4beb75d89f89df973b1e39cd63894e008af55f8dca774194d7eb105fb0aef692b17bb645d5bd85cca7debafd74aabf241bc30"; hasRunfiles = true; version = "4.8g"; @@ -18287,6 +18328,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "e5114da178fc841b1079130c01f8729ac94f0e3592dbd479f44a978ea009fd75b410d6130d9badd6227d115d8f6dad3ed4b553dbfbf4f80be5d1c2adf108e2fa"; hasRunfiles = true; }; @@ -18295,6 +18337,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "9d0db7fcad4ca764379957fa22f9daede79898bcacfbdb62abe54318a52dd82a66f8e39542c18008e3f6b6d0db284b1e9b891531d3c8f3c9cf22c764e83d57b3"; hasRunfiles = true; version = "3.1"; @@ -18304,6 +18347,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "85aeadb0cb3c5de9ef48057132ccd958d17f014b07b56b9ebe2186a709c4e7646fad260e156718e43ec3eac88681654f88c9b53a6d71fb3eaee934dcb4439ed9"; hasRunfiles = true; }; @@ -18312,6 +18356,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "7a691e3c55c768b9ea5ef13552dc42025ab613df0a0d5c0d54aad58b63da11a93e59bc53e6a8211d5e054cbea8500846da01e9619bbee723d648e2d369a49d55"; hasRunfiles = true; }; @@ -18320,6 +18365,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "f88208291212874df493151581205d1b270b2d4278176c42e11edac9b344b73c2ee859f93b6947e4a6003a00abc4d3753024add9caf84f114c8a0cec72aa8c8d"; hasRunfiles = true; }; @@ -18328,6 +18374,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "159562a8feb25918bc422e7dc78a46423c7fff2f3c61016a0162761411999a5555be3c6e36cf967d5034f65c12f4b0834ae0c0423c2f3ab17a65034b1803dc72"; hasRunfiles = true; }; @@ -18336,6 +18383,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "8b02e90bfcdf3c6d4bd1966b21e0512069f1749c638d537e9553f68e61e0bc325db8d3b462f45650db4376c7a769c2cde3e0c0601d7de272898a23cd2251c064"; hasRunfiles = true; }; @@ -18344,6 +18392,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "b0743d1f6083dac7a347e22aed19d0c5d76119582e4862557a55b817b17dddaa69a2150f14daf6b08689278dd61b27c1b6ed45df5601dd6327bf185a7a46a5c6"; hasRunfiles = true; }; @@ -18352,6 +18401,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "fa7fc73edd582ba20b8236507385f0a30f477bb9c79e35fea56aa4020be966b9c4a16a327848dd051fa4cf6e6117ef8a51eb92ed6cb72f6993cb290fa5cd5ca3"; hasRunfiles = true; }; @@ -18360,6 +18410,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "5580b3865ff8d20d475cb962b0257b909ff0e410b6776cb8153145fb0ee42b2f777069413bc6b3622c8c52318aba1ba836210e8972c5b6a47ef978c24fc8848a"; hasRunfiles = true; version = "3.0b"; @@ -18369,6 +18420,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "9d9ab3e616522ab9837bb7c7509127f998c442e96f96ee6b6fc0fdc9ac53fd03319d0c0ce28e23a35f1ae0ebb840cdeb19e8ab6444549c33059b28e7b307486e"; hasRunfiles = true; }; @@ -18377,6 +18429,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "124a93a633731dc1b3d6cbf2fc9b8489bf0737911a0c25ea44dbdfffa07c165ba5804dfd7e9cbe0be3b6eceb9fd6e95daefcae2356ee140f644416bbe1b13507"; hasRunfiles = true; }; @@ -18385,6 +18438,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a69d3881493c70cfd58e3d79ed76ce6f18bbcb43e1683f31270eafeb743b366a3c52c9945ff94db333e88ca18145263ba74002f5e78bb42d7aefa48c66af7955"; hasRunfiles = true; }; @@ -18394,6 +18448,7 @@ tl: { # no indentation deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."ruhyphen" = tl."ruhyphen"; + hasHyphens = true; sha512.run = "f17852dffbb8f5c337b8316b92c2b0a60a318df491231047d9c0930d55d8b2be3274ec94d0d87085d53e06e89c585d47250f046300bf3890ce751f6f2052d348"; hasRunfiles = true; }; @@ -18402,6 +18457,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "e84b6ca93e922c9c6edf03f4dbec1fae9eef2462379ef2fd0f3508a5048b54819c5ba12e0d76bafe1336666ca74ba95e27f63224fa048068bc515f3bc41f6eba"; sha512.doc = "95c6ae15687118ffc9019c8634347a602e6590b4a1d18bc060e57fe548a81f097070322975be1f62fa2685c5affff7f31b4854b0ec941bbcb9377ecf16986cea"; hasRunfiles = true; @@ -18411,6 +18467,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "390aa9c116b6db7b362fc57aa0758a4c489c5fe33c718fb37675b17a9772a463ce532a2ace3e1ef90275b4afef5ea8d6cff71a7abe625d84e3f461c115306452"; hasRunfiles = true; version = "1.0a"; @@ -18420,6 +18477,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a0786980e0cda7029a72075023520acdc998b83226e85deb0b8186ee4293560321517d507f74fbe68f1d68a16cd8af67aae68baead9176f9cc687bcc7d0a72e1"; hasRunfiles = true; }; @@ -18428,6 +18486,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a605c9149ae452df8b2c25aa0f6bcdde53150e4485147a065f1f56c9740c3544c5c7f9c6049aea913916a62aabaf40777cf6f0f76a858e485c0bd09826a6ef5b"; hasRunfiles = true; }; @@ -18436,6 +18495,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "d6783537ff44a326b83c2004afd63f5bdbd162fa4865138c2e6d34c9e6a103ac41dd7b382454646b09c74970f8e0d5827a5f4af617936f74fd300b2054a096d4"; sha512.doc = "263fd9480c5f225c7e36169b86e846baa64745b83c1072c9602e873f2e7cf8e63b07ab85b29e9d4263656faff58a39fe83e1eba34517b8ba34720f189c8e7f43"; sha512.source = "b1ceb7602a46ecab68fb767ffb154f0dea9626d81bf6c46dd43be328204f72141842c81efda9d7d51997ed25356746e345f7cd9f9ed88ac2f99746794becb75d"; @@ -18447,6 +18507,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "5f993ae6b22eadb87b6a1839bfa7d78a0dccc1107c5afbec8c248ed001018da38bb179e29f2430cffa90283221b20c5475346a8d5566edf16152266257f2a37d"; hasRunfiles = true; }; @@ -18455,6 +18516,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "8336eee03250859ab4328ad3c1fe437d2af688ef56b43be49c45838965ffe033befa84cdf600e9f48cdf60cbbfbff44450c830bd4c34556f680c5096ed3aecc4"; hasRunfiles = true; }; @@ -18463,6 +18525,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "5c7023e01bf59af4d36bd451f51ae00c445711c7ecf109c9d835f1d689446d7b0b1b2627b7f9e84e4f4a8ceff52227ff280ac64481e1d29d538a30e093dace85"; sha512.source = "2aa80889b9657b03b6beb6510b6790fba13811b97abbac186eaf4d3f40212b41db0dd2d21583429820faad558b0415a09aa8254d2edd96812cf6396fb18ccf5c"; hasRunfiles = true; @@ -18472,6 +18535,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "c984bb7f09c5816c36a7a790f16df1750ee90f36e2130994ecd1db63f26afb650245985699a80da9b4d7004ad67106771d8c7b79262438369aee3f52fd8374cf"; sha512.source = "a496f681db0b4b85d82ec1dd60c057f63b6d1c1b52d391e7bee98d3d6e1fb596701c91f2ca400d0df13b96ec7a43d275646b7d2874fe1e4efc9d9b2b47f6cc5d"; hasRunfiles = true; @@ -18482,6 +18546,7 @@ tl: { # no indentation deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."ukrhyph" = tl."ukrhyph"; + hasHyphens = true; sha512.run = "05a9111b358c659159c6edfd38b9ce3d78febd794cc82968dc3e2acdc3612786304721fbd07f00f0a8278f4c2e46a1bfad821b5da45e60546d6acb5bf9068d08"; hasRunfiles = true; }; @@ -18490,6 +18555,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "b2cb1bcd953ffabbd3f5acd8c72e9c60415fd300004de56ee446fc77d381aac1db65d613a2f591d3d0e45f2a12ff5340457ae3061b4c77de502923932383bdcb"; hasRunfiles = true; }; @@ -18498,6 +18564,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "12a23e0b9d00eb4381e3c97ecbb449faf5a73b755a17fc0301f1cbad5d0babb370aeec16dcdd316cefb56e142873abaa685288b1a1d3c7dcb76a07a9ef127ac6"; hasRunfiles = true; }; @@ -19318,6 +19385,7 @@ tl: { # no indentation deps."url" = tl."url"; deps."wasysym" = tl."wasysym"; deps."zapfding" = tl."zapfding"; + hasFormats = true; sha512.run = "985e1ed14e5db0a23e9be510e5a52456fdf07ff8c8746add0d1123fa8b8684b3a0c5d9e99e06aa193c667ffa2dd648419d4359a75685d6514e81b9ef0d92ff22"; sha512.doc = "bf83fb4dc700f10050d34905197a630f8de75a6a27146188efc254b831ad0d68cc873b610f7457a3dc1140a10793aa05c567749efc38225089014df99fc2c895"; sha512.source = "63bf7f94983a971833e1e1b7d33afdf684d83117e4ce846334952176641b45acfe0c18b2fe983c2f24d98e68e91469560c2c10582d53015d069802a38066280f"; @@ -20245,6 +20313,7 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "b349e8fad2765c4a87b471532dcfafedc0a9711237c6e967011727da7bad3a5ed27a89eca81af324aa84958872d0b78c68e6d9490fced44eb7636b2fbf36611f"; sha512.doc = "7cfb465f4db5089e7fa41762a0437f5f51445efdb9aba5d676dc5933e0fbcfbe0fda31baf83e20f2d16e6a7a0019c71752af8744d02ad12636adb9afb8cb3041"; }; @@ -20275,6 +20344,7 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "31c364be709db593c1a1d4e5250a7d8899fe0f5eb534c61c5f67d1a032b4afca9a91c5d2d1a541e96045d294c87d7ca1758a6a59bce8a3e94bf5511e20cf8854"; sha512.doc = "94474a52fb6a2bb801405c83562d6dd69038cca8d73705f382c2acc6c63d57e057a6b6c1b93556e41f5d0d9f9adfa269f0857c35e6523108eb230985752c3261"; }; @@ -21366,6 +21436,7 @@ tl: { # no indentation revision = 45678; deps."cm" = tl."cm"; deps."hyphen-base" = tl."hyphen-base"; + hasFormats = true; sha512.run = "81557b83acfa4ad42dfa6fb1a65ea42bc33885da444ee23bc3c67a899df7b3ac2c19a1607305b5ec10b503980365c5d29ac3598339fc186a05417ea5bca60a78"; sha512.doc = "206dee2be733e3ac04b5b259862b60fb3641fc44ea182da601ca54a010ff8e42f254dd01c03be7bcdd2a6258110c567a596ee82b4eb74d04ca8ed70e50cd6a86"; hasRunfiles = true; @@ -21863,6 +21934,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "bb198606ca33912f75327b0799061a81aeb9e2315182001710929d5a7c786fc11b58a5eadcc186f2db21df01777904ada31058c0a03376c04020b213d9f7c519"; sha512.doc = "9b7c72ad24d459b345552ee8ae05c047c61cf3e0b6eabb927e2a02bf62558f143e937463574bdb0cc60a0a4c8b2da3f86b1d9361275142519044051039275f1c"; }; @@ -21918,6 +21990,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "01777af9a468b6216417c5158034c3dea3cfb1c3ca7d28f1c4ca2b239fe569fbde410d17662bf9a10f5fddfd1bb6541c505d772e705832b52a1c2d6225d0fc6f"; sha512.doc = "a6a17f70a44655e1aba11ac1353cc13b36bee762083be76a31c04d90ae73d021659219a3a741b70f0b43888d6b6a6ab356f378fa5850a23ce7423b28a721e924"; }; @@ -22043,6 +22116,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "c16a8cfa5ce0991d4b667471dd32f692c4e340d1856a36fd684811d40322f912b94125ae101ba095ca6c54b2afa3a37f1ab9af83e4a10328f8c1a1906a02a44b"; sha512.doc = "0d2492075eb2bb6b9cc8a67b0ed53cf5a8c4c700797d8bce8061a4cf938db5cf19fa4ed6f7adb59b1da0701ff365504e813289dea3c245ad717c82bc58df9128"; hasRunfiles = true; @@ -22935,6 +23009,7 @@ tl: { # no indentation revision = 57972; deps."kpathsea" = tl."kpathsea"; deps."modes" = tl."modes"; + hasFormats = true; sha512.run = "7ea3271c2a9682ae5ee29a05a95e794f4a6dc5a6244a6c243e856aaa857310127d5593b0643d4ca53eae7feb9c205574f5ea216b7c3c0b731e7f98be99bf1588"; sha512.doc = "95e7221ac9e3438d4cae336296e7db855df9a7e49ebaaec5dfea294565824938f3d6544459cee9ecbf17312daad4e44c92a7a9a65269feebd2b819f226f305bc"; hasRunfiles = true; @@ -23088,6 +23163,7 @@ tl: { # no indentation deps."tex" = tl."tex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."utf8mex" = tl."utf8mex"; + hasFormats = true; sha512.run = "a79d6a1ecb15f7962826773d7eab4b1ffd86a5c15f8076f096fecf63df1bd661449eb7d14251a57a1eb2bede030ddf93aac170fc3c59ae0a124da6cef69e55be"; sha512.doc = "091f2825376718d8c2190555af7ef54d0ae5202425d57b986fba861df2f8604301df5a121ccfcfcdc91032d07dcda8289fb8de5d81c487b93b0e202a2a5a658e"; sha512.source = "6f20a7e4f80670f7dfe5b2cfe3357a5d16b0f627b5e9e95c2d7d46598e00b989d5ae8c797589c56c594b7d3610f5f79cad42f3bb64a628be968e4e9e5d541e98"; @@ -23131,6 +23207,7 @@ tl: { # no indentation revision = 54074; deps."luatex" = tl."luatex"; deps."metafont" = tl."metafont"; + hasFormats = true; sha512.run = "ec89212e9a1518f5502f93114377f07e88af787f15c64fc61f40f22a679384f8825384c694dd365d5a74bc5d9417dcf3932c634279550603374bb43df1a7a0e6"; hasRunfiles = true; }; @@ -23488,6 +23565,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "0b3fe440055cc4c943fe8cdee93997718a3625782c5b2962cb514011f2038ad14518f7cffc55dee41f0a57f7401b8f2f493631a2b9cbeb806ae75ae80269f3b5"; sha512.doc = "a3b962871878f3f34c2d419fa9ae1c27518f3901212796d32649b5524f49fa103a71f46403726b9568ac358ab98afe7b23356a0f2d2d8592c0b84cfc186d5f53"; hasRunfiles = true; @@ -23816,6 +23894,7 @@ tl: { # no indentation "mptopdf" = { revision = 57347; deps."plain" = tl."plain"; + hasFormats = true; sha512.run = "69181f1facef413b4e2317180f8dba551fe40bb06e6af8d9378319d8cd3fdec985241e632f19888f32b70f16a40d11c66581f7e3c409bc38b7cfad3733cba2fd"; sha512.doc = "f0cbd95500324a6b5ca835d62065c83028241e0ce5fa35a313458dc30e6726a21a6d1c267669627061d23f2dd7d7397f471581021e03c817c281cb6efa1d2769"; hasRunfiles = true; @@ -25260,6 +25339,7 @@ tl: { # no indentation deps."lm" = tl."lm"; deps."luatex" = tl."luatex"; deps."rsfs" = tl."rsfs"; + hasFormats = true; sha512.run = "d734139205c47599f3490dfbf13e6f71532ed7c311c3c76b6e444e539f1be6dd1bfffc612f8d019c38923d46ea7c98be72b28cf83c2b00885d787f6f526b0f0a"; sha512.doc = "285d74614c05d3776a41269da1156930024359eef282b3d5479a5397bdb928357ff3020d3fcf47bc92d8ce4ae37a9c4fd68c9e601d7083911145a2bed2bad4f9"; hasRunfiles = true; @@ -26007,6 +26087,7 @@ tl: { # no indentation deps."kpathsea" = tl."kpathsea"; deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; + hasFormats = true; sha512.run = "17c2b07af5e14f9f581d1094f4a3657ec1fe2b19fa96d952d1e4859265dc26e42743dc1fd7e8d6a7de56867be1b50a7071524d0580a8a680c605146893e7ff1b"; sha512.doc = "8422210dceae381676a4c03784ab2c9b0e9233913eca6d25a9a7d5c5675f9ecb32f0a93dd624dbcc715f20d7e386a7844ea00e6e85473c1af14f8e384cd3f61e"; hasRunfiles = true; @@ -26720,6 +26801,7 @@ tl: { # no indentation deps."ptex-fonts" = tl."ptex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "787554d26ec4acb3811efbe96349a51b517e5b3b4677754d94dfe1d0ce61088d016f21995e5e9f49e1ace76a1e1f2c057c126981a9e340a9e047597f637aae3e"; sha512.doc = "f0085548bc20f0389d475a9abf294a8713d36184aef1c65e12d5a7621a4f60e26cf8b63f6a1d558afe964f633455fffd9f492e749938c290b91c10e02c6cb4d7"; sha512.source = "50afb0b5a1b766f89d7f3dda64b74f080a06d25d66618a4466018209fe4e3245f8deb274b22e30b45fac0a8a9f903ae70ec0301bfb72a394ebc3759e065205fd"; @@ -28253,6 +28335,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."ptex-base" = tl."ptex-base"; deps."ptex-fonts" = tl."ptex-fonts"; + hasFormats = true; sha512.run = "d59108f06a06b7ac46195ef05c0ba6fb4873a88d327839a6143e94392faf3df73ae7b128548ae1ab69915f9883bad554f0e2dbd8d36b8f8c959897210895fba0"; sha512.doc = "4f863d89fca4c137a84fe75365f600da96f3901d29dd98e9d5733523648b746861a22284707c6e9df90a9939c83adc7bcdf21b310785b8d403459d65294d1133"; }; @@ -32394,6 +32477,7 @@ tl: { # no indentation deps."knuth-lib" = tl."knuth-lib"; deps."kpathsea" = tl."kpathsea"; deps."plain" = tl."plain"; + hasFormats = true; sha512.run = "e38f62fcc5ccee22a909eae5ea196e055eae59eedc652ce9788a3b4520995e97f64c683f1ba940853a06030a7ea6f1d749ed4dda1cb30433f87f5f9cdce5a9a7"; sha512.doc = "3056263569276ca7a62ccb03542eac99b648d36c398ded17204a2624f06920c506985aedd1a639a48bc60af6394d091cdfd9ec44000730bd8e8c83c2234bb569"; version = "3.141592653"; @@ -32801,6 +32885,7 @@ tl: { # no indentation deps."knuth-lib" = tl."knuth-lib"; deps."plain" = tl."plain"; deps."tex" = tl."tex"; + hasFormats = true; sha512.run = "7309726b33eadf8290e596aab50bb1af95600a067338b352c1ac092643a8c6d4142180d0146abbbb828a38fb08fdd9ae03da6572e6c221afcd151a51430a423e"; sha512.doc = "2a4979a10514ccd589b331ff34a677a4e22adbeea73d6112c9a14392b3ee75a8cdb292b008b160792b3d00b812834afa7e0211db860c41f1beb69bbc900fdb90"; hasRunfiles = true; @@ -34920,6 +35005,7 @@ tl: { # no indentation deps."unicode-data" = tl."unicode-data"; deps."uptex" = tl."uptex"; deps."uptex-fonts" = tl."uptex-fonts"; + hasFormats = true; sha512.run = "8acef423a0359136795301e1deaba156c702ee360f309d1884a90b3ed89842389bcc015e70c1461611ebb4a21fb9d5853db5ef40226ce0f61eb11f2a424a70f4"; sha512.doc = "7cbc40c770c1e04114add004fc4920e3c7dea62f959d06fcbfe54b9fdc45893214ef3e960ac685cce258b07fab424aa7a242da368aa1ee0015ddf8579d582820"; sha512.source = "9c1c1d0fec518410938e6642123f64242a6ff0bbb6425945897c10754e436fbd82d6739d31717152d183da385800a569d9209f37dd38c8eb77767842e0822a67"; @@ -34960,6 +35046,7 @@ tl: { # no indentation deps."ptex-base" = tl."ptex-base"; deps."uptex-base" = tl."uptex-base"; deps."uptex-fonts" = tl."uptex-fonts"; + hasFormats = true; sha512.run = "1ee2679e7531fe4406fea72f7efc482f7900da50cb74045a62c0b5e5596862011509c3d966a795bc13538170afd7db26e8cf4f406391a746e45804414f26cff0"; sha512.doc = "06a3459702bc9838f2246aad7af99c427413a43356d88165e68a132bf8b926d9ab668e6dc10127c27eaac6526085c3fa069bb9709833cef241c94d0f4fb3e02a"; }; @@ -35893,6 +35980,7 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetex" = tl."xetex"; + hasFormats = true; sha512.run = "93df696d59d088bf5808b5dfe0ad6a834b65252dfe1f06cdc0d2f446a57b97751c08464e58be40ac042cc508d5f846696561d6524bbb84234af11fd3b7c61d00"; }; "xellipsis" = { @@ -35960,6 +36048,7 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetexconfig" = tl."xetexconfig"; + hasFormats = true; sha512.run = "dd788efc6e03e11e2dd88d8e63ca2153e936194391d49ce422a757ba1937986cb80faafa71860bf55ef5cbab51b53cd0c85c60dadddd92940802ede301cdefd6"; sha512.doc = "544a36d94bf2094403806d934a7e0d92062c1b5b1d0efbf4316d9319a1ff95a1d8f7a4a961c63e4a3eb66c9c4a24789e239f958132e5a4f08c3764f44772c8aa"; hasRunfiles = true; @@ -36186,6 +36275,7 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xmltexconfig" = tl."xmltexconfig"; + hasFormats = true; sha512.run = "e98a3ab9986d63d2605c87463bb32835d8ffcdd93f577b642da8e8f2447b6a74363c3a5799808c35f2e4b099af2789698ea471e04457a31ba8753ec4762e0ead"; sha512.doc = "340859a95a102759494222e0cbf19b7f851c44d4cfeac77cee178b69f576151021de53c32ffb8dcb8ed911dae2eecaac943941481b5cccdfb5302bb8291724fb"; hasRunfiles = true; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/nixpkgs/pkgs/tools/typesetting/tex/texlive/tl2nix.sed index 2f30aa69fe2c..61150fa8b7cf 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/tl2nix.sed +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/tl2nix.sed @@ -32,3 +32,7 @@ s/^catalogue-version_(.*)/ version = "\1";/p # extract deps s/^depend ([^.]*)$/ deps."\1" = tl."\1";/p +# extract hyphenation patterns and formats +# (this may create duplicate lines, use uniq to remove them) +/^execute\sAddHyphen/i\ hasHyphens = true; +/^execute\sAddFormat/i\ hasFormats = true; diff --git a/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix b/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix index 8b9cd18cd0a7..1945e56b96e7 100644 --- a/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -1,23 +1,23 @@ -{ python2Packages, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -with python2Packages; - -buildPythonApplication rec { +buildGoModule rec { pname = "cloudmonkey"; - version = "5.3.3"; + version = "6.1.0"; - propagatedBuildInputs = [ argcomplete pygments ]; + src = fetchFromGitHub { + owner = "apache"; + repo = "cloudstack-cloudmonkey"; + rev = version; + sha256 = "sha256-OmVM6ayrtrLl+PADnkUnrssbsq1GZp2KiMBOXPgfi5Y="; + }; - doCheck = false; # upstream has no tests defined + runVend = true; - src = fetchPypi { - inherit pname version; - sha256 = "064yk3lwl272nyn20xxrh0qxzh3r1rl9015qqf2i4snqdzwd5cf7"; - }; + vendorSha256 = null; meta = with lib; { description = "CLI for Apache CloudStack"; - homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI"; + homepage = "https://github.com/apache/cloudstack-cloudmonkey"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; }; diff --git a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index b30c4b88651c..f169ec7b854a 100644 --- a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,23 +11,24 @@ }: let - specVersion = "4.96.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. + # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. + specVersion = "4.99.0"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = "sha256-4+j5BBTOFLLiA+n0YEUH/ICK4Iuxr6nNB7ZRrYACW2I="; + sha256 = "10z63a2clbiskdnmnyf4m8v2hgc4bdm703y7s2dpw0q09msx9aca"; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.4.3"; + version = "5.5.2"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "sha256-hljvcYtck89Lzje0XgnvYqh+jebOEOFnOkgEnGZJm0o="; + sha256 = "sha256-AjO4h0PaE/QFwbwUVNoe98XOPZ24ct0mbLkua5/YsEA="; }; # remove need for git history diff --git a/nixpkgs/pkgs/tools/wayland/swayr/default.nix b/nixpkgs/pkgs/tools/wayland/swayr/default.nix new file mode 100644 index 000000000000..24a830a7277c --- /dev/null +++ b/nixpkgs/pkgs/tools/wayland/swayr/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromSourcehut, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayr"; + version = "0.6.1"; + + src = fetchFromSourcehut { + owner = "~tsdh"; + repo = "swayr"; + rev = "v${version}"; + sha256 = "1865064q8jb75nfb0hbx4swbbijpibm0n7m4cid8qgylzp4bxvs2"; + }; + + cargoSha256 = "0w6zjnywifdlaw01xz2824lwm4b6r1b7r99wi3p12vgbrmks4jcr"; + + patches = [ + ./icon-paths.patch + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "A window switcher (and more) for sway"; + homepage = "https://git.sr.ht/~tsdh/swayr"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/nixpkgs/pkgs/tools/wayland/swayr/icon-paths.patch b/nixpkgs/pkgs/tools/wayland/swayr/icon-paths.patch new file mode 100644 index 000000000000..8fafc4c4153c --- /dev/null +++ b/nixpkgs/pkgs/tools/wayland/swayr/icon-paths.patch @@ -0,0 +1,17 @@ +diff --git a/src/config.rs b/src/config.rs +index de7d04b..291114b 100644 +--- a/src/config.rs ++++ b/src/config.rs +@@ -197,6 +197,12 @@ impl Default for Format { + ), + urgency_end: Some("</span>".to_string()), + icon_dirs: Some(vec![ ++ "/run/current-system/sw/share/icons/hicolor/scalable/apps".to_string(), ++ "/run/current-system/sw/share/icons/hicolor/48x48/apps".to_string(), ++ "/run/current-system/sw/share/pixmaps".to_string(), ++ "~/.nix-profile/share/icons/hicolor/scalable/apps".to_string(), ++ "~/.nix-profile/share/icons/hicolor/48x48/apps".to_string(), ++ "~/.nix-profile/share/pixmaps".to_string(), + "/usr/share/icons/hicolor/scalable/apps".to_string(), + "/usr/share/icons/hicolor/48x48/apps".to_string(), + "/usr/share/pixmaps".to_string(), diff --git a/nixpkgs/pkgs/tools/wayland/wayland-utils/default.nix b/nixpkgs/pkgs/tools/wayland/wayland-utils/default.nix index 5c07081099c6..16bce1723aa6 100644 --- a/nixpkgs/pkgs/tools/wayland/wayland-utils/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wayland-utils/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, meson, pkg-config, ninja +, meson, pkg-config, ninja, wayland-scanner , wayland, wayland-protocols }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4"; }; - nativeBuildInputs = [ meson pkg-config ninja wayland ]; + nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ]; buildInputs = [ wayland wayland-protocols ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/wayland/wev/default.nix b/nixpkgs/pkgs/tools/wayland/wev/default.nix index 69288a1bc8ce..d04cee342b7e 100644 --- a/nixpkgs/pkgs/tools/wayland/wev/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wev/default.nix @@ -3,6 +3,7 @@ , fetchFromSourcehut , pkg-config , scdoc +, wayland-scanner , wayland , wayland-protocols , libxkbcommon @@ -19,8 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms"; }; - nativeBuildInputs = [ pkg-config scdoc wayland ]; - buildInputs = [ wayland-protocols libxkbcommon ]; + nativeBuildInputs = [ pkg-config scdoc wayland-scanner ]; + buildInputs = [ wayland wayland-protocols libxkbcommon ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix b/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix index 3572f63f57e5..7ced81616f63 100644 --- a/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wlsunset/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland, scdoc -, wayland-protocols +{ lib, stdenv, fetchFromSourcehut +, meson, pkg-config, ninja, wayland-scanner, scdoc +, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w"; }; - nativeBuildInputs = [ meson pkg-config ninja wayland scdoc ]; + nativeBuildInputs = [ meson pkg-config ninja wayland-scanner scdoc ]; buildInputs = [ wayland wayland-protocols ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/wayland/wob/default.nix b/nixpkgs/pkgs/tools/wayland/wob/default.nix index 3567ed6eea41..07fd6f433d73 100644 --- a/nixpkgs/pkgs/tools/wayland/wob/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wob/default.nix @@ -5,9 +5,10 @@ , ninja , pkg-config , scdoc -, libseccomp -, wayland # wayland-scanner +, wayland-scanner +, wayland , wayland-protocols +, libseccomp }: stdenv.mkDerivation rec { @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; }; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; - buildInputs = [ wayland-protocols ] + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; + buildInputs = [ wayland wayland-protocols ] ++ lib.optional stdenv.isLinux libseccomp; mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; diff --git a/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix b/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix index 5f0025d6072b..00dc1d74910d 100644 --- a/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wshowkeys/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromSourcehut -, meson, pkg-config, wayland, ninja -, cairo, libinput, pango, wayland-protocols, libxkbcommon +, meson, pkg-config, wayland-scanner, ninja +, cairo, libinput, pango, wayland, wayland-protocols, libxkbcommon }: let @@ -17,8 +17,8 @@ in stdenv.mkDerivation rec { sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs"; }; - nativeBuildInputs = [ meson pkg-config wayland ninja ]; - buildInputs = [ cairo libinput pango wayland-protocols libxkbcommon ]; + nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ]; + buildInputs = [ cairo libinput pango wayland wayland-protocols libxkbcommon ]; meta = with lib; { description = "Displays keys being pressed on a Wayland session"; @@ -35,5 +35,7 @@ in stdenv.mkDerivation rec { # TODO: gpl3Only or gpl3Plus (ask upstream)? platforms = platforms.unix; maintainers = with maintainers; [ primeos berbiche ]; + broken = true; # Unmaintained and fails to run (Wayland protocol error) + # TODO (@primeos): Remove this package after the NixOS 21.11 branch-off }; } |