diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 05f69e48aa59..c5f9cf6c70c4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "94.0.4606.71", - "sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya", - "sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4", + "version": "94.0.4606.81", + "sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh", + "sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz", "deps": { "gn": { "version": "2021-08-11", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.32", - "sha256": "1w904axixagn6gqcb90849q3qy0k3c6lgl0c97cb6m78l9xrrnbr", - "sha256bin64": "1z7xx608sh8agdl98r7xk7s43d3qnfpd1jvgbl7l8fqd85ns11i0", + "version": "95.0.4638.40", + "sha256": "1v1n113rh5nzfbk5xaq4kp7fdg5n9rca978a9700nmrd0gqpd2hn", + "sha256bin64": "0xadlal8fb7hqjcq6d931if555spw72wa4d23m0fqcan31sky3i0", "deps": { "gn": { "version": "2021-08-11", diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 669e7de99fb8..6fa76685a80d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -46,6 +46,7 @@ , libpsl , brotli , microsoft_gsl +, rlottie }: # Main reference: @@ -60,7 +61,7 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "3.1.1"; + version = "3.1.8"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -69,7 +70,7 @@ mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0h4g8lw9hf9pwmdljavflyn9g9jvjvany7y4vji0qcc1kd99vsnp"; + sha256 = "129x733a5h6d5xdf3zdz5j5lz8mv6gas5jcnyhwzyk79df138whq"; }; postPatch = '' @@ -138,6 +139,7 @@ mkDerivation rec { libpsl brotli microsoft_gsl + rlottie ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 26c9c873ea66..bc36c81155a2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.1.2"; + version = "91.2.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "f211ce2469f60862b1d641b5e165292d98db53695ab715090034c1ee2be7b04931f8e5e856b08b0c8c789e4d98df291d59283c257a38b556c0b4b0b63baa539f"; + sha512 = "1f21f77069490be2de131f6125a498c6ed0a7d10b2ff787891d8dea10019719fea8014a8b2d626a2365f10f6307b616e5f1eef2c601e4da5402c9d5fc7d35049"; }; patches = [ ]; diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 437123faafd8..6931c8621c96 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -2,17 +2,29 @@ , openbabel, qttools, wrapQtAppsHook }: -stdenv.mkDerivation rec { +let + avogadroI18N = fetchFromGitHub { + owner = "OpenChemistry"; + repo = "avogadro-i18n"; + rev = "3b8a86cc37e988b043d1503d2f11068389b0aca3"; + sha256 = "9wLY7/EJyIZYnlUAMsViCwD5kGc1vCNbk8vUhb90LMQ="; + }; + +in stdenv.mkDerivation rec { pname = "avogadro2"; - version = "1.94.0"; + version = "1.95.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; rev = version; - sha256 = "6RaiX23YUMfTYAuSighcLGGlJtqeydNgi3PWGF77Jp8="; + sha256 = "9GnsxQsMuik6CPDmJbJPF0/+LXbZHf/JLevpSsMEoP0="; }; + postUnpack = '' + cp -r ${avogadroI18N} avogadro-i18n + ''; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index 1130f5c44e70..b7f5f5f6d90e 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "avogadrolibs"; - version = "1.94.0"; + version = "1.95.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = pname; rev = version; - sha256 = "6bChJhqrjOxeEWZBNToq3JExHPu7DUMsEHWBDe75zAo="; + sha256 = "0zzVg8xNqFwDrK8gRkDm3tRgBt7fD4K3Uy/ajUBc+eQ="; }; postUnpack = '' diff --git a/pkgs/development/libraries/science/chemistry/libmsym/default.nix b/pkgs/development/libraries/science/chemistry/libmsym/default.nix index 8c605f3e07d4..fdcf7d00e3ba 100644 --- a/pkgs/development/libraries/science/chemistry/libmsym/default.nix +++ b/pkgs/development/libraries/science/chemistry/libmsym/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = " molecular point group symmetry lib"; - homepage = "https://github.com/rcsb/mmtf-cpp"; + homepage = "https://github.com/mcodev31/libmsym"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.sheepforce ]; diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix index 60b5647f5eb9..07e265f8fc0b 100644 --- a/pkgs/development/python-modules/aiopg/default.nix +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiopg"; - version = "1.3.1"; + version = "1.3.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kAkxulAMtLeL3IAuIVvZtsN5RxHWV/qHyFIYu9Odn34="; + sha256 = "sha256-e7USw3Bx6cpLu9PKDC+eEdPTSjriuSX2Sg+9BeRa9Ko="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 6f5373b56bc8..ae635b3058a4 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "databases"; - version = "0.5.0"; + version = "0.5.2"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-HNSPLmZTXZL1e5E9VJiXnQuO2WiXLYOveNTlFqdlTG8="; + sha256 = "sha256-OfBb78lKnAxPhyy2j4TzEZWBzbw64brTQcxuOPoW9pk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index f068c4cb735e..85594a2c4c22 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -13,18 +13,19 @@ , peewee , python-jose , sqlalchemy +, trio }: buildPythonPackage rec { pname = "fastapi"; - version = "0.68.1"; + version = "0.70.0"; format = "flit"; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "sha256-zwfopyig4ImMbkx89l8SsLW8PzoVcDN5KSd7a7fOnms="; + sha256 = "sha256-mLI+w9PeewnwUMuUnXj6J2r/3shinjlwXMnhNcQlhrM="; }; postPatch = '' @@ -48,6 +49,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio sqlalchemy + trio ]; # disabled tests require orjson which requires rust nightly diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index cadf07f21173..4df90b501911 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.56"; + version = "1.18.57"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "61c74253cb77a0734970703d58a49e29624cec76d97da31fa912faf6f6d3347b"; + sha256 = "c157008c4111bb18be21428cd1e35a3265fffc58ebcda4a0019120a5e10add89"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 55fbb2df8e25..4a579d8766bf 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -15,20 +15,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.6.3"; + version = "3.6.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - sha256 = "10clf13bp3fqd9b7n1isrfwz7sngcl1j6birqc1xyg9wzfw1kslj"; + sha256 = "0xpna70s5v7d4lwsb6ijc0f2rm6p7jqmac9yayx9qb1dasbki6zd"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "163rf8k7qb1whjf78i8v5dlyif1sgvd9xkj8li81j45abgzkq86w"; + sha256 = "0m4f8lc0zwxh4lmxkpxvdd2lc2g3lkq0ymllqbyr31sbxvwnxk56"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index 15014cdafd28..4223ce02caea 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.6.4"; + version = "0.6.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "00f15f4bae2947de49b3206f2600f78780008e044380f7aafe0ce52969cda4ca"; + sha256 = "608d8e80da38070d3bb970d132bc47a55dcfd63b4dc03997d93646c5b2ad185b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index dfd84fe066d0..95d4597fd57b 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pykka"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; disabled = pythonOlder "3.6.1"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jodal"; repo = pname; rev = "v${version}"; - sha256 = "1h3brgm8y4a9s991y0drkp0vvmxix9f2b49f9w6ibhkhr37gc0lh"; + sha256 = "1cy4pr05xlsny9g573q7njsv7jaaysi1qzafm6f82y57jqnmziks"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index 89c8b86aa6d4..df258cad930b 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pynws"; - version = "1.3.1"; + version = "1.3.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iWg8UsZeVaOxp35rItywTAlQUbCWe4WWDK4VPCRApcM="; + sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 427b65394006..c19e571a9cc8 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -21,7 +21,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2021.2.6"; + version = "2021.2.8"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -30,7 +30,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "df208546d28a3274ba7b554d50643ed1e393b8f3f75a43b24b83d3ee76597587"; + sha256 = "15809b5d2b9a86ad01e31d176c00415436805ac884c4d197d9263bfe98280d76"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index c3c8401bc476..81813de356af 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.20.0"; + version = "0.20.1"; checkInputs = [ pytest-runner @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "5b405efb4b6ebe81e7f991b360126a4f61c2768ceed6027346e2b8ef3f57ef39"; + sha256 = "hZxE7b0bOx/B8Kz4cgBC7wV23OikRxwrdZ4UQ8G/yhg="; }; doCheck = true; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index f8a2c8f0209e..95a649bf9afb 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.59.7"; + version = "2.59.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6tNUI08Fp2zITH1ILfVVEU0VhgvLogWfXPr9dkAKQEk="; + sha256 = "655cf9b86fdba71f505e809b97a63c5cd5973158578a141748db83c469e87d87"; }; pythonImportsCheck = [ diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/development/tools/bunyan-rs/default.nix index 12ced94c81b7..e5f58810ebf4 100644 --- a/pkgs/development/tools/bunyan-rs/default.nix +++ b/pkgs/development/tools/bunyan-rs/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/LukeMathWalker/bunyan"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ netcrns ]; + mainProgram = "bunyan"; }; } diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 856cd44e26c0..2d1cdfc546b2 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/gtk-rs/gir/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ekleog ]; + mainProgram = "gir"; }; } diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 248a137c49f6..1731dabf3704 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -14,6 +14,7 @@ buildRustPackage rec { license = licenses.mit; maintainers = [ maintainers.klntsky ]; platforms = platforms.linux; + mainProgram = "px"; }; src = diff --git a/pkgs/development/tools/time-ghc-modules/default.nix b/pkgs/development/tools/time-ghc-modules/default.nix new file mode 100644 index 000000000000..e57495b8fb1c --- /dev/null +++ b/pkgs/development/tools/time-ghc-modules/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, sqlite +, python3 +, coreutils +, findutils +, gnused +}: + +stdenv.mkDerivation rec { + pname = "time-ghc-modules"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "codedownio"; + repo = "time-ghc-modules"; + rev = version; + sha256 = "0s6540gllhjn7366inhwa70rdnngnhbi07jn1h6x8a0pi71wdfm9"; + }; + + nativeBuildInputs = [makeWrapper]; + + buildPhase = '' + runHook preBuild + + mkdir -p $out/bin + cp ./time-ghc-modules $out/bin/time-ghc-modules + wrapProgram $out/bin/time-ghc-modules --prefix PATH : ${lib.makeBinPath [ sqlite python3 coreutils findutils gnused ]} \ + --set PROCESS_SCRIPT $out/lib/process \ + --set HTML_FILE $out/lib/index.html + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + install -m 444 ./dist/index.html $out/lib + install ./scripts/process $out/lib + + runHook postInstall + ''; + + meta = with lib; { + description = "Analyze GHC .dump-timings files"; + homepage = "https://github.com/codedownio/time-ghc-modules"; + license = licenses.mit; + maintainers = [ maintainers.thomasjm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index d48787ea017a..16926b16e981 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -34,6 +34,6 @@ buildGoModule { homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; maintainers = with maintainers; [ adisbladis SuperSandro2000 ]; + mainProgram = "vgo2nix"; }; - } diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix index 36bffaa3ec61..7abd3e865fcb 100644 --- a/pkgs/servers/nitter/default.nix +++ b/pkgs/servers/nitter/default.nix @@ -46,6 +46,6 @@ nimPackages.buildNimPackage rec { maintainers = with maintainers; [ erdnaxe ]; license = licenses.agpl3Only; platforms = [ "x86_64-linux" ]; + mainProgram = "nitter"; }; } - diff --git a/pkgs/tools/archivers/xtrt/default.nix b/pkgs/tools/archivers/xtrt/default.nix index 175494057e0a..1d01935f9688 100644 --- a/pkgs/tools/archivers/xtrt/default.nix +++ b/pkgs/tools/archivers/xtrt/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/figsoda/xtrt"; license = licenses.unlicense; maintainers = with maintainers; [ figsoda ]; + mainProgram = "xtrt"; }; } diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix index 37a65d8c0718..e2b99da82db0 100644 --- a/pkgs/tools/misc/bunnyfetch/default.nix +++ b/pkgs/tools/misc/bunnyfetch/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ devins2518 ]; platforms = platforms.linux; + mainProgram = "bunnyfetch"; }; } diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 998fcf366520..e2672ab7bb0d 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { license = licenses.mit; maintainers = with maintainers; [ fgaz evanjs ]; homepage = "https://github.com/chubin/cheat.sh"; + mainProgram = "cht.sh"; }; } diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/tools/misc/colorpicker/default.nix index d2d0915a46fe..07d15469383d 100644 --- a/pkgs/tools/misc/colorpicker/default.nix +++ b/pkgs/tools/misc/colorpicker/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Ancurio/colorpicker"; maintainers = with maintainers; [ jb55 ]; license = licenses.mit; + mainProgram = "colorpicker"; }; } diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 7e50c3e75513..76c7731e27f2 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { PREFIX=$out make install ''; - meta = { - homepage = "https://github.com/clvv/${pname}"; + meta = with lib; { + homepage = "https://github.com/clvv/fasd"; description = "Quick command-line access to files and directories for POSIX shells"; - license = lib.licenses.mit; + license = licenses.mit; longDescription = '' Fasd is a command-line productivity booster. @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { command line. ''; - platforms = lib.platforms.all; + platforms = platforms.all; + maintainers = with maintainers; [ ]; + mainProgram = "fasd"; }; } diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix index e9286e6a11e9..689eb0395f40 100644 --- a/pkgs/tools/misc/fet-sh/default.nix +++ b/pkgs/tools/misc/fet-sh/default.nix @@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ elkowar ]; + mainProgram = "fet.sh"; }; - } diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix index e2782ef652be..7027a6da0fab 100644 --- a/pkgs/tools/misc/fsearch/default.nix +++ b/pkgs/tools/misc/fsearch/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ artturin ]; platforms = platforms.unix; + mainProgram = "fsearch"; }; } diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix index 32d7a169d72e..bc7e9f4840b7 100644 --- a/pkgs/tools/misc/git-fire/default.nix +++ b/pkgs/tools/misc/git-fire/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { homepage = "https://github.com/qw3rtman/git-fire"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.swflint ]; + maintainers = with maintainers; [ swflint ]; + mainProgram = "git-fire"; }; } diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index 6cf31c7835c1..93983c8fe40b 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/raftario/licensor"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "licensor"; }; } diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index 17491b645d4b..6fa819cd8366 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/Miserlou/Loop"; maintainers = with maintainers; [ koral ]; license = licenses.mit; + mainProgram = "loop"; }; } diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/tools/misc/mmv-go/default.nix index efca64bdc44a..8f6550d0592c 100644 --- a/pkgs/tools/misc/mmv-go/default.nix +++ b/pkgs/tools/misc/mmv-go/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "Rename multiple files using your $EDITOR"; license = licenses.mit; maintainers = with maintainers; [ zowoq ]; + mainProgram = "mmv"; }; } diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 004bebaebbea..85d9ed59ff43 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; + mainProgram = "powerline-go"; }; } diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/tools/misc/sta/default.nix index 809287edcf62..6056fcfa49c3 100644 --- a/pkgs/tools/misc/sta/default.nix +++ b/pkgs/tools/misc/sta/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ infinisil ]; platforms = platforms.all; badPlatforms = platforms.darwin; + mainProgram = "sta"; }; } diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index 1782e327f8a6..3b463f22df07 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/austinjones/tab-rs"; license = licenses.mit; maintainers = with maintainers; [ bbigras ]; + mainProgram = "tab"; }; } diff --git a/pkgs/tools/misc/vimv/default.nix b/pkgs/tools/misc/vimv/default.nix index a36c9548462d..46753688ec73 100644 --- a/pkgs/tools/misc/vimv/default.nix +++ b/pkgs/tools/misc/vimv/default.nix @@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation { description = "Batch-rename files using Vim"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.kmein ]; + maintainers = with maintainers; [ kmein ]; + mainProgram = "vimv"; }; } diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index dde9da346efc..b4be43311f83 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.19.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xSjmwD0V4+LKfLwknQU8PAFOG3zpJ87ghHdA2c+nYQM="; + sha256 = "sha256-5TOfy7eapkvXwVC4TcSo3mWSAkLqBeVco7SG2H21lRo="; }; - vendorSha256 = "sha256-mlsKB/WOiQ2Ud9C19rsQhVtJfblh0CGd8tDs+3SSfcg="; + vendorSha256 = "sha256-pgasbJdyTBIYIeaidKYFLy0LqmCTKE7IUkFqddJtcR0="; propagatedBuildInputs = [ docker ]; diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index c77abfe2ad7d..00e495f718d9 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "21.8.1"; + version = "21.10.2"; disabled = python3.pythonOlder "3.6"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ksmzwji4c98pnqns780n5rdm5r1zx7sc40w8qipk2nf6jncwv6p"; + sha256 = "0992wsy3plxpcqmq8cnnl0by1vkmkfb4lq2vb5rsj89wj900ci2n"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20960558ccec..92cf9ef215f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15050,6 +15050,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; + time-ghc-modules = callPackage ../development/tools/time-ghc-modules { }; + tflint = callPackage ../development/tools/analysis/tflint { }; tfsec = callPackage ../development/tools/analysis/tfsec { };