diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 23aae90be959..f9f1383662e5 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPackages_1_45, pkg-config, openssl +{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null @@ -7,18 +7,18 @@ , dbus ? null }: -rustPackages_1_45.rustPlatform.buildRustPackage rec { +rustPackages.rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; rev = "v${version}"; - sha256 = "055njhy9if4qpsbgbr6615xxhcx9plava1m4l323vi4dbw09wh5r"; + sha256 = "1a578h13iv8gqmskzlncfr42jlg5gp0zfcizv4wbd48y9hl8fh2l"; }; - cargoSha256 = "1ijrl208607abjwpr3cajcbj6sr35bk6ik778a58zf28kzdhrawc"; + cargoSha256 = "1sm5yfgjx5xfnqqh1v8ycwzxw4kl6dq5gcvsdnc4h1cj3pdhbpcc"; cargoBuildFlags = [ "--no-default-features" @@ -39,6 +39,7 @@ rustPackages_1_45.rustPlatform.buildRustPackage rec { meta = with lib; { description = "An open source Spotify client running as a UNIX daemon"; homepage = "https://github.com/Spotifyd/spotifyd"; + changelog = "https://github.com/Spotifyd/spotifyd/raw/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 24e064e721ba..583dcf7c618a 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" + "--with-frozenpaths" "--with-quantum-depth=${toString quantumdepth}" "--with-gslib=yes" ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 9daa4992da09..b58c30aee5d6 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { terminaltables zxcvbn # plugins - transmissionrpc + transmission-rpc ]; meta = with lib; { diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 8eb688bcd56d..f206c645ae21 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -44,6 +44,6 @@ in python.pkgs.buildPythonPackage rec { changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 8bd9d472818b..b0d215c47bb4 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -51,6 +51,6 @@ in python.pkgs.buildPythonPackage { changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/video/alass/default.nix b/pkgs/applications/video/alass/default.nix new file mode 100644 index 000000000000..c57a224ee0aa --- /dev/null +++ b/pkgs/applications/video/alass/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, makeWrapper +, ffmpeg +}: + +rustPlatform.buildRustPackage rec { + pname = "alass"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "kaegi"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-q1IV9TtmznpR7RO75iN0p16nmTja5ADWqFj58EOPWvU="; + }; + + cargoSha256 = "sha256-6CVa/ypz37bm/3R0Gi65ovu4SIwWcgVde3Z2W1R16mk="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/alass-cli" --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" + ''; + + meta = with lib; { + description = "Automatic Language-Agnostic Subtitle Synchronization"; + homepage = "https://github.com/kaegi/alass"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 070bcc90685f..9cda6eb0a2b0 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -1,21 +1,29 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , rustPlatform +, makeWrapper +, alass }: rustPlatform.buildRustPackage rec { pname = "sub-batch"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "kl"; repo = pname; - # Upstream doesn't tag releases. - rev = "631bd6e2d931f8a8e12798f4b6460739a14bcfff"; - sha256 = "sha256-424e40v2LBxlmgDKxvsT/iuUn/IKWPKMwih0cSQ5sFE="; + rev = "v${version}"; + sha256 = "sha256-5fDnSmnnVB1RGrNrnmp40OGFF+OAhppnhOjVgnYxXr0="; }; - cargoSha256 = "sha256-l+BTF9PGb8bG8QHhNCoBsrsVX8nlRjPlaea1ESFfMW0="; + cargoSha256 = "sha256-cj1htJcUPCeYbP0t15UcMv4WQAG7tUROb97v4rUeMvU="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/sub-batch" --prefix PATH : "${lib.makeBinPath [ alass ]}" + ''; meta = with lib; { description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files"; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 8bd187b5300c..e55cda51748a 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ]; buildInputs = [ curl gettext libiconv readline ]; - configureFlags = ["--with-readline=${readline.dev}"]; propagatedBuildInputs = [ libxml2 mpfr icu ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 5e9a990d14ed..490adf8e325c 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -59,7 +59,7 @@ with lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.30.3"; + version = "2.30.5"; outputs = [ "out" "dev" ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0zsy3say94d9bhaan0l6mfr59z03a5x4kngyy8b2i20n77q19skd"; + sha256 = "07vzbbnvz69rn9pciji4axfpclp98bpj4a0br2z0gbn5wc4an3bx"; }; patches = optionals stdenv.isLinux [ @@ -155,9 +155,6 @@ stdenv.mkDerivation rec { "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" - # ensure backward compatibility with the latest version of icu: - # http://linuxfromscratch.org/blfs/view/svn/x/webkitgtk.html - "-DCMAKE_CXX_FLAGS=-DU_DEFINE_FALSE_AND_TRUE=1" ] ++ optionals stdenv.isDarwin [ "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" "-DENABLE_GTKDOC=OFF" diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 9b1cc921cd02..4d039770ce0e 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -11,12 +11,12 @@ , doCheck ? true }: let - version = "0.5.0"; + version = "0.5.1"; rSrc = fetchFromGitHub { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-dscmT0ss1buP56QzQtfs2HANr9oWWMxCS+fwBIKBxv4="; + hash = "sha256-+9MjvO1H+A3Ol2to5tWqdpNR7osQsYcbkX9avAqyrKw="; }; deps = callPackage ./deps.nix { /* diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index 3b2ef678a1ed..59eb468868a8 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "adb-enhanced"; - version = "2.5.9"; + version = "2.5.10"; disabled = pythonOlder "3.4"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ashishb"; repo = pname; rev = version; - sha256 = "08fmb55p80fbx2cix6qv2gpw3fi5ic3q17vzvza9brfwx6z1g6dv"; + sha256 = "sha256-JMbcOk9Yr4WbfVUMKe5zZZWvvjKwhpPMdBt9d7xE6ek="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 854ec37a1e4a..39ed8d68345f 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.12.8"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "f3b9684442eec2cfe9f9bb48e796ef919456b82142c7528c5fd527e5224f08bb"; + sha256 = "04c0c8m4c7lzqv0m3jm0zks9wjcv1myas80rxswvi36wn376qs28"; }; # No tests included in archive @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://github.com/google/google-api-python-client"; changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 02ee088782aa..609dcb82237d 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.34.0"; + version = "0.35.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f03ee0d19bca8f2fe922bb424a909d05c28411983b0c2bc58b020032a0d11f63"; + sha256 = "80e51d5aa02ad72da9870e89d21f9b152b0220ca551b4596a6c0614bcde336fc"; }; nativeBuildInputs = [ llvm ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 3f67c044deab..48ed52499c5e 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, pythonAtLeast , pythonOlder , fetchPypi , python @@ -11,14 +12,14 @@ }: buildPythonPackage rec { - version = "0.51.2"; + version = "0.52.0"; pname = "numba"; - # uses f-strings - disabled = pythonOlder "3.6"; + # uses f-strings, python 3.9 is not yet supported + disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "16bd59572114adbf5f600ea383880d7b2071ae45477e84a24994e089ea390768"; + sha256 = "44661c5bd85e3d3619be0a40eedee34e397e9ccb3d4c458b70e10bf95d1ce933"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix new file mode 100644 index 000000000000..3a484692d1a2 --- /dev/null +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +}: + +buildPythonPackage rec { + pname = "transmissionrpc"; + version = "0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60"; + }; + + propagatedBuildInputs = [ six ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "transmissionrpc" ]; + + meta = with lib; { + description = "Python implementation of the Transmission bittorent client RPC protocol"; + homepage = "https://pypi.python.org/pypi/transmissionrpc/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/web-cache/default.nix b/pkgs/development/python-modules/web-cache/default.nix new file mode 100644 index 000000000000..9246b2b571e7 --- /dev/null +++ b/pkgs/development/python-modules/web-cache/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "web-cache"; + version = "1.1.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit version; + pname = "web_cache"; + sha256 = "1d8f1s3i0s3h1jqvjq6cp639hhbbpxvyq7cf9dwzrvvvr0s0m8fm"; + }; + + # No tests in downloaded archive + doCheck = false; + + pythonImportsCheck = [ "web_cache" ]; + + meta = with lib; { + description = "Simple Python key-value storage backed up by sqlite3 database"; + homepage = "https://github.com/desbma/web_cache"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 8638bb5844bd..eeec0487c650 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-+CqWPgdPuTE9TRwQJYibRCtdyAr25sJ2sXCUEoI0VtM="; + sha256 = "sha256-/TROCaguzIdXnkQ4BpVR1W14ppGODGQ0MQAjJExMGVw="; }; - cargoSha256 = "sha256-cBuAVU/fS2HQohjDyzrhDEsgWD5CxTrTCsQeZll90IQ="; + cargoSha256 = "sha256-3uIf6vyeDeww8+dqrzOG4J/T9QbXAnKQKXRbeujeqSo="; nativeBuildInputs = [ perl pkg-config ]; diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index fbca6e0eb540..3565ce10ba1c 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.05.1"; + version = "1.05.2"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "03b2vxpakp6zizb0m65q9lq800z67b052k01q251b3f04kr1waih"; + sha256 = "sha256-h4TpeOwCK3Ynd+XZKo7wHncWS1OI6+b9SReD5xMK9zk="; }; sourceRoot = "source/Quake"; diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 5197b1d3dffe..cf83b2946aeb 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "0p6vy5b6dhv23qnn6sk99hn0j5wiwqpaprsg5jgm2wxb0w2bfz0w"; + sha256 = "sha256-HUWDwUt/yHgwzqtQKsQ3DrBAfL8PBqGhFLMwS7ix5qE="; rev = "v${version}"; }; - vendorSha256 = "0jrp778cjr8k8sbal0yn1zy7s9sj534q9i90qv4c29fxd9xw7qgp"; + vendorSha256 = "sha256-A03Qdwxv/uUKI4Lfmatqwu1RDH9vKU63Y+x25AdfZXs="; doCheck = false; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index d9a3332e0214..ae0ae2e3eea4 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.10"; + version = "0.23.11"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-EkExTDU7T7FYZrDtF0AF8wjn9fp8y9SLmINYGv8zvXk="; + sha256 = "sha256-1VUW8WBNlGSL9JpKhpYfAgCFp3ZGYgWFXTehOAueuZI="; }; dontBuild = true; diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index a7893ac754f2..b2cbe58ce96d 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-ZN62RIQEokailZRBQUq8nX4Eq/b9GGPmxln8j5KGW+8="; + sha256 = "052qckag9vzcx6472pyk1324jq4qib0isx33z3m1m4923ydanbcz"; }; - cargoSha256 = "sha256-tcC8GfEeHaM7XcAXw56/wdygfGPj4vOgn5sZd0KuGkA="; + cargoSha256 = "1nsvx445jrycggidnynn9glpjjm5sh8nwsvqwyyd54k9xb4rqgj1"; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 81d5b763ca36..5cb5b3872a1b 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.14.2) - html-proofer (3.18.6) + html-proofer (3.18.8) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) diff --git a/pkgs/tools/misc/html-proofer/default.nix b/pkgs/tools/misc/html-proofer/default.nix index ba136b06b8a5..73025a212b2a 100644 --- a/pkgs/tools/misc/html-proofer/default.nix +++ b/pkgs/tools/misc/html-proofer/default.nix @@ -1,4 +1,4 @@ -{ bundlerEnv, ruby, lib }: +{ bundlerEnv, ruby, lib, bundlerUpdateScript }: bundlerEnv rec { name = "${pname}-${version}"; @@ -8,11 +8,13 @@ bundlerEnv rec { inherit ruby; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript pname; + meta = with lib; { description = "A tool to validate HTML files"; homepage = "https://github.com/gjtorikian/html-proofer"; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index b0571be30ad4..d05e096f78d8 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x8yq7hiv5wd44a0d0xhrqkjgaz3i1zjr2p6c0i7fbhq1wi8zy07"; + sha256 = "0i5anzj9lp2m6bvghcbz16dlv5ww2mcwgkfj878mamgvb2pfk2m9"; type = "gem"; }; - version = "3.18.6"; + version = "3.18.8"; }; mercenary = { groups = ["default"]; diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/tools/misc/sacad/default.nix new file mode 100644 index 000000000000..c5c48c271db7 --- /dev/null +++ b/pkgs/tools/misc/sacad/default.nix @@ -0,0 +1,39 @@ +{ lib, python3Packages, jpegoptim, optipng }: + +python3Packages.buildPythonApplication rec { + pname = "sacad"; + version = "2.3.4"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1qv2mrz6vy2sl7zhrj9vw016pjd7hmjr2ls0w8bbv1hgrddicn9r"; + }; + + propagatedBuildInputs = with python3Packages; [ + aiohttp + appdirs + bitarray + cssselect + fake-useragent + lxml + mutagen + pillow + tqdm + unidecode + web-cache + jpegoptim + optipng + ]; + + # tests require internet connection + doCheck = false; + + pythonImportsCheck = [ "sacad" ]; + + meta = with lib; { + description = "Smart Automatic Cover Art Downloader"; + homepage = "https://github.com/desbma/sacad"; + license = licenses.mpl20; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/tools/security/nosqli/default.nix b/pkgs/tools/security/nosqli/default.nix new file mode 100644 index 000000000000..3163d1683710 --- /dev/null +++ b/pkgs/tools/security/nosqli/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "nosqli"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "Charlie-belmer"; + repo = pname; + rev = "v${version}"; + sha256 = "006z76v4a3pxzgnkj5nl0mrlsqmfgvg51w20dl118k2xa70zz63j"; + }; + + vendorSha256 = "01spdh2gbzp6yg2jbiwfnyhqb5s605hyfxhs0f9h4ps4qbi1h9cv"; + + meta = with lib; { + description = "NoSql Injection tool for finding vulnerable websites using MongoDB"; + homepage = "https://github.com/Charlie-belmer/nosqli"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/system/uroboros/default.nix b/pkgs/tools/system/uroboros/default.nix new file mode 100644 index 000000000000..7f25c70c2979 --- /dev/null +++ b/pkgs/tools/system/uroboros/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "uroboros"; + version = "20210304-${lib.strings.substring 0 7 rev}"; + rev = "9bed95bb4cc44cfd043e8ac192e788df379c7a44"; + + src = fetchFromGitHub { + owner = "evilsocket"; + repo = pname; + inherit rev; + sha256 = "1a1bc2za2ppb7j7ibhykgxwivwmx7yq0593255jd55gl60r0l7i4"; + }; + + vendorSha256 = "1ml3x00zzkwj1f76a4wk2y8z4bxjhadf2p1li96qjpnc8fgfd50l"; + + meta = with lib; { + description = "Tool for monitoring and profiling single processes"; + homepage = "https://github.com/evilsocket/uroboros"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 02ad6af90daa..b399b3d69174 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -458,7 +458,9 @@ elsif ($action eq "run") { elsif ($action eq "show-ip") { my $s = read_file($confFile) or die; - $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m or die "$0: cannot get IP address\n"; + $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m + or $s =~ /^LOCAL_ADDRESS6=([0-9a-f:]+)(\/[0-9]+)?$/m + or die "$0: cannot get IP address\n"; print "$1\n"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f884862e389..1f9600f9e1fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7768,6 +7768,8 @@ in s6-portable-utils = skawarePackages.s6-portable-utils; + sacad = callPackage ../tools/misc/sacad { }; + safecopy = callPackage ../tools/system/safecopy { }; sacd = callPackage ../tools/cd-dvd/sacd { }; @@ -13248,6 +13250,8 @@ in agg = callPackage ../development/libraries/agg { }; + alass = callPackage ../applications/video/alass { }; + allegro = allegro4; allegro4 = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; @@ -15590,7 +15594,9 @@ in libpwquality = callPackage ../development/libraries/libpwquality { }; - libqalculate = callPackage ../development/libraries/libqalculate { }; + libqalculate = callPackage ../development/libraries/libqalculate { + readline = readline80; + }; libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; @@ -18228,6 +18234,8 @@ in nix-tour = callPackage ../applications/misc/nix-tour {}; + nosqli = callPackage ../tools/security/nosqli { }; + nsd = callPackage ../servers/dns/nsd (config.nsd or {}); nsq = callPackage ../servers/nsq { }; @@ -25639,6 +25647,8 @@ in urh = callPackage ../applications/radio/urh { }; + uroboros = callPackage ../tools/system/uroboros { }; + uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; uucp = callPackage ../tools/misc/uucp { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 769ec1c567d3..7d56772da125 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8065,7 +8065,7 @@ in { transmission-rpc = callPackage ../development/python-modules/transmission-rpc { }; - transmissionrpc = self.transmission-rpc; # alias for compatibility 2020-02-07 + transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; treq = callPackage ../development/python-modules/treq { }; @@ -8434,6 +8434,8 @@ in { web = callPackage ../development/python-modules/web { }; + web-cache = callPackage ../development/python-modules/web-cache { }; + webcolors = callPackage ../development/python-modules/webcolors { }; webdavclient3 = callPackage ../development/python-modules/webdavclient3 { };