diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 6e9b7729ad6..6b805c374a0 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -17,6 +17,7 @@ in { config = mkIf cfg.enable { hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932 enable = true; + driSupport = true; driSupport32Bit = true; }; diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index d686cb503d8..96e8d68ae50 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -97,7 +97,7 @@ in { # does a bunch of unrelated things. systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; - security.apparmor.packages = [ pkgs.lxcPackage ]; + security.apparmor.packages = [ cfg.lxcPackage ]; security.apparmor.profiles = [ "${cfg.lxcPackage}/etc/apparmor.d/lxc-containers" "${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start" diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index db8f8ad793a..aafad7f82e7 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.10.0"; + version = "1.10.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-LYndZhg4ILN0E8aRqgUBFzzzLv88TMSXG2OeFxImDu0="; + sha256 = "sha256-FBzdWUgncDCPJGb8T1HvzuuTlDhKa9JJrSrUoPQOSAU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index db5a5d00fc1..924e006c4cc 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.14-4"; + version = "0.9.26"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-ZEpHeBeP2LpjABWD1eQxUORUKsRWvZ8WYa5IxSRLeXc="; + hash = "sha256-LvHvWUS2iEm9m+v+kk7wf+P9xZkOyuoLk4xM4+P2vF8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 0cbe325f62a..d730f966347 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , meson , pkg-config , ninja @@ -36,6 +37,17 @@ stdenv.mkDerivation rec { sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; }; + patches = [ + # XXX: REMOVE ON NEXT VERSION BUMP + # Fixes compatibility of the bluetooth and network modules with linux kernel + # >=5.11 + # c.f. https://github.com/Alexays/Waybar/issues/994 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/Alexays/Waybar/pull/1015.patch"; + sha256 = "sha256-jQZEM3Yru2yxcXAzapU47DoAv4ZoabrV80dH42I2OFk="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wrapGAppsHook cmake ] ++ lib.optional withMediaPlayer gobject-introspection; @@ -82,7 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; license = licenses.mit; - maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; + maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault ]; platforms = platforms.unix; homepage = "https://github.com/alexays/waybar"; }; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index a7d99fc5bd5..1c7a39d91bd 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-GfQjgtjFynYa8SfQyoGjsyXEv0XuaK8ZbTcMhQGkcTg="; + sha256 = "sha256-WcIcI+y8tTY0YfyuR/DUCjN1xbGpCOBWvEHBo+q2EV8="; }; - vendorSha256 = "sha256-Xj9nC9ijLVmrSvgKq33yUyMO+RmeDkf7FKKCehP4GFE="; + vendorSha256 = "sha256-pSiJfQTvJ6OisdrWTH6mOcAn/wBA1OcVaGtOwBe1qvQ="; doCheck = false; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index e5223c35fa3..12e25fb774e 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -11,38 +11,30 @@ , curl , libmaxminddb , gperftools -, python +, python3 , swig , gettext -, fetchpatch , coreutils +, ncurses }: stdenv.mkDerivation rec { pname = "zeek"; - version = "3.2.4"; + version = "4.0.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "11dy4w810jms75nrr3n3dy5anrl5ksb5pmnk31z37k60hg9q9afm"; + sha256 = "0m7zy5k2595vf5xr2r4m75rfsdddigrv2hilm1c3zaif4srxmvpj"; }; nativeBuildInputs = [ cmake flex bison file ]; - buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ] + buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python3 swig ncurses ] ++ lib.optionals stdenv.isDarwin [ gettext ]; - patches = lib.optionals stdenv.cc.isClang [ - # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 - (fetchpatch { - url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch"; - sha256 = "17qznp8yavnv84fjsbghv3d59z6k6rx74j49w0izakmgw5a95w84"; - extraPrefix = "auxil/broker/bindings/python/3rdparty/pybind11/"; - stripLen = 1; - }) - ]; + outputs = [ "out" "lib" "py" ]; cmakeFlags = [ - "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" + "-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages" "-DENABLE_PERFTOOLS=true" "-DINSTALL_AUX_TOOLS=true" ]; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 0835a29fdde..10b3f2d175a 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-YnrJv2tpG1CT1aaZsn/j3ygPhXhTsfEyB/GcEPCgl/g="; + sha256 = "sha256-qKvzxIFUiRoX/fCTDoGOGFMfzMTCRq+A5b9K2J2Wnwk="; }; postPatch = '' diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 2283b45aee4..59a2d11803a 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "sha256-4ogyOKuz6702/sOQNvE+UP+cvQrPPU3VjL4b0FUfRNw="; + sha256 = "sha256-RwpRlcShvZVBR22xkJz50p10SEULXM9/gqVGNXiSM3M="; }; - cargoSha256 = "sha256-lblvun2T1qpFiowld77Ti2MFPzhs5pOWWRbErORXYCM="; + cargoSha256 = "sha256-ezxIDaU270V5oqm1m8mt9QXu/SsrKomaxM2TnH+bSUY="; meta = with lib; { description = "A container debugging tool based on FUSE"; diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 2b0450928f5..aade506483f 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - extra-cmake-modules, gettext, kdoctools, python, + extra-cmake-modules, gettext, kdoctools, cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio, @@ -10,7 +10,7 @@ mkDerivation { name = "xdg-desktop-portal-kde"; meta.broken = lib.versionOlder qtbase.version "5.15.0"; - nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ cups epoxy mesa pcre pipewire wayland wayland-protocols diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 8cce2b66cb6..0ab90c1e063 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xIvcHMDBPdmNSp0/aaVDXxCmCpQOtSFG99lyHAWmbY0="; + sha256 = "sha256-GWSPNz4IxEYxSRpDPbgCXmc7WYZNi8IGVqNhSEgUaeg="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index b7754a186d1..90d3f1da6e6 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, validatePkgConfig, fetchpatch }: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; - nativeBuildInputs = [ cmake python validatePkgConfig ]; + nativeBuildInputs = [ cmake python3 validatePkgConfig ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index dbdc9ce2871..092ab62ed7c 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos +{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos , pkg-config, libiconv }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ apr openssl aprutil zlib libiconv ] ++ lib.optional (!stdenv.isCygwin) kerberos; diff --git a/pkgs/development/libraries/serf/scons.patch b/pkgs/development/libraries/serf/scons.patch index a7eefe7d5c1..acfece7ef5f 100644 --- a/pkgs/development/libraries/serf/scons.patch +++ b/pkgs/development/libraries/serf/scons.patch @@ -1,7 +1,16 @@ diff --git a/SConstruct b/SConstruct -index 4358a23..0d862e7 100644 +index 4358a23..6ce7776 100644 --- a/SConstruct +++ b/SConstruct +@@ -55,7 +55,7 @@ def RawListVariable(key, help, default): + # To be used to ensure a PREFIX directory is only created when installing. + def createPathIsDirCreateWithTarget(target): + def my_validator(key, val, env): +- build_targets = (map(str, BUILD_TARGETS)) ++ build_targets = (list(map(str, BUILD_TARGETS))) + if target in build_targets: + return PathVariable.PathIsDirCreate(key, val, env) + else: @@ -155,6 +155,7 @@ if sys.platform == 'win32': env = Environment(variables=opts, tools=('default', 'textfile',), @@ -10,3 +19,25 @@ index 4358a23..0d862e7 100644 ) env.Append(BUILDERS = { +@@ -163,9 +164,9 @@ env.Append(BUILDERS = { + suffix='.def', src_suffix='.h') + }) + +-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' +- 'SERF_MINOR_VERSION ([0-9]+).*' +- 'SERF_PATCH_VERSION ([0-9]+)', ++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' ++ b'SERF_MINOR_VERSION ([0-9]+).*' ++ b'SERF_PATCH_VERSION ([0-9]+)', + env.File('serf.h').get_contents(), + re.DOTALL) + MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] +@@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print('Warning: Used unknown variables:', ', '.join(list(unknown.keys()))) + + apr = str(env['APR']) + apu = str(env['APU']) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 1c3c72a8e2c..e6cc3182487 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "0k5c4a7xcbiyah8rgrfh2hwj3l3a9al7rh2lyz9ip4rr1hwnqvaf"; + sha256 = "0ram1niv2lg9qj53zssph104a4kxl8f94ilfn6mibn034m3ikcc8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index b9ffd35bf96..96e6b86c150 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "clldutils"; - version = "3.6.0"; + version = "3.7.0"; disabled = isPy27; src = fetchFromGitHub { owner = "clld"; repo = pname; rev = "v${version}"; - sha256 = "10jcd2x99z5ym2aki92c54caw97b3xgrkjj83qpln26hbdwpaz99"; + sha256 = "13shas7krf7j04gqxjn09ipy318hmrp1s3b5d576d5r1xfxakam4"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index c57329eebcc..65ad31af2eb 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0ch85h5xrb15fcml5v0f30s0niw02k4v8gi7i8a40161yj882hm7"; + sha256 = "4a77a79e990004af96e789565b174f9b971f00afa23142f6673722dae0910b0c"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index e5325f7da8c..32d0e9657e3 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.39"; + version = "8.40"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-CPPSJVKf01TA89Qk/uyvIU+ejo5JyT4Mc35KKJPv4IE="; + sha256 = "sha256-Zw8FfWHMbO+PBED4OPStzqahbJ5jS8Dpahxu6rU/wOQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 4d7bc7c277b..330eeb85531 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.4.2"; + version = "2.4.3"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-hOTxlrS47gS7stfNXuGKkAbCINhPXBVncOdPr1EDU5M="; + sha256 = "sha256-68Q0kG9DEBofNxhGz11ftGNW3d6UICHEwV0yhje8PWg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 140e4869e88..80e8119b6b3 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.11924"; + version = "0.1.12214"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KY1kqqRRpwNt0ovllfFcWSsJAH2J1NrlQAueqQrw354="; + sha256 = "sha256-YV/fqATdGqlAdpKuOMq8KO9UQ+4D1PHwIE5O1zqndHQ="; }; vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs="; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 42faaf287d7..6692f9bd9b2 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -140,6 +140,7 @@ in buildFHSUserEnv rec { # dependencies for mesa drivers, needed inside pressure-vessel mesa.drivers + vulkan-loader expat wayland xlibs.libxcb @@ -232,7 +233,14 @@ in buildFHSUserEnv rec { libvdpau ] ++ steamPackages.steam-runtime-wrapped.overridePkgs) ++ extraLibraries pkgs; - extraBuildCommands = if (!nativeOnly) then '' + extraBuildCommands = '' + if [ -f $out/usr/share/vulkan/icd.d/nvidia_icd.json ]; then + cp $out/usr/share/vulkan/icd.d/nvidia_icd{,32}.json + nvidia32Lib=$(realpath $out/lib32/libGLX_nvidia.so.0 | cut -d'/' -f-4) + escapedNvidia32Lib="''${nvidia32Lib//\//\\\/}" + sed -i "s/\/nix\/store\/.*\/lib\/libGLX_nvidia\.so\.0/$escapedNvidia32Lib\/lib\/libGLX_nvidia\.so\.0/g" $out/usr/share/vulkan/icd.d/nvidia_icd32.json + fi + '' + (if (!nativeOnly) then '' mkdir -p steamrt ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch} ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' @@ -245,7 +253,7 @@ in buildFHSUserEnv rec { ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0 ''} - ''; + ''); extraInstallCommands = '' mkdir -p $out/share/applications diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index f005a59dbfa..d8db893f7d7 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile -, python2, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex +, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , makeWrapper, t1utils , texlive, tex ? texlive.combine { @@ -9,22 +9,13 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.20.0"; + version = "2.22.0"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar"; + sha256 = "0khg9dlm1b02mm9w54xqc9ydj416xkikn6p08g1asiyjf4qx1pb4"; }; - patches = [ - ./findlib.patch - (fetchurl { - name = "CVE-2020-17353.patch"; - url = "https://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=b84ea4740f3279516905c5db05f4074e777c16ff;hp=b97bd35ac99efd68569327f62f3c8a19511ebe43"; - sha256 = "1i79gy3if070rdgj7j6inw532j0f6ya5qc6kgcnlkbx02rqrhr7v"; - }) - ]; - postInstall = '' for f in "$out/bin/"*; do # Override default argv[0] setting so LilyPond can find @@ -51,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm - python2 gettext perl fontconfig freetype pango + python3 gettext perl fontconfig freetype pango fontforge help2man groff t1utils ]; diff --git a/pkgs/misc/lilypond/findlib.patch b/pkgs/misc/lilypond/findlib.patch deleted file mode 100644 index 30e130bc8ad..00000000000 --- a/pkgs/misc/lilypond/findlib.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make -index 3825101..bf37d16 100644 ---- a/stepmake/stepmake/executable-vars.make -+++ b/stepmake/stepmake/executable-vars.make -@@ -1,4 +1,4 @@ --MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS))) -+MODULE_LIBES =$(addprefix , $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS))) - LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(CONFIG_LIBS) - - EXECUTABLE = $(outdir)/$(NAME) - -diff --git a/make/stepmake.make b/make/stepmake.make -index 604341b..7f0d9d8 100644 ---- a/make/stepmake.make -+++ b/make/stepmake.make -@@ -87,7 +87,7 @@ outdir=$(outroot)/$(outbase) - config_h=$(top-build-dir)/config$(CONFIGSUFFIX).hh - - # The outdir that was configured for: best guess to find binaries --outconfbase=out$(CONFIGSUFFIX) -+outconfbase=$(outdir) - outconfdir=$(outroot)/$(outconfbase) - - # user package diff --git a/pkgs/os-specific/linux/nvmet-cli/default.nix b/pkgs/os-specific/linux/nvmet-cli/default.nix new file mode 100644 index 00000000000..4196efeae67 --- /dev/null +++ b/pkgs/os-specific/linux/nvmet-cli/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchurl }: + +python3Packages.buildPythonApplication rec { + pname = "nvmet-cli"; + version = "0.7"; + + src = fetchurl { + url = "ftp://ftp.infradead.org/pub/nvmetcli/nvmetcli-${version}.tar.gz"; + sha256 = "051y1b9w46azy35118154c353v3mhjkdzh6h59brdgn5054hayj2"; + }; + + buildInputs = with python3Packages; [ nose2 ]; + + propagatedBuildInputs = with python3Packages; [ configshell ]; + + # This package requires the `nvmet` kernel module to be loaded for tests. + doCheck = false; + + meta = with lib; { + description = "NVMe target CLI"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ hoverbear ]; + }; +} diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 9dc723417d6..fb4372a1d89 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.9.2"; + version = "1.9.3"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-e4pE30MvJ/9wrYA1oolBF+5C1IHTm+4xhDb88Il9E7o="; + sha256 = "sha256-/PjtLZtMSq/+S1mWe0oJ+dRCmCq0mlgvreL2awm0PcE="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-bTwm6F1Y0LFTfUJ5zIsmGcNztwC2aTJIDd+bDPqnzcA="; + vendorSha256 = "sha256-eIW3xQgy2doirGwKGE6OFGgXtKs8LYx3sfsnIu8n5Hg="; doCheck = false; diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index a95a2ad27c3..eb6f9345b2d 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "atheme"; - version = "7.2.10-r2"; + version = "7.2.11"; src = fetchgit { url = "https://github.com/atheme/atheme.git"; rev = "v${version}"; - sha256 = "1yasfvbmixj4zzfv449hlcp0ms5c250lrshdy6x6l643nbnix4y9"; + sha256 = "15fs48cgzxblh2g4abl5v647ndfx9hg8cih2x67v3y7s9wz68wk2"; leaveDotGit = true; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 40c12929635..b33ab7b505e 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.17.598"; + version = "0.17.606"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-G66P/sYodD15OxuFD+peF92jSeog70Rh10mkjYRhnl0="; + sha256 = "sha256-SWZMS5O1hp9RsFlivfegqoiCLLd9PZthxbrn6IL+FzI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 6f6b5c39074..20608f796fc 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.22.12"; + version = "0.22.13"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-SYgBy2WGP6ssMDohnbflnd2XpF8iwmxoTTlHQYc1+Wo="; + sha256 = "sha256-9/fpdxD3xj2hCId9koNhZLgA8SeucTue2iC/4Ues7bM="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-Q87cGO82EmehpuMR3SCW9oF8DtaGURp4coLec4Rv2Js="; + vendorSha256 = "sha256-dDJDiCWG4+YZzTsEbhv4KzuwrkBGYUxJzknBbrWGiCE="; doCheck = false; diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index 8efebb8f321..be87b97ebd7 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, readline }: stdenv.mkDerivation rec { - pname = "mrsh"; - version = "2020-11-04"; + pname = "mrsh-unstable"; + version = "2021-01-10"; src = fetchFromGitHub { owner = "emersion"; repo = "mrsh"; - rev = "1738e41b2a35e5f99b9a1300a5f687478458226a"; - sha256 = "08gak5261d4sd6b2w2kscmdwa4gwcp5drgfyb3swyrj9cl0nlcbn"; + rev = "9f9884083831ea1f94bdda5151c5df3888932849"; + sha256 = "0vvdwzw3fq74lwgmy6xxkk01sd68fzhsw84c750lm1dma22xhjci"; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + }; + + passthru = { + shellPath = "/bin/mrsh"; }; } diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 33e71358b4d..68f34fe8eb1 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -1,23 +1,25 @@ -{ buildGoPackage, fetchgit, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -buildGoPackage rec { +buildGoModule rec { pname = "oh"; - version = "20160522-${lib.strings.substring 0 7 rev}"; - rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4"; + version = "0.8.0"; - goPackagePath = "github.com/michaelmacinnis/oh"; - - src = fetchgit { - inherit rev; - url = "https://github.com/michaelmacinnis/oh"; - sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr"; + src = fetchFromGitHub { + owner = "michaelmacinnis"; + repo = pname; + rev = "v${version}"; + sha256 = "0sdpk77i5mfamkdqldybl9znzz92hqgi4xvby5j28m0a5gw46kj0"; }; - goDeps = ./deps.nix; + vendorSha256 = "12vlvh37hvi8c1i9arppm5wj4v9c98s7myxra10q6qpdqssgc8a0"; - meta = with lib;{ + meta = with lib; { homepage = "https://github.com/michaelmacinnis/oh"; - description = "A Unix shell"; - license = lib.licenses.mit; + description = "A new Unix shell"; + license = licenses.mit; + }; + + passthru = { + shellPath = "/bin/oh"; }; } diff --git a/pkgs/shells/oh/deps.nix b/pkgs/shells/oh/deps.nix deleted file mode 100644 index b4b98f10c3a..00000000000 --- a/pkgs/shells/oh/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; - sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; - }; - } - { - goPackagePath = "github.com/michaelmacinnis/adapted"; - fetch = { - type = "git"; - url = "https://github.com/michaelmacinnis/adapted"; - rev = "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978"; - sha256 = "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "ad1edfd30321d8f006ccf05f1e0524adeb943060"; - sha256 = "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"; - }; - } -] diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 7416961e84e..963063710a3 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "1cqa52n5y6g087w4yzc273jpxhzpinwkqd32azg03dkczbgx5b2v"; + sha256 = "sha256-udHSyw7tf1toB+v67BvJ49INFJdNR2BjQuHEzQJyIoU="; }; - cargoSha256 = "00yhp2b74plrbi944apbxpkw2y6nbgf81sinfchw44ww1i58mfhj"; + cargoSha256 = "sha256-vVIanMkc0sPzu0L48oOh8wEEUOckR/AYkz81u4OR+fE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/s5cmd/default.nix b/pkgs/tools/networking/s5cmd/default.nix new file mode 100644 index 00000000000..f4a6c2915be --- /dev/null +++ b/pkgs/tools/networking/s5cmd/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "s5cmd"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "peak"; + repo = "s5cmd"; + rev = "v${version}"; + sha256 = "sha256-09vBYwnTfLIuu2SPP7DYB+U6sUkQffglIOHNn4+47qQ="; + }; + + vendorSha256 = null; + + meta = with lib; { + homepage = "https://github.com/peak/s5cmd"; + description = "Parallel S3 and local filesystem execution tool"; + license = licenses.mit; + maintainers = with maintainers; [ tomberek ]; + }; +} diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index 8993208e16e..5bccb233d20 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "aide"; - version = "0.17"; + version = "0.17.1"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-T9iNHV3ccMaYxlGeu8BcjTLD9tgTe7/e/q66r9bbhns="; + sha256 = "sha256-pAHJUZOPEWnOrshozjWUc26JxciBV4wmPYqCSgawAC0="; }; buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a23f99c179..4c717c5418d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7722,6 +7722,8 @@ in s4cmd = callPackage ../tools/networking/s4cmd { }; + s5cmd = callPackage ../tools/networking/s5cmd { }; + s3gof3r = callPackage ../tools/networking/s3gof3r { }; s6-dns = skawarePackages.s6-dns; @@ -19822,6 +19824,8 @@ in nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; + nvmet-cli = callPackage ../os-specific/linux/nvmet-cli { }; + system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { }; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4937a8a207..7a40c4dbefe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8667,6 +8667,10 @@ in { zdaemon = callPackage ../development/python-modules/zdaemon { }; + zeek = disabledIf (!isPy3k) (toPythonModule (pkgs.zeek.override { + python3 = python; + })).py; + zeep = callPackage ../development/python-modules/zeep { }; zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py;