diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index eb24130e519a..8df450a11c63 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -43,7 +43,7 @@ let path = [ pkgs.coreutils ]; preStart = '' - ${optionalString (suppl.configFile.path!=null) '' + ${optionalString (suppl.configFile.path!=null && suppl.configFile.writable) '' (umask 077 && touch -a "${suppl.configFile.path}") ''} ${optionalString suppl.userControlled.enable '' diff --git a/pkgs/applications/audio/viper4linux-gui/default.nix b/pkgs/applications/audio/viper4linux-gui/default.nix new file mode 100644 index 000000000000..be495aa9c93b --- /dev/null +++ b/pkgs/applications/audio/viper4linux-gui/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, copyDesktopItems +, pkg-config +, qtbase +, qtsvg +, qtmultimedia +, qmake +, gst_all_1 +, libpulseaudio +, makeDesktopItem +, viper4linux +, wrapQtAppsHook +}: +let + gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]); +in +stdenv.mkDerivation rec { + pname = "viper4linux-gui"; + version = "unstable-2022-04-23"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "Viper4Linux-GUI"; + rev = "2d0c84d7dda76c59e31c850e38120002eb779b7a"; + sha256 = "sha256-5YlLCF598i/sldczPEgCB+1KJDA7jqM964QDSNjgTKM="; + }; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "viper-gui"; + icon = "viper"; + desktopName = "viper4linux"; + genericName = "Equalizer"; + comment = meta.description; + categories = [ "AudioVideo" "Audio" ]; + startupNotify = false; + }) + ]; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + copyDesktopItems + ]; + + buildInputs = [ + qtbase + qtmultimedia + qtsvg + gst_all_1.gstreamer + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-viperfx + libpulseaudio + viper4linux + ]; + + qmakeFlags = [ "V4L_Frontend.pro" ]; + + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ viper4linux gst_all_1.gstreamer ]}" + "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath}" + ]; + + installPhase = '' + runHook preInstalli + install -D V4L_Frontend $out/bin/viper-gui + install -D icons/viper.png $out/share/icons/viper.png + runHook postInstall + ''; + + meta = with lib; { + description = "Official UI for Viper4Linux2"; + homepage = "https://github.com/Audio4Linux/Viper4Linux-GUI"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/audio/viper4linux/default.nix b/pkgs/applications/audio/viper4linux/default.nix new file mode 100644 index 000000000000..118af6853e5a --- /dev/null +++ b/pkgs/applications/audio/viper4linux/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gst_all_1 +, libviperfx +, makeWrapper +}: +let + gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]); +in +stdenv.mkDerivation rec { + pname = "viper4linux"; + version = "unstable-2022-03-13"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "Viper4Linux"; + rev = "5da25644824f88cf0db24378d2c84770ba4f6816"; + sha256 = "sha256-CJNVr/1ehJzX45mxunXcRAypBBGEBdswOzAVG2H+ayg="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-viperfx + libviperfx + ]; + + dontBuild = true; + + postPatch = '' + substituteInPlace viper --replace "/etc/viper4linux" "$out/etc/viper4linux" + ''; + + installPhase = '' + runHook preInstall + install -D viper -t $out/bin + mkdir -p $out/etc/viper4linux + cp -r viper4linux/* $out/etc/viper4linux + runHook postInstall + ''; + + postFixup = '' + wrapProgram "$out/bin/viper" \ + --prefix PATH : $out/bin:${lib.makeBinPath [ gst_all_1.gstreamer ]} \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libviperfx ]} + ''; + + meta = with lib; { + description = "An Adaptive Digital Sound Processor"; + homepage = "https://github.com/Audio4Linux/Viper4Linux"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 35ab9791ec73..5ecbf4fc9790 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -25,7 +25,7 @@ with lib; let - version = "22.0"; + version = "23.0"; majorVersion = versions.major version; desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorVersion}.x/debian/bitcoin-qt.desktop"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b"; + sha256 = "26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05"; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index b58524d1eee3..2ac761edd008 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.10.2"; + version = "0.11.0.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809"; + sha256 = "e2ad6eead19a0cd8869e291c27d318cf553bb015339c1f0e8d8b30e7bc0910d8"; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 62b2b1fefddf..ffd4103e214e 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.0.2"; + version = "2.1.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-DhKxY4Ry1IpT16UC3HbbUSKWzhGm/0R7rYrvqupg/Zo=" "zip"; - i686-linux = fetch "linux_386" "sha256-ANoOYjG4+mci6TdF4HC9fP8e5eAckrbZITRuA1fqtCA=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-uPudElKu30smsupSIvGAmrF/f9TXoTzyUfSrUAvTDWw=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-P5qsy4kiE/DMJnJr3EUHMcb0KoUZyO2BQ5PIosPbnI8=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-DTYWqhawyAQBIxMUksZheyN8WSVPyhCghZC8orxKsBk=" "zip"; + i686-linux = fetch "linux_386" "sha256-JBjiKxbJnFILSOVnOUIcY3GpbOT2UOJlasTSPRyYz4I=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-PfVOvUF8Rls29VzfIj1U6/VFv1H6lj2K3Dz6DWmh2fs=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-Cn3/+Dvk5hW9rvxu4I9ghHSS1yWSAeQq3gx+6dvFiIk=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index d34770051d0b..8daf50f82e70 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.14.2"; + version = "0.14.6"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ conradmearns zaninime opeik ]; + maintainers = with maintainers; [ atila conradmearns zaninime opeik ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3"; + sha256 = if stdenv.isDarwin then "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 20b944efd5d5..928a71b69047 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,17 +1,19 @@ -{ lib, python3Packages, ffmpeg }: +{ lib +, python3 +, ffmpeg +}: -python3Packages.buildPythonApplication rec { - version = "2.2"; - pname = "sigal"; +python3.pkgs.buildPythonApplication rec { + pname = "sigal"; + version = "2.3"; + format = "setuptools"; - src = python3Packages.fetchPypi { + src = python3.pkgs.fetchPypi { inherit version pname; - sha256 = "sha256-49XsNdZuicsiYJZuF1UdqMA4q33Ly/Ug/Hc4ybJKmPo="; + hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q="; }; - disabled = !(python3Packages.pythonAtLeast "3.6"); - - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ # install_requires jinja2 markdown @@ -29,16 +31,18 @@ python3Packages.buildPythonApplication rec { checkInputs = [ ffmpeg - ] ++ (with python3Packages; [ + ] ++ (with python3.pkgs; [ pytestCheckHook ]); - makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ]; + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" + ]; meta = with lib; { description = "Yet another simple static gallery generator"; - homepage = "http://sigal.saimon.org/en/latest/index.html"; - license = licenses.mit; + homepage = "http://sigal.saimon.org/"; + license = licenses.mit; maintainers = with maintainers; [ domenkozar matthiasbeyer ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 14b57d5dd13c..5f54f70c1134 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -191,6 +191,7 @@ let --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi chmod -x third_party/webgpu-cts/src/tools/run_deno + ${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"} # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8abd8fbdad5a..13ee6f5f85cd 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,21 +1,21 @@ { "stable": { - "version": "100.0.4896.127", - "sha256": "0kgq38dy9mjyc44556i9gxhlsgd7dfvv1xi1ibk92b4p7i2y6427", - "sha256bin64": "0mm6lix14bf4ca440dyccnq54z0qvn5c886ghfyzy2q0bqzbq4nh", + "version": "101.0.4951.41", + "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609", + "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq", "deps": { "gn": { - "version": "2022-01-21", + "version": "2022-03-14", "url": "https://gn.googlesource.com/gn", - "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", - "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" + "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", + "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" } }, "chromedriver": { - "version": "100.0.4896.60", - "sha256_linux": "0q9ddwhccd0jmzi8jksxlfjavmm913c9bmb4lz1ahxplsnxd8z31", - "sha256_darwin": "0q0ikhf5pkbrqln91fklbbfmqi33nfcjdg5dm7zb66b4alxwwas9", - "sha256_darwin_aarch64": "1vf3s0gq61riqsv85pr6xj0c2afdnv1b2w4gp2bwlfq4ffkfq38y" + "version": "101.0.4951.15", + "sha256_linux": "1i8ay83gh1q6nd0v14qv7gjar9h4fccb50a8b6fg671pg0l6vn24", + "sha256_darwin": "0ldxy1dxb99xps0h1d1264njc55q4bd000bdnaaks9kyx2djn54b", + "sha256_darwin_aarch64": "14awsldpqz2y187jwbcli8v7f1r6gsybk8yx8jqg26y8iyg3lrx9" } }, "beta": { diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 517ab55d9d2d..2b80dfc6815a 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, kompose }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose }: buildGoModule rec { pname = "kompose"; @@ -26,7 +26,7 @@ buildGoModule rec { done ''; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = kompose; command = "kompose version"; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index db7771bc3c9f..d678e3b517b3 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.0"; + version = "3.44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "q4Cg6eLOdn+56EruBl0Ote9QLNebLiykUeyoQpIpeoA="; + sha256 = "LJNidefwnQtOtWgMVb/4Xw2A0lU4R2Gm0Z3XfOaU/oM="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 5855eee63792..2d35b1c4a039 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-ITUj905ZSdCH0mcw8tubyVKqI6p/oNcC4OW7/NbkR5o="; + sha256 = "sha256-YXbyGUY/E8odjljDok+yYyU8yZSyUFc22zumrUuuXXQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix new file mode 100644 index 000000000000..7642ae4aff26 --- /dev/null +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, fetchurl, ocamlPackages, mpfr, ppl }: + +stdenv.mkDerivation rec { + pname = "jasmin-compiler"; + version = "21.0"; + + src = fetchurl { + url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; + sha256 = "sha256:1px17fpc00gca5ayfcr4k008srkyw120c25rnyf7cgzfs1gpylj2"; + }; + + sourceRoot = "jasmin-compiler-v${version}/compiler"; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir camlidl ]; + + buildInputs = [ + mpfr + ppl + ] ++ (with ocamlPackages; [ + apron + batteries + menhirLib + yojson + zarith + ]); + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp jasminc.native $out/bin/jasminc + runHook postInstall + ''; + + meta = { + description = "A workbench for high-assurance and high-speed cryptography"; + homepage = "https://github.com/jasmin-lang/jasmin/"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 14f1bab574ad..26bd38f72df1 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -4,9 +4,13 @@ with lib; mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; - defaultVersion = if versions.range "8.10" "8.13" coq.coq-version then "20200527" else null; - release."20200527".rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; - release."20200527".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.14" "8.15"; out = "8.15"; } + { case = range "8.10" "8.13"; out = "8.10"; } + ] null; + releaseRev = v: "coq${v}"; + release."8.15".sha256 = "0wbp058zwa4bkdjj38aysy2g1avf9nrh8q23a3dil0q00qczi616"; + release."8.10".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; sourceRoot = "source/Metalib"; installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}"; diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index d1c7233f0d48..9b67dd49c82b 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -13,6 +13,8 @@ gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; }; + gst-plugins-viperfx = callPackage ./viperfx { }; + gst-rtsp-server = callPackage ./rtsp-server { }; gst-libav = callPackage ./libav { }; diff --git a/pkgs/development/libraries/gstreamer/viperfx/default.nix b/pkgs/development/libraries/gstreamer/viperfx/default.nix new file mode 100644 index 000000000000..83c7d75e98c1 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/viperfx/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, gst_all_1 +, cmake +}: +stdenv.mkDerivation rec { + pname = "gst-plugins-viperfx"; + version = "unstable-2020-9-20"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "gst-plugin-viperfx"; + rev = "a5c1b03dfe1ab0822b717a5f9392e9f1237fdba0"; + sha256 = "sha256-0so4jV56nl3tZHuZpvtyMrpOZ4tNJ59Pyj6zbV5bJ5Y="; + }; + + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + + propagatedBuildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + installPhase = '' + runHook preInstall + install -D libgstviperfx.so $out/lib/gstreamer-1.0/libgstviperfx.so + install -D $src/COPYING $out/share/licenses/gst-plugins-viperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + description = "ViPER FX core wrapper plug-in for GStreamer1"; + homepage = "https://github.com/Audio4Linux/gst-plugin-viperfx"; + license = licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/development/libraries/libviperfx/default.nix new file mode 100644 index 000000000000..3c980823f410 --- /dev/null +++ b/pkgs/development/libraries/libviperfx/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libviperfx"; + version = "unstable-2018-01-15"; + + src = fetchFromGitHub { + owner = "vipersaudio"; + repo = "viperfx_core_binary"; + rev = "6f7d0da725affe854f083baf5d90c70e172e4488"; + sha256 = "sha256-hfX46Kk91eQgiO3uhew91I6eEHxazhdGwSkhfNZ+HvQ="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D libviperfx_x64_linux.so $out/lib/libviperfx.so + install -D README.md $out/share/licenses/libviperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/vipersaudio/viperfx_core_binary"; + description = "The ViPER FX core"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ rewine ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index faa17a838396..001b750e752d 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -41,12 +41,12 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.2.0"; + version = "8.2.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9998fedfcb932e19e3b54faeb497a49cde8b15163af764c5afe5847fef5ec1ff"; + sha256 = "sha256-+LSnyIVA/lR9xbDIgreLyU+V/Z2pJD8v8agvJj05w94="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index ffd8e698c58e..df8c1fffdb91 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiohttp-apispec"; - version = "3.0.0b1"; + version = "3.0.0b2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "maximdanilchenko"; repo = pname; rev = "v${version}"; - hash = "sha256-LGdi5ZhJ1G0GxUJVBZnwW3Q+x3Yo9FRV9b6REPlq7As="; + hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU="; }; propagatedBuildInputs = [ @@ -40,11 +40,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "jinja2<3.0" "jinja2" - ''; - pythonImportsCheck = [ "aiohttp_apispec" ]; diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index 3432931f9356..b52760d20694 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -2,55 +2,45 @@ , buildPythonPackage , fetchFromGitHub , pymysql -, pytest -, isPy27 -, fetchpatch +, pythonOlder +, setuptools-scm +, setuptools-scm-git-archive }: buildPythonPackage rec { pname = "aiomysql"; - version = "0.0.21"; - disabled = isPy27; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad"; + hash = "sha256-TNaQ4EKiHwSmPpUco0pA5SBP3fljWQ/Kd5RLs649fu0="; }; - patches = [ - (fetchpatch { - # vendor functions previously provided by pymysql.util - url = "https://github.com/aio-libs/aiomysql/pull/554/commits/919b997a9de7f53d721af76762fba425e306531e.patch"; - sha256 = "V1VYyqr6RwTXoVoGVyMuJst6uqTuuHbpMOpLoVZO1XA="; - }) + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive ]; propagatedBuildInputs = [ pymysql ]; - checkInputs = [ - pytest - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "PyMySQL>=0.9,<=0.9.3" "PyMySQL" - ''; - - checkPhase = '' - pytest - ''; - - # tests require mysql database + # Tests require MySQL database doCheck = false; + pythonImportsCheck = [ + "aiomysql" + ]; + meta = with lib; { description = "MySQL driver for asyncio"; homepage = "https://github.com/aio-libs/aiomysql"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index d226192164d0..ec4dd4dfcbee 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "amqp"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-RGs+io68LOr9Qk/8qrHDU4MNSBYSVleO16ZUSOYB6+0="; + hash = "sha256-LBsT/swIk+lGxly9XzZCeGHP+k6iIB2Pb8oi4qNzteI="; }; propagatedBuildInputs = [ @@ -38,8 +38,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/celery/py-amqp"; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; + homepage = "https://github.com/celery/py-amqp"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 1d2bb9505a27..0e6f26700bcd 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "5.6.0"; + version = "5.7.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-rNMHMUNBVNo3bO7rQW7hVBzfuOo8ZIAjpVo0yz7K+fM="; + sha256 = "sha256-6AwOdN4XdK2ufAIzskf/crj72LXxBwd9tdC38DcNa4Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 6ccd3c98c213..0eb3eec5550e 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.12.0"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "zalando"; + owner = "spec-first"; repo = pname; rev = version; - sha256 = "sha256-JMuI3h0Pg7nCXrJtF0fhSFJTOWelEqcvmqv3ooIfkqM="; + hash = "sha256-QOxvs2z8AAxQ2oSM/PQ6QTD9G4JomviauLSDjay8HyQ="; }; propagatedBuildInputs = [ @@ -56,24 +56,18 @@ buildPythonPackage rec { testfixtures ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "PyYAML>=5.1,<6" "PyYAML>=5.1" \ - --replace "jsonschema>=2.5.1,<4" "jsonschema>=2.5.1" - ''; - - disabledTests = [ - # We have a later PyYAML release - "test_swagger_yaml" - ]; - pythonImportsCheck = [ "connexion" ]; + disabledTests = [ + # AssertionError + "test_headers" + ]; + meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; - homepage = "https://github.com/zalando/connexion/"; + homepage = "https://github.com/spec-first/connexion"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 12f9a667fef8..41a6436c3bc9 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.3.4"; + version = "1.3.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-g8tMVH1MZihEEHGQjxX/Mcn5Mu3N9VA3AGdk2avlOoE="; + hash = "sha256-sYE7bZcMXsf+4r9Rs4d0XaUqdWVZfDU9/xPqIiiJkUQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix index 83d29173243d..943036ecbd46 100644 --- a/pkgs/development/python-modules/ismartgate/default.nix +++ b/pkgs/development/python-modules/ismartgate/default.nix @@ -18,13 +18,15 @@ buildPythonPackage rec { pname = "ismartgate"; version = "4.0.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yh7gPyy3VMdyINBCZo5K2wA0BY7yYgHrKGZRB/pm77U="; + hash = "sha256-yh7gPyy3VMdyINBCZo5K2wA0BY7yYgHrKGZRB/pm77U="; }; propagatedBuildInputs = [ @@ -49,7 +51,15 @@ buildPythonPackage rec { --replace '"pytest-runner>=5.2",' "" ''; - pythonImportsCheck = [ "ismartgate" ]; + pythonImportsCheck = [ + "ismartgate" + ]; + + disabledTestPaths = [ + # Tests are out-dated + "ismartgate/tests/test_init.py" + ]; + meta = with lib; { description = "Python module to work with the ismartgate and gogogate2 API"; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index ede91e7df913..6f85a797c374 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-hKEXTzJMSVBRDiqrN90/fETEhirwSWLdgRULRvlQjbY="; + sha256 = "sha256-gHgFEDUji43vTBZp5FLK90H+D44sfH2AuCc7Gu2T1pg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 85a58271b6d3..deb7fcde1795 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.14.9"; + version = "3.14.10"; format = "setuptools"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "sha256-8rwWKsOOYUrk2k1piCurb1LkB9zzmSITq52qWdyx4yk="; + hash = "sha256-k3kKAImE1aVlmsSPXpaIkAVspAsAo5Hz6/n7u6+zTzA="; }; buildInputs = [ @@ -31,8 +31,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ apsw - ] ++ lib.optional withPostgres psycopg2 - ++ lib.optional withMysql mysql-connector; + ] ++ lib.optional withPostgres [ + psycopg2 + ] ++ lib.optional withMysql [ + mysql-connector + ]; checkInputs = [ flask diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index bc21d6bf465e..49a070006671 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -1,36 +1,48 @@ { lib , buildPythonPackage -, fetchPypi -, pillow -, nose_progressive -, nose +, fetchFromGitHub , mock -, blessings +, pillow +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pilkit"; - version = "2.0"; + version = "unstable-2022-02-17"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "ddb30c2f0198a147e56b151476c3bb9fe045fbfd5b0a0fa2a3148dba62d1559f"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "matthewwithanm"; + repo = pname; + rev = "09ffa2ad33318ae5fd3464655c14c7f01ffc2097"; + hash = "sha256-jtnFffKr0yhSv2jBmXzPa6iP2r41MbmGukfmnvgABhk="; }; - preConfigure = '' - substituteInPlace setup.py --replace 'nose==1.2.1' 'nose' + buildInputs = [ + pillow + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov --cov-report term-missing:skip-covered" "" ''; - # tests fail, see https://github.com/matthewwithanm/pilkit/issues/9 - doCheck = false; - - buildInputs = [ pillow nose_progressive nose mock blessings ]; + pythonImportsCheck = [ + "pilkit" + ]; meta = with lib; { - homepage = "https://github.com/matthewwithanm/pilkit/"; description = "A collection of utilities and processors for the Python Imaging Libary"; + homepage = "https://github.com/matthewwithanm/pilkit/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index b88bc006bcc1..6ebe09463e3a 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "2021.11.0"; + version = "2022.04.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-Cqc3zRJ2VpKKCGF4y+4IYfvfANblCEmh0sJ3tXH1AAA="; + hash = "sha256-qW1rjKc1+w2rTUGackPjb0qgTZpFXh0ZRBqMmf4nDnk="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python3 API for IQVIA data"; + description = "Module for working with IQVIA data"; longDescription = '' pyiqvia is an async-focused Python library for allergen, asthma, and disease data from the IQVIA family of websites (such as https://pollen.com, diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 921de2e0c7e8..d5841fca4b97 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "v${version}"; - hash = "sha256-HGF8Tu28ksIfaCKAbnJv6sDmoQrDDjteVLxbJN1HH3U="; + hash = "sha256-d1ciSl0CmQwpg4NXR+hQ2gPZE954hnREYfitdPvKFtA="; }; nativeBuildInputs = [ @@ -36,11 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pyparsing = "^3.0.7"' 'pyparsing = "*"' \ - ''; - pythonImportsCheck = [ "sigma" ]; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 6f11559aad4c..9e092ca8251a 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.3"; + version = "0.9.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - hash = "sha256-9eA2fx+j6WLbEkLaemwEuoWLUWlS0iF5AkR2YienN5g="; + hash = "sha256-9OlWMom/0OMlbPd3evjIaX75Gjlu+F8vKBJwX4Z58qQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index 00277daf8a3e..fcc4db1fbf0f 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -2,18 +2,22 @@ , buildPythonPackage , fetchFromGitHub , pyopenssl +, pythonOlder , requests }: buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.13"; + version = "1.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - sha256 = "0mc9zpa0d9gijf56mxmsxy4qdcm200ixhnm6i3y5xc2yfv9r6xqy"; + hash = "sha256-LZgKjSas0KdJAf4leSVz8sEnRrlJ20Sm9Ka+S5zDOTM="; }; propagatedBuildInputs = [ @@ -23,7 +27,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "requests_pkcs12" ]; + + pythonImportsCheck = [ + "requests_pkcs12" + ]; meta = with lib; { description = "PKCS#12 support for the Python requests library"; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 5cd0044bb594..278bf7187ad1 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.0.3"; + version = "2.1.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-EVSKBsIhYm5UqFEZ3snKF1aEW3+JjE0Kzs3gYnFQsUc="; + sha256 = "sha256-wkE1kgu3yMjH98BBmpz+ZQMg140i0wka4VrBUkJHkxk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 0810acd1ea47..c3a6a4af9e58 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.8"; + version = "3.11.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SFG3wGGFxzZKfNyIQrpDGblL2vC0pQguWIYdwF0Mg5A="; + sha256 = "sha256-7booFScN2qNqldPdBmxH1pTUz2+u7JMmPmX0tJojaeI="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 541eda6185e7..33d0bea9b838 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -4,18 +4,22 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , zigpy }: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.72"; + version = "0.0.73"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; - rev = version; - sha256 = "sha256-tVCvmQR9tGhSDB4OztNaSCj2BTxPdrX3Gw9WZopRo8k="; + rev = "refs/tags/${version}"; + hash = "sha256-vC1kkh9t2fWmSqmKQz9ON8Y+tBFhTxrprLNzOldQR+A="; }; propagatedBuildInputs = [ @@ -28,7 +32,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "zhaquirks" ]; + pythonImportsCheck = [ + "zhaquirks" + ]; meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9b1472f53b41..108db9391c5a 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1084"; + version = "2.0.1085"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-bzmXLqjtl742UcjBpYQdtiTKO6Oe/x7lGoJZh+uJzUo="; + hash = "sha256-GJVKngSpYmMtcxiWL8JDtEOlJlQ19LbKZF9zcAMG9vA="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 097fd30ea9a8..3a39ee75369d 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lQo3rhPjKZV9XuuKYxd3jXqSiElj+O0DdERtmsMZMEw="; + sha256 = "sha256-W08EyKSMz0ZCqvPBB9xQ4WHxsK2FjgwC/GvEqOwGGQ4="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-n93ZP6sIyL5Q9UeDRXxm8KleDfUf2wd6JcTgSPtBGWg="; + vendorSha256 = "sha256-wEsWnmCv3hoQ1QkOQfo4ShmSgf27yEc8FKC7SC4gs8k="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index caa790e9fd49..c54cda1ad27d 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -31,7 +31,6 @@ , CoreServices , developer_cmds , DarwinTools -, testVersion , mysql-shell }: diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 7f3dce2d70cf..3c90b7f665a0 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,15 +8,9 @@ let in buildNodejs { inherit enableNpm; - version = "16.14.2"; - sha256 = "sha256-6SLiFcxo61+U0z6KC2HiyGO3cxzIYAq5VdOCLakP+NE="; + version = "16.15.0"; + sha256 = "sha256-oPgS78Q/eDIeygiVeWCkj15r+XAE1QWMjdOwPGRupPc="; patches = [ ./disable-darwin-v8-system-instrumentation.patch - # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. - # https://github.com/nodejs/node/pull/40965 - (fetchpatch { - url = "https://github.com/nodejs/node/commit/65119a89586b94b0dd46b45f6d315c9d9f4c9261.patch"; - sha256 = "sha256-dihKYEdK68sQIsnfTRambJ2oZr0htROVbNZlFzSAL+I="; - }) ]; } diff --git a/pkgs/os-specific/darwin/mas/default.nix b/pkgs/os-specific/darwin/mas/default.nix index 33a3114c3d6e..968cb10cd5a3 100644 --- a/pkgs/os-specific/darwin/mas/default.nix +++ b/pkgs/os-specific/darwin/mas/default.nix @@ -2,7 +2,7 @@ , stdenvNoCC , fetchurl , installShellFiles -, testVersion +, testers , mas }: @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { ''; passthru.tests = { - version = testVersion { + version = testers.testVersion { package = mas; command = "mas version"; }; diff --git a/pkgs/tools/archivers/gbl/default.nix b/pkgs/tools/archivers/gbl/default.nix index 4c057469f037..266b0830d5cc 100644 --- a/pkgs/tools/archivers/gbl/default.nix +++ b/pkgs/tools/archivers/gbl/default.nix @@ -4,7 +4,7 @@ , fetchpatch , pkg-config , openssl -, testVersion +, testers , gbl }: @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; passthru.tests.version = - testVersion { package = gbl; }; + testers.testVersion { package = gbl; }; meta = with lib; { description = "GBL Firmware file manipulation"; diff --git a/pkgs/tools/audio/mictray/default.nix b/pkgs/tools/audio/mictray/default.nix new file mode 100644 index 000000000000..e757bac96682 --- /dev/null +++ b/pkgs/tools/audio/mictray/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub +, gtk3 +, lib +, libgee +, libnotify +, meson +, ninja +, pkg-config +, pulseaudio +, stdenv +, vala +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "mictray"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "Junker"; + repo = "mictray"; + rev = "1f879aeda03fbe87ae5a761f46c042e09912e1c0"; + sha256 = "0achj6r545c1sigls79c8qdzryz3sgldcyzd3pwak1ymim9i9c74"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libgee + libnotify + pulseaudio + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/Junker/mictray"; + description = "System tray application for microphone"; + longDescription = '' + MicTray is a Lightweight system tray application which lets you control the microphone state and volume. + ''; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.anpryl ]; + }; +} diff --git a/pkgs/tools/audio/mpdsync/default.nix b/pkgs/tools/audio/mpdsync/default.nix deleted file mode 100644 index c89404fbba1c..000000000000 --- a/pkgs/tools/audio/mpdsync/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, python2, fetchFromGitHub }: -with python2.pkgs; -stdenv.mkDerivation { - pname = "mpdsync"; - version = "unstable-2017-06-15"; - - src = fetchFromGitHub { - owner = "alphapapa"; - repo = "mpdsync"; - rev = "da90058f44dd9578cc5f2fb96a1fb2b26da40d07"; - sha256 = "1mfg3ipqj5dvyyqbgp6ia6sc1ja5gmm2c9mfrwx0jw2dl182if6q"; - }; - - pythonPath = [ mpd2 ]; - - nativeBuildInputs = [ - wrapPython - ]; - - dontBuild = true; - - installPhase = "install -D mpdsync.py $out/bin/mpdsync"; - postFixup = "wrapPythonPrograms"; - -} diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 0831649f6008..80daf996b855 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testVersion, gosu }: +{ lib, buildGoModule, fetchFromGitHub, testers, gosu }: buildGoModule rec { pname = "gosu"; @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-d" "-s" "-w" ]; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = gosu; }; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 157cc1adf8d7..dc370b6a3e7e 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , rustPlatform , installShellFiles +, pandoc , testers , lsd }: @@ -19,8 +20,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-P0HJVp2ReJuLSZrArw/EAfLFDOZqswI0nD1SCHwegoE="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles pandoc ]; postInstall = '' + pandoc --standalone --to man doc/lsd.md -o lsd.1 + installManPage lsd.1 + installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index a9885fc13518..74e59c2c6aca 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -6,7 +6,7 @@ , nix , nix-index , rustPlatform -, testVersion +, testers }: rustPlatform.buildRustPackage rec { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; passthru.tests = { - version = testVersion { package = comma; }; + version = testers.testVersion { package = comma; }; }; meta = with lib; { diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 129d335bf496..2c76d28bae25 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-04-23"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-KAbPiZ/iOwT8plqqZ4Q3Cl8+we2Tsi2GkkmXZCcmhHs="; + sha256 = "sha256-GYAIbE6Vrq6gBnCkeOSvo6gSJqPOhDh2f8n1b6B/x30="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 0f8f37a4890c..dc09e8476bf3 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Ki6MrLVJf2U4Q0y6jtOQZOti/m3SULWNKZ9SdirlOVA="; + sha256 = "sha256-ZH3OrJGh7TekODW5rh8JShNHKfuxPr5HhVD7wsvi8M0="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-ftBZQmtrnGFMZRXDKmMyqnfxuY5vtrZDXVR43yd1shk="; + vendorSha256 = "sha256-hJEL6kUc6aXKq7X23dRWhAni5oRDJ3CuNTx6JL049gA="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 9295dd400992..e12fab02f1e4 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "yara"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; rev = "v${version}"; - hash = "sha256-ECvNob5QbOe5JfaDMGvSxCS+E9nqdsfSCZAVlAs18q4="; + hash = "sha256-/6EMnNVNSgeYHrbPF3QDS5oc0eLaggKNuZi2pXx/CqY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index c937e6c7ab16..3e87b7cb79c1 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -1,29 +1,31 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, gucci }: -buildGoPackage rec { +buildGoModule rec { pname = "gucci"; - version = "0.1.0"; - - goPackagePath = "github.com/noqcks/gucci"; + version = "1.5.4"; src = fetchFromGitHub { owner = "noqcks"; repo = "gucci"; - rev = version; - sha256 = "0ksrmzb3iggc7gm51fl0jbb15d0gmpclslpkq2sl2xjzk29pkllq"; + rev = "refs/tags/${version}"; + sha256 = "sha256-HJPNpLRJPnziSMvxLCiNDeCWO439ELSZs/4Cq1a7Amo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-rAZCj5xtwTgd9/KDYnQTU1jbabtWJF5MCFgcmixDN/Q="; - ldflags = [ - "-X main.AppVersion=${version}" - ]; + ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = gucci; + }; + + checkFlags = [ "-short" ]; meta = with lib; { description = "A simple CLI templating tool written in golang"; homepage = "https://github.com/noqcks/gucci"; license = licenses.mit; - maintainers = [ maintainers.braydenjw ]; + maintainers = with maintainers; [ braydenjw ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/gucci/deps.nix b/pkgs/tools/text/gucci/deps.nix deleted file mode 100644 index 8e2cc5af3bf1..000000000000 --- a/pkgs/tools/text/gucci/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.6"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } -] - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d5cee5a7d3f..39f7b7cddd29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7172,6 +7172,8 @@ with pkgs; usePulseaudio = true; }; + jasmin-compiler = callPackage ../development/compilers/jasmin-compiler { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -19264,6 +19266,8 @@ with pkgs; libviper = callPackage ../development/libraries/libviper { }; + libviperfx = callPackage ../development/libraries/libviperfx { }; + libvpx = callPackage ../development/libraries/libvpx { }; libvpx_1_8 = callPackage ../development/libraries/libvpx/1_8.nix { }; @@ -30212,6 +30216,9 @@ with pkgs; uvcdynctrl = callPackage ../os-specific/linux/uvcdynctrl { }; + viper4linux = callPackage ../applications/audio/viper4linux { }; + viper4linux-gui = libsForQt5.callPackage ../applications/audio/viper4linux-gui { }; + vkeybd = callPackage ../applications/audio/vkeybd {}; vlc = libsForQt5.callPackage ../applications/video/vlc { @@ -35245,4 +35252,6 @@ with pkgs; honeytail = callPackage ../servers/tracing/honeycomb/honeytail { }; honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { }; + + mictray = callPackage ../tools/audio/mictray { }; }