diff options
63 files changed, 411 insertions, 145 deletions
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index c7b1e405ebba1..2511f06818659 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -86,6 +86,7 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, readline,,,,,, say,https://github.com/Olivine-Labs/say.git,,,,, +serpent,,,,,,lockejan sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, diff --git a/nixos/modules/services/networking/soju.nix b/nixos/modules/services/networking/soju.nix index a92d274aea281..32ace43660a78 100644 --- a/nixos/modules/services/networking/soju.nix +++ b/nixos/modules/services/networking/soju.nix @@ -49,12 +49,14 @@ in tlsCertificate = mkOption { type = types.nullOr types.path; + default = null; example = "/var/host.cert"; description = lib.mdDoc "Path to server TLS certificate."; }; tlsCertificateKey = mkOption { type = types.nullOr types.path; + default = null; example = "/var/host.key"; description = lib.mdDoc "Path to server TLS certificate key."; }; @@ -97,6 +99,16 @@ in ###### implementation config = mkIf cfg.enable { + assertions = [ + { + assertion = (cfg.tlsCertificate != null) == (cfg.tlsCertificateKey != null); + message = '' + services.soju.tlsCertificate and services.soju.tlsCertificateKey + must both be specified to enable TLS. + ''; + } + ]; + systemd.services.soju = { description = "soju IRC bouncer"; wantedBy = [ "multi-user.target" ]; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index b91c4243b2b5c..1289ee7549e1b 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.167.5"; + version = "1.168.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-sCqzVXBB2BClepD6+mrHw3GmFh17W0RVp4yTuNO4M3w="; + sha256 = "sha256-/06eZ79Zeq6jtcfq+lOcumBgP59bqCX/Km7k21FroSc="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 1818550b5ff26..012f504e0edea 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.07.22", - "sha256": "sha256-Uw5opguC49FjnklL6RTgxCz+9BwBDJDjqsUXS1sWs9M=" + "rev": "2022.07.27", + "sha256": "sha256-SGozuk0pvp0+PwAFbGG+QMUhQ2A6mXKr31u10WIveh0=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 28c3080577a2b..e1858b5739ba8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1680,6 +1680,22 @@ let ms-vscode.cpptools = callPackage ./cpptools { }; + ms-vscode.PowerShell = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "PowerShell"; + publisher = "ms-vscode"; + version = "2022.7.2"; + sha256 = "sha256-YL90dRmOvfbizT+hfkNu267JtG122LTMS9MHCfaMzkk="; + }; + meta = with lib; { + description = "A Visual Studio Code extension for PowerShell language support"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell"; + homepage = "https://github.com/PowerShell/vscode-powershell"; + license = licenses.mit; + maintainers = with maintainers; [ rhoriguchi ]; + }; + }; + ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index f1a9d7ae6724d..92b8164f8b65d 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-44"; + version = "7.1.0-45"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-vJGZ47l8nSRnINWHsw562zsQ14fSR5SObr/SO+/40yw="; + hash = "sha256-fiygwb15dbMyTZ62iWbhWaHpdmoK4rKeb46v0sojgpc="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index b51bf337f6640..fcb1fc78c26a1 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.11.0"; + version = "0.11.1"; src = fetchCrate { inherit version pname; - sha256 = "sha256-TGraX1H9grqTm3kQ3NLET2EnD9pzdiblEfMt+g5Szkc="; + sha256 = "sha256-RU5DhrfB4XlrI4fHUw0/88Ib6H6xvDlRwUNPPwgVKE0="; }; - cargoSha256 = "sha256-OAQaazT4ChmTokw5yFKaGxwAXJklNgPWaegJVsCkOaA="; + cargoSha256 = "sha256-COWvR7B9tXGuPaD311bFzuoqkISDlIOD6GDQdFa6wT4="; # setid is not allowed in the sandbox checkFlags = [ "--skip=tests::style_for_setid" ]; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index e4626ef3c947c..9b0efb7f25ac3 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.12"; + version = "4.3.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-B9V3dw5A52yPoNfROI3+wAql+Y0hY4T3sTm9uN70TQQ="; + sha256 = "sha256-SUvj9YP7hIgF003caPsx5AWnMYr38y/XRf6TRm0tMAo="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 7ffb24cb41930..da66fd585ff28 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -5,6 +5,7 @@ , gumbo , harfbuzz , jbig2dec +, mujs , mupdf , openjpeg , qt3d @@ -15,29 +16,25 @@ stdenv.mkDerivation rec { pname = "sioyek"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ahrm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G4iZi6xTJjWZN0T3lO0jPquxJ3p8Mc0ewmjJEKcGJ34="; + sha256 = "sha256-F71JXgYaWAye+nlSrZvGjJ4ucvHTx3tPZHRC5QI4QiU="; }; - buildInputs = [ gumbo harfbuzz jbig2dec mupdf openjpeg qt3d qtbase ]; + buildInputs = [ gumbo harfbuzz jbig2dec mupdf mujs openjpeg qt3d qtbase ]; nativeBuildInputs = [ installShellFiles wrapQtAppsHook qmake ]; postPatch = '' - substituteInPlace pdf_viewer_build_config.pro \ - --replace "-lmupdf-threads" "-lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg" substituteInPlace pdf_viewer/main.cpp \ --replace "/usr/share/sioyek" "$out/share" \ --replace "/etc/sioyek" "$out/etc" ''; - qmakeFlags = "DEFINES+=\"LINUX_STANDARD_PATHS\" pdf_viewer_build_config.pro"; - postInstall = '' install -Dm644 tutorial.pdf $out/share/tutorial.pdf cp -r pdf_viewer/shaders $out/share/ diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 051a3f9ae4cd9..8c5c3529998fb 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.14.1"; + version = "1.14.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-Y8Bo2niIyvBE3BPpnSanFrR8ZHIUdG7iKSOyD6YadIM="; + sha256 = "sha256-1E4YtGSiHXG7G60Rng1t4OvgLvn9tjYahCkrFnlfLyw="; }; - vendorSha256 = "sha256-MnSOWJwTOQmHnABRYNJwU9kOr7g51rkUaERksupBTb4="; + vendorSha256 = "sha256-S0297wgoqhPD9+nyzPEytpfppA91PWo1q4B7L8CHKLs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 7350a8bd460b4..244c581b6f95f 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -1,14 +1,20 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }: let ver = "1.2.331.0"; - source = - if stdenv.isDarwin then { - url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; - sha256 = "0gr6frdn9jvxnkymkcpvgkqw4z2sac9jdf5qj4hzakq1zkfviazf"; - } else { - url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; - sha256 = "sha256-xWnY89dslkGhRTh9llRFkuUqYIjHQNt+TLnkPQr3u1Q="; - }; + source = { + url = rec { + "x86_64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; + "aarch64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_arm64/session-manager-plugin.deb"; + "x86_64-darwin" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; + "aarch64-darwin" = x86_64-darwin; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + sha256 = rec { + "x86_64-linux" = "sha256-xWnY89dslkGhRTh9llRFkuUqYIjHQNt+TLnkPQr3u1Q="; + "aarch64-linux" = "sha256-QE6+EjLoydTPuLitG6fALXAtvIkfyoFuWij8Z2HT6+Q="; + "x86_64-darwin" = "0gr6frdn9jvxnkymkcpvgkqw4z2sac9jdf5qj4hzakq1zkfviazf"; + "aarch64-darwin" = x86_64-darwin; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin"; in stdenv.mkDerivation rec { @@ -35,10 +41,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = - "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; + homepage = "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; description = "Amazon SSM Session Manager Plugin"; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mbaillie ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7506dae367788..ec2d717e359d2 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.5.3"; + version = "3.5.4"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-J6ukQ29DpCgmX9MF+evWXAy3usl0xB/xv4inBPS8nQI="; + sha256 = "sha256-ennKNUuoyhpVfG1XPzJKrop0i77BAB3C2MNqZPOXNkc="; }; patches = [ diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/applications/radio/srsran/default.nix index dc7ae777df713..f9a1c5fbbe67b 100644 --- a/pkgs/applications/radio/srsran/default.nix +++ b/pkgs/applications/radio/srsran/default.nix @@ -12,6 +12,7 @@ , uhd , soapysdr , libbladeRF +, zeromq }: stdenv.mkDerivation rec { @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { uhd soapysdr libbladeRF + zeromq ]; meta = with lib; { diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index ec61e0bd7ce43..29ba667b05527 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { }) ]; + # tests require `bgzip` from the htslib package + checkInputs = [ htslib ]; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib ncurses htslib ]; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index a042bd6c751b8..d3cb55532302c 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,13 +1,13 @@ {lib, stdenv, fetchurl, cmake, libGLU, libGL, qt5, boost}: stdenv.mkDerivation rec { - version = "201707"; + version = "202206"; build_nr = "1"; pname = "mcrl2"; src = fetchurl { url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz"; - sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; + sha256 = "KoLt8IU/vCdYqzJukNuaZfl8bWiOKB0UxWHEdQj3buU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index c99bb409c3e90..824a54456bb73 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - sha256 = "sha256-BOT2pKcOSOha28fba62X+GgILcplhkMWhZo7Q0gGTQ8="; + sha256 = "sha256-G8Y8ooi3aX6v/Ied62eSfo6PvXbZtx455bF0wVkZN30="; }; - cargoSha256 = "sha256-uvR+WXX2iIWFhcPYpOoOS1WBvOXuhTmgVVT2446c6XE="; + cargoSha256 = "sha256-7nWrwpv3xAffKiaUsnoA+h6ledjgG9tQeQ69WNl6e8o="; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index e98eb404b9c7a..b9d5a3e9275dc 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -13,6 +13,12 @@ buildGoModule rec { vendorSha256 = null; + ldflags = [ + "-w" "-s" + "-X github.com/docker/buildx/version.Package=github.com/docker/buildx" + "-X github.com/docker/buildx/version.Version=v${version}" + ]; + installPhase = '' install -D $GOPATH/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx ''; diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index e44519a04046d..f66ad38f7b86e 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -88,6 +88,8 @@ let /lib32 /usr/lib/i386-linux-gnu /usr/lib32 + /run/opengl-driver/lib + /run/opengl-driver-32/lib EOF ldconfig &> /dev/null ''; diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 945b9287ed00a..925dfc8bfbe2d 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -50,7 +50,8 @@ let ]; ldconfig = writeShellScriptBin "ldconfig" '' - exec ${pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" + # due to a glibc bug, 64-bit ldconfig complains about patchelf'd 32-bit libraries, so we're using 32-bit ldconfig + exec ${pkgsi686Linux.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" ''; etcProfile = writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' diff --git a/pkgs/data/misc/unihan-database/default.nix b/pkgs/data/misc/unihan-database/default.nix index 02632b9264486..8fb065d6b00d3 100644 --- a/pkgs/data/misc/unihan-database/default.nix +++ b/pkgs/data/misc/unihan-database/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "unihan-database"; - version = "12.1.0"; + version = "14.0.0"; src = fetchurl { url = "https://www.unicode.org/Public/zipped/${version}/Unihan.zip"; - sha256 = "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf"; + hash = "sha256-KuRRmyuCzU0VN5wX5Xv7EsM8D1TaSXfeA7KwS88RhS0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix index 08f31148d4c52..0fb9d7d058b4c 100644 --- a/pkgs/development/compilers/xa/xa.nix +++ b/pkgs/development/compilers/xa/xa.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "xa"; - version = "2.3.12"; + version = "2.3.13"; src = fetchurl { urls = [ "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" ]; - hash = "sha256-+P0VNgEtZ2/Gy/zdapF5PlZMibbvdH+NuPRnwXj7BwQ="; + hash = "sha256-qUd68VC2yKkc09QeHPjJ31UtODMmSVV2gwJxykRnvYY="; }; checkInputs = [ perl ]; diff --git a/pkgs/development/coq-modules/smtcoq/cvc4.nix b/pkgs/development/coq-modules/smtcoq/cvc4.nix index 7e31ba67b4f48..cbedf1658e4e7 100644 --- a/pkgs/development/coq-modules/smtcoq/cvc4.nix +++ b/pkgs/development/coq-modules/smtcoq/cvc4.nix @@ -1,6 +1,6 @@ { lib, stdenv, cln, fetchurl, gmp, swig, pkg-config -, readline, libantlr3c, boost, jdk8, autoreconfHook -, python3, antlr3_4 +, libantlr3c, boost, autoreconfHook +, python3 }: stdenv.mkDerivation rec { @@ -13,13 +13,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ gmp readline swig libantlr3c antlr3_4 boost jdk8 python3 ] + buildInputs = [ gmp swig libantlr3c boost python3 ] ++ lib.optionals stdenv.isLinux [ cln ]; configureFlags = [ - "--enable-language-bindings=c,c++,java" + "--enable-language-bindings=c" "--enable-gpl" - "--with-readline" "--with-boost=${boost.dev}" ] ++ lib.optionals stdenv.isLinux [ "--with-cln" ]; diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index 093c1ef15d740..a09930a7c7cc1 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }: +{ lib, stdenv, gcc10StdenvCompat, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }: with lib; let @@ -10,7 +10,9 @@ let }; meta.broken = false; }); - cvc4 = pkgs.callPackage ./cvc4.nix {}; + cvc4 = pkgs.callPackage ./cvc4.nix { + stdenv = gcc10StdenvCompat; + }; in mkCoqDerivation { diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/development/interpreters/yabasic/default.nix index 02d3dbeb9fd1d..9266ec0122517 100644 --- a/pkgs/development/interpreters/yabasic/default.nix +++ b/pkgs/development/interpreters/yabasic/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yabasic"; - version = "2.90.1"; + version = "2.90.2"; src = fetchurl { url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz"; - hash = "sha256-9LqiwS3Udql3YZoufo3spVpE46me3McI8L08TpNJpJo="; + hash = "sha256-ff5j0cJ1i2HWIsYjwzx5FFtZfchWsGRF2AZtbDXrNJw="; }; buildInputs = [ diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index bea4692396ae5..1bc3d49bea2fe 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -49,8 +49,11 @@ , alsa-lib ? null # Alsa in/output support #, avisynth ? null # Support for reading AviSynth scripts , bzip2 ? null +, clang ? null , celt ? null # CELT decoder #, crystalhd ? null # Broadcom CrystalHD hardware acceleration +, cuda ? !stdenv.isDarwin && !stdenv.isAarch64 # Dynamically linked CUDA +, cuda-llvm ? !stdenv.isDarwin && !stdenv.isAarch64 # LLVM-based CUDA compilation , dav1d ? null # AV1 decoder (focused on speed and correctness) #, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support , fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder @@ -331,6 +334,8 @@ stdenv.mkDerivation rec { #(enableFeature avisynth "avisynth") (enableFeature (bzip2 != null) "bzlib") (enableFeature (celt != null) "libcelt") + (enableFeature cuda "cuda") + (enableFeature (clang != null && cuda-llvm) "cuda-llvm") #(enableFeature crystalhd "crystalhd") (enableFeature (dav1d != null) "libdav1d") #(enableFeature decklinkExtlib "decklink") @@ -451,6 +456,7 @@ stdenv.mkDerivation rec { ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx ++ optional (nvdec || nvenc) nv-codec-headers + ++ optional cuda-llvm clang ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration libiconv ]; diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index c806636ff8dc2..157d7fa84040a 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-2lBBC48Z/X53WwDR/g26Z/xeEVHe0pkVjcJd2tw/qKk="; }; - patches = [ + patches = lib.optionals stdenv.isLinux [ (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; @@ -58,14 +58,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - bubblewrap xkeyboard_config libxkbcommon # for xkbregistry isocodes - wayland gtk3 gtk4 glib + ] ++ lib.optionals stdenv.isLinux [ + bubblewrap + wayland libseccomp systemd ]; @@ -79,6 +80,9 @@ stdenv.mkDerivation rec { "-Ddesktop_docs=false" "-Ddate_in_gnome_version=false" "-Dgnome_distributor=NixOS" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsystemd=disabled" + "-Dudev=disabled" ]; separateDebugInfo = stdenv.isLinux; @@ -93,7 +97,7 @@ stdenv.mkDerivation rec { description = "Library with common API for various GNOME modules"; homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; license = with licenses; [ gpl2Plus lgpl2Plus ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index e2c692c840579..607180b7d8199 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -17,6 +17,10 @@ sha256 = "sha256-zr1WuTkOBAVk7JkpDT52rfGGOaXEqiPFIGmJUDPhI/w="; }; + configureFlags = old.configureFlags ++ [ + "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067 + ]; + postPatch = '' for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index 92cc1424af9fa..72d21ed0d2c45 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "lib2geom"; - version = "1.1"; + version = "1.2"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "inkscape"; repo = "lib2geom"; rev = "refs/tags/${version}"; - sha256 = "sha256-u9pbpwVzAXzrM2/tQnd1B6Jo9Fzg6UZBr9AtUsNMfQ0="; + sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index ef2daeb7074cd..54bf206015608 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -17,6 +17,8 @@ , gnome , gsettings-desktop-schemas , xvfb-run +, AppKit +, Foundation }: stdenv.mkDerivation rec { @@ -48,11 +50,16 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + ] ++ lib.optionals (!doCheck) [ + "-Dtests=false" ]; buildInputs = [ fribidi gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Foundation ]; propagatedBuildInputs = [ @@ -61,10 +68,15 @@ stdenv.mkDerivation rec { checkInputs = [ gnome.adwaita-icon-theme + ] ++ lib.optionals (!stdenv.isDarwin) [ xvfb-run ]; - doCheck = true; + # Tests had to be disabled on Darwin because they fail with the same error as https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264947 on Hydra: + # + # In file included from ../tests/test-style-manager.c:10: + # ../src/adw-settings-private.h:16:10: fatal error: 'adw-enums-private.h' file not found + doCheck = !stdenv.isDarwin; checkPhase = '' runHook preCheck @@ -81,7 +93,7 @@ stdenv.mkDerivation rec { # Tests need a cache directory "HOME=$TMPDIR" ) - env "''${testEnvironment[@]}" xvfb-run \ + env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.isDarwin) "xvfb-run"} \ meson test --print-errorlogs runHook postCheck @@ -102,6 +114,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ dotlambda ]); - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/development/libraries/libcdada/default.nix index 94976c1be46a3..6fb8caa4746a2 100644 --- a/pkgs/development/libraries/libcdada/default.nix +++ b/pkgs/development/libraries/libcdada/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libcdada"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - sha256 = "0vcsf3s4fbw2w33jjc8b509kc0xb6ld58l8wfxgqwjqx5icfg1ps"; + sha256 = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index f90de7fc6effe..65dcd3587af1a 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -11,6 +11,18 @@ , libwebpmuxSupport ? true # Build libwebpmux , libwebpdemuxSupport ? true # Build libwebpdemux , libwebpdecoderSupport ? true # Build libwebpdecoder + +# for passthru.tests +, freeimage +, gd +, graphicsmagick +, haskellPackages +, imagemagick +, imlib2 +, libjxl +, opencv +, python3 +, vips }: stdenv.mkDerivation rec { @@ -51,6 +63,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit freeimage gd graphicsmagick imagemagick imlib2 libjxl opencv vips; + inherit (python3.pkgs) pillow imread; + haskell-webp = haskellPackages.webp; + }; + meta = with lib; { description = "Tools and library for the WebP image format"; homepage = "https://developers.google.com/speed/webp/"; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 4614c14981466..72da2a34e7529 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Ignore broken test, likely not causing huge breakage + # (https://github.com/canonical/raft/issues/292) + postPatch = '' + substituteInPlace test/integration/test_uv_tcp_connect.c --replace \ + "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, 0, NULL)" \ + "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, MUNIT_TEST_OPTION_TODO, NULL)" + ''; + preConfigure = '' substituteInPlace configure --replace /usr/bin/ " " ''; diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index ab7808b474c04..fc90c6e304fd2 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "1.0.21"; + version = "1.0.24"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-1g3sIRXxYtD8XGVNpbn4HLTCi+xl2yfJklbUouMQcHs="; + hash = "sha256-G7SVKgU4b8I5iwAlGHL/w8z0fhI+Awe3V6aqFsOnUrA="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 50b23a1d99d50..815326e538383 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; + hash = "sha256-/gtkw020pybUDUeYydXgJ4PLvdOqZ0RbrLOfNMDaCmA="; }; # unbreak on darwin by finding argp-standalone, based on the patch from diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 22570d3fbb4bb..60b273f4baece 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2546,6 +2546,39 @@ buildLuarocksPackage { }; }) {}; +serpent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "serpent"; + version = "0.30-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/serpent-0.30-2.rockspec"; + sha256 = "0v83lr9ars1n0djbh7np8jjqdhhaw0pdy2nkcqzqrhv27rzv494n"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/pkulchenko/serpent", + "rev": "d78683597606c6e13a1fed039bc91d86eb8f600f", + "date": "2017-09-01T21:35:14-07:00", + "path": "/nix/store/z6df44n3p07n4bia7s514vgngbkbpnap-serpent", + "sha256": "0q80yfrgqgr01qprf0hrp284ngb7fbcq1v9rbzmdkhbm9lpgy8v8", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/pkulchenko/serpent"; + description = "Lua serializer and pretty printer"; + license.fullName = "MIT"; + }; +}) {}; + sqlite = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, luv }: diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index b1389889b59a1..6e07fcc28cc04 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, chardet , docker , entrypoints , escapism @@ -30,6 +31,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + chardet docker entrypoints escapism diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index e6502a76524c6..737156ad83fd1 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; license = licenses.mit; - maintainers = with maintainers; [ _1000101 prusnak ]; + maintainers = with maintainers; [ prusnak ]; }; } diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index bc9c59754d4a8..b4a2925a4155f 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -80,6 +80,6 @@ buildPythonPackage rec { description = "Python library for communicating with Trezor Hardware Wallet"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; license = licenses.gpl3; - maintainers = with maintainers; [ np prusnak mmahut _1000101 ]; + maintainers = with maintainers; [ np prusnak mmahut ]; }; } diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index 82a130181e0c7..d5bcfa6f463ed 100644 --- a/pkgs/development/tools/kubepug/default.nix +++ b/pkgs/development/tools/kubepug/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubepug"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "rikatz"; repo = "kubepug"; rev = "v${version}"; - sha256 = "sha256-cjL718xTgtYev/lYL24vwZcB+joY3wIY4ixRCwAHQ4E="; + sha256 = "sha256-BljDmyueGtQztdHnix4YP+zvhor1+ofahQ8971/o1xY="; }; - vendorSha256 = "0hynxj3q4aa1gx3w4ak56z6j5iplxi2hzqzsjkgz20fy34nfd41s"; + vendorSha256 = "sha256-SZckJDFYGsjYEzpJOZ1BE0gNLqn4so23OcOUnPo6zdU="; ldflags = [ "-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}" diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 084b85b7ce4ef..583624d8164cb 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-oNTGFoz/5KaxniA0+HfyGAFIt42a8YLdI3eeARWx2uA="; + sha256 = "sha256-F2kIFBsLhjV8Ecof05Ii5TzneEUdl9dmCZ2NhOABdmc="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/games/lgames/lpairs2/default.nix index 7fcc03d8cce66..394b690b63ddc 100644 --- a/pkgs/games/lgames/lpairs2/default.nix +++ b/pkgs/games/lgames/lpairs2/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lpairs2"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-35KYDnPWOjNPu9wz9AWvSBAo1tdVDo7I2TNxtxE5RRg="; + hash = "sha256-swe/cB9RqxHSNSShiryJ8XfwZk2X6qIDxFURbwNOd58="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/pam_gnupg/default.nix b/pkgs/os-specific/linux/pam_gnupg/default.nix index ffb397334c16a..1c54c42120ab7 100644 --- a/pkgs/os-specific/linux/pam_gnupg/default.nix +++ b/pkgs/os-specific/linux/pam_gnupg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pam_gnupg"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "cruegge"; repo = "pam-gnupg"; rev = "v${version}"; - sha256 = "sha256-NDl6MsvIDAXkaLqXt7Wa0T7aulT31P5Z/d/Vb+ILya0="; + sha256 = "sha256-6I9a841qohA42lhOgZf/hharnjkthuB8lRptPDxUgMI="; }; configureFlags = [ diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index 2d842165d11d3..2a98b9717085c 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -13,6 +13,20 @@ buildGoModule rec { vendorSha256 = "sha256-cpY+lYM/nAX3nUaFknrRAavxDk8UDzJkoqFjJ1/KWeg="; + ldflags = [ + "-X main.themesPath=${placeholder "out"}/share/alps/themes" + "-X git.sr.ht/~migadu/alps.PluginDir=${placeholder "out"}/share/alps/plugins" + ]; + + postPatch = '' + substituteInPlace plugin.go --replace "const PluginDir" "var PluginDir" + ''; + + postInstall = '' + mkdir -p "$out/share/alps" + cp -r themes plugins "$out/share/alps/" + ''; + proxyVendor = true; meta = with lib; { diff --git a/pkgs/servers/etcd/3.3.nix b/pkgs/servers/etcd/3.3.nix index 4dbe693297250..44edfd76a2993 100644 --- a/pkgs/servers/etcd/3.3.nix +++ b/pkgs/servers/etcd/3.3.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests, stdenv }: buildGoPackage rec { pname = "etcd"; @@ -31,5 +31,6 @@ buildGoPackage rec { license = licenses.asl20; homepage = "https://etcd.io/"; maintainers = with maintainers; [ offline zowoq ]; + broken = stdenv.isDarwin; # outdated golang.org/x/sys }; } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 4c36a86c9eb80..8218735a94c90 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.5"; + version = "9.0.6"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-TYT1eJ9jg82GFunYofPMCWuHB60qFg1lWTH2iapyUlc="; + sha256 = "sha256-at9JvFLP2xGIFQODHw8zi3kEqIKJ8SBwBbcjVLVeYRc="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-NljayyDOVazm5OyQw+XlHJgW0caC4TSmR56QwTTWrlw="; + sha256 = "sha256-92gWk5G6zLmesS0r5QRePdsVYJ9CFS/i0rsT8HOK1Js="; }; vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8="; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 078bd329a3c9c..8c2e178e05b83 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.27.2.5929-a806c5905"; + version = "1.28.0.5999-97678ded3"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0xm8bjmmybmyv1nbip8n23pd61lnvr41rsxa12cb9j6bg4nbka3x"; + sha256 = "sha256-irHHEkbdRabzcNiemcFeFoDmB7LZqhFYMe+zVpMv5JQ="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "15wjy59ga5y93y09l5mbi20rqw63v61xv7x831iinhp96v5ixq00"; + sha256 = "sha256-RxD0wLZ/Uw0niKZdAfEhDxnf2jZapbrjSjH3XerfTsM="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 5884e026141df..271a8ae784d15 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-uzjcLLWo+67ayaSjAvk2ktBO3s1z0jDyGRj+Q9F6UVQ="; + sha256 = "sha256-W/2MNiECzwgRv3jJG0To8vsQjQs8amaEP+dgig6JnOg="; }; - vendorSha256 = "sha256-AQwd4N4uYEDCsrlxrrGiXAqLcsSA/2MBydHEnH1j+Do="; + vendorSha256 = "sha256-98YT0UiVX+ONP+Vgsxf0UWOLF0VV4glEOfHYkGwB3Dg="; doCheck = false; diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index 942dd7aa96c64..33d63417d5957 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-J9Wd2CyQo8vzfE2jXQzbNA+oihG71F3ZQmEW/r0a72I=1"; + sha256 = "sha256-Q2/F4/bPhPmwkbc7dulx4jubwdwiwVWMNBclO2qf8rU="; }; - vendorSha256 = "sha256-5+wuavHLXwjtvwA9tSpdF2Zd8tw5FklzvaTeCZlA4WQ="; + vendorSha256 = "sha256-gmLPMar3ICZ14uxahQPkruKUoZbnvYAdu5IfO2pNEXM="; doCheck = false; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index 11a18dc199d41..b8950707de78f 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sec"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "simple-evcorr"; repo = "sec"; rev = version; - sha256 = "sha256-WYSlIRhDBIDaza92VqCQcdMNicuRUX2IKY5CJyhswdI="; + sha256 = "sha256-DKbh6q0opf749tbGsDMVuI5G2UV7faCHUfddH3SGOpo="; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix new file mode 100644 index 0000000000000..b12da3eade3dd --- /dev/null +++ b/pkgs/tools/filesystems/kdiskmark/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, wrapQtAppsHook +, qtbase +, qttools +, fio +, cmake +, kauth +, extra-cmake-modules +, fetchFromGitHub +}: +stdenv.mkDerivation rec { + name = "kdiskmark"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "jonmagon"; + repo = "kdiskmark"; + rev = version; + sha256 = "sha256-9ufRxEbqwcRs+m/YW8D3+1USCJNZEaOUZRec7gvgmtA="; + }; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ + qtbase + qttools + extra-cmake-modules + kauth + ]; + + postInstall = '' + # so that kdiskmark can be used as unpriviledged user even on non-kde + # (where kauth is not in environment.systemPackages) + ln -s ${kauth}/share/dbus-1/system.d/org.kde.kf5auth.conf $out/share/dbus-1/system.d/00-kdiskmark-needs-org.kde.kf5auth.conf + ''; + + qtWrapperArgs = + [ "--prefix" "PATH" ":" (lib.makeBinPath [ fio ]) ]; + + meta = with lib; { + description = "HDD and SSD benchmark tool with a friendly graphical user interface"; + longDescription = '' + If kdiskmark is not run as root it can rely on polkit to get the necessary + privileges. In this case you must install it with `environment.systemPackages` + on NixOS, nix-env will not work. + ''; + homepage = "https://github.com/JonMagon/KDiskMark"; + maintainers = [ maintainers.symphorien ]; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/graphics/vkBasalt/default.nix b/pkgs/tools/graphics/vkBasalt/default.nix index b0b9c9b07b415..5ace5af97e501 100644 --- a/pkgs/tools/graphics/vkBasalt/default.nix +++ b/pkgs/tools/graphics/vkBasalt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "vkBasalt"; - version = "0.3.2.5"; + version = "0.3.2.6"; src = fetchFromGitHub { owner = "DadSchoorse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1UHxPtpmkDNOJwKXVlRN2lpvRm4XPHNwxOBpEikXxqA="; + sha256 = "sha256-wk/bmbwdE1sBZPlD+EqXfQWDITIfCelTpoFBtNtZV8Q="; }; nativeBuildInputs = [ glslang meson ninja pkg-config ]; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 6da0de81cd56d..06176efb01e77 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , fetchpatch , substituteAll @@ -41,13 +42,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2022.2"; + version = "2022.5"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-duL1tXhNjLaG6QvjL87LtWxsaoJOA3ShpoILV3EDZ2s="; + sha256 = "sha256-kUxNmTvBEdfdMK6XIbb/6KtW6x/W6BsJewn0AMwbBT8="; }; patches = [ diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index e7025217e34dd..2e6a050457f78 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2022.3"; + version = "2022.12"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ERDaCLj/qvyzAxmpUfFsCx9fsDjlhQ19PRyUTVZ2Z2w="; + sha256 = "sha256-kl9TwrvrIdF/R4NIVXUP2WYDflwB6BE+0j9Rum9jTXY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 31ff5235aac67..4f22a8221d8d3 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.35.2"; + version = "0.35.9"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QCCDZ0zsAqV7tvlBeyTpN5iz/jBc50oBgrmUB/R5wCY="; + sha256 = "sha256-3tggW+M3vZChDT1g77W5M3hchEN6pTSVvkrZda6ZTCY="; }; - vendorSha256 = "sha256-h4sNfV8B+WGgfVPDmWVNek7fQo5qZ3+VGkx4VSw4QF8="; + vendorSha256 = "sha256-/enY0qERFzAIJNcuw1djRGoAcmtz7R5Ikvlts0f7rLc="; subPackages = [ "cmd/tendermint" ]; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 7e9e20dd3b810..b87991003cf13 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.12"; + version = "5.5.13"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "sha256-UJy71VKEKPYfRXZB2lJiy6Ua6BkGW9Uz0zXciZC4oJE="; + sha256 = "sha256-Qd1tPRKbiTNmsOdawxQhJO1ykEA1VdAAXeBPPVlXwvI="; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 34a73bc2eb351..3b43a454c09ae 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-07-27"; + version = "2022-08-02"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4GVlnr7ga+1xOb9cFKNeb0HELj8A8NgxwsKTnNpWqJI="; + hash = "sha256-7wXM4xYuhxdjLvqVeXBnJEr1Pqj28p7YQ1jRbGbOAOA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/tools/security/iaito/default.nix index e2a4d37a9779f..d8bfc9e4747c5 100644 --- a/pkgs/tools/security/iaito/default.nix +++ b/pkgs/tools/security/iaito/default.nix @@ -1,44 +1,52 @@ { lib , stdenv , fetchFromGitHub +, meson +, ninja , pkg-config +, python3 , qtbase , qttools , radare2 , wrapQtAppsHook -, zip , nix-update-script }: +# TODO MacOS support. +# TODO Build and install translations. + stdenv.mkDerivation rec { pname = "iaito"; - version = "5.7.0"; + version = "5.7.2"; src = fetchFromGitHub { owner = "radareorg"; repo = pname; rev = version; - fetchSubmodules = true; - sha256 = "sha256-qEJTsS669eEwo2iiuybN72O5oopCaGEkju8+ekjw2zk="; + sha256 = "sha256-5/G5wfdc6aua90XLP3B7Ruy8F3NTXzWfQE6yVDZ0rX8="; }; - nativeBuildInputs = [ pkg-config qttools wrapQtAppsHook zip ]; + nativeBuildInputs = [ meson ninja pkg-config python3 qttools wrapQtAppsHook ]; + buildInputs = [ radare2 qtbase ]; - postPatch = '' - substituteInPlace Makefile \ - --replace "git submodule update --init" "" + postUnpack = '' + sourceRoot=$sourceRoot/src ''; - NIX_CFLAGS_COMPILE = [ "-I${radare2}/include/libr" "-I${radare2}/include/libr/sdb" ]; + # TODO Fix version checking and version information for r2. + # Version checking always fails due to values being empty strings for some + # reason. Meanwhile, we can safely assume that radare2's runtime and + # compile-time implementations are the same and remove this check. + patches = [ ./remove-broken-version-check.patch ]; installPhase = '' runHook preInstall - install -Dm755 build/iaito $out/bin/iaito - install -Dm644 $src/src/org.radare.iaito.appdata.xml $out/share/metainfo/org.radare.iaito.appdata.xml - install -Dm644 $src/src/org.radare.iaito.desktop $out/share/applications/org.radare.iaito.desktop - install -Dm644 $src/src/img/iaito-o.svg $out/share/pixmaps/iaito-o.svg + install -m755 -Dt $out/bin iaito + install -m644 -Dt $out/share/metainfo $src/src/org.radare.iaito.appdata.xml + install -m644 -Dt $out/share/applications $src/src/org.radare.iaito.desktop + install -m644 -Dt $out/share/pixmaps $src/src/img/iaito-o.svg runHook postInstall ''; @@ -48,14 +56,15 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Official frontend of radare2"; + description = "An official graphical interface of radare2"; longDescription = '' - The official graphical interface for radare2, a libre reverse engineering - framework. + iaito is the official graphical interface of radare2. It's the + continuation of Cutter for radare2 after the Rizin fork. ''; - homepage = "https://github.com/radareorg/iaito"; + homepage = "https://radare.org/n/iaito.html"; changelog = "https://github.com/radareorg/iaito/releases/tag/${src.rev}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ azahi ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/iaito/remove-broken-version-check.patch b/pkgs/tools/security/iaito/remove-broken-version-check.patch new file mode 100644 index 0000000000000..7c4e3ef30ace3 --- /dev/null +++ b/pkgs/tools/security/iaito/remove-broken-version-check.patch @@ -0,0 +1,54 @@ +diff --git i/IaitoApplication.cpp w/IaitoApplication.cpp +index 25b6a4e7..4cbde5c4 100644 +--- i/IaitoApplication.cpp ++++ w/IaitoApplication.cpp +@@ -33,27 +33,6 @@ + #include <R2GhidraDecompiler.h> + #endif + +-static bool versionCheck() { +- // Check r2 version +- QString a = r_core_version (); // runtime library version +- QString b = "" R2_GITTAP; // compiled version +- QStringList la = a.split("."); +- QStringList lb = b.split("."); +- if (la.size() < 2 && lb.size() < 2) { +- eprintf ("Invalid version string somwhere\n"); +- return false; +- } +- if (la.at(0) != lb.at(0)) { +- eprintf ("Major version differs\n"); +- return false; +- } +- if (la.at(1) != lb.at(1)) { +- eprintf ("Minor version differs\n"); +- return false; +- } +- return true; +-} +- + IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc, argv) + { + // Setup application information +@@ -101,21 +80,6 @@ IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc, + std::exit(1); + } + +- if (!versionCheck ()) { +- QMessageBox msg; +- msg.setIcon(QMessageBox::Critical); +- msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No); +- msg.setWindowTitle(QObject::tr("Version mismatch!")); +- QString localVersion = r_core_version (); +- QString r2version = R2_GITTAP; +- msg.setText(QString( +- QObject::tr("The version used to compile Iaito (%1) does not match the binary version of radare2 (%2). This could result in unexpected behaviour. Are you sure you want to continue?")).arg( +- localVersion, r2version)); +- if (msg.exec() == QMessageBox::No) { +- std::exit(1); +- } +- } +- + #ifdef IAITO_ENABLE_PYTHON + // Init python + if (!clOptions.pythonHome.isEmpty()) { diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 32fe50b257ba6..0d16ee9a995df 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-U/oRUalDYJ8ChrknfUKcXOqWeml8y869SIWRDMVbpAo="; + sha256 = "sha256-dEIrTz24zBN6axl8bPdc4N9iebE7YBF0mGUSAbHx9Ug="; }; - vendorSha256 = "sha256-qnvmLimuOkJiH1ct1a7WCYh/bcgQ5XY5GzgVbrQyr/0="; + vendorSha256 = "sha256-/EXrOS7kBxu6LtwTMipVJfjrJH7RuIwqD5LHH3yDADQ="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 840269995c134..b253898c02b89 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.11.0"; + version = "1.11.1"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-3oxIjILjl85GAl/YwTRrXunWY7UmPtOuG0wxA7wrzp0="; - aarch64-linux = "sha256-PiIibaFPBBTWPLVIWmCXqR51+HujoQmVOsm8AJTNr9s="; - i686-linux = "sha256-t3myhfPUe/28BlSIoxNbjmYykHlet5mWxOLuyNcu4o4="; - x86_64-darwin = "sha256-nPcKir2NcsXnQ6RG6TrioLC4jT9Pn7NssNjjDnw+fAY="; - aarch64-darwin = "sha256-yJJXmoR4Re1iIbSI6+VwOGP3FZvlJcumjxXM+PfPZm4="; + x86_64-linux = "sha256-mh/O9X4yOEspZ3Z+N22Wt8PeNee9U7U4R8laS7PCrhI="; + aarch64-linux = "sha256-9LybdftRdc9NYxYzPwojYdYxu1DbtVjG0nlT88oxX9E="; + i686-linux = "sha256-nPnWzxv5AVfOrGJxnFImZacUeKRZ0+Gyesf5TiRvz/0="; + x86_64-darwin = "sha256-kOT1Vs2LxCih/GewL66tVI5t50eKU/ejT9ccSjp7ar8="; + aarch64-darwin = "sha256-UkuZAFzT3pjg7q7NJ4+DaAk0syAVf6N512bxwLuQHHE="; }; in fetchzip { diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index f6f0e1fe7f373..cbc8c759c7077 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.14.0"; + version = "5.15.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a0H/OqIHgutuW1egqlhMy5mX2FMYxmAwCbhecCrXuOU="; + sha256 = "sha256-XfBmxAuhGt5SYl4D8pf+FnB3R5Hg/G72r4pYgIrL2mg="; }; - vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc="; + vendorSha256 = "sha256-w+nOoEtEtRjXakrVV3aLj+clhyqgL5cJ6iu689cJeKs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index 77b97563d524f..126f2a4ec9fb4 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -9,19 +9,15 @@ stdenv.mkDerivation rec { pname = "way-displays"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; rev = "${version}"; - sha256 = "sha256-5A0qZRpWw3Deo9cGqGULpQMoPCVh85cWE/wJ5XSbVJk="; + sha256 = "sha256-wrfRSJaVz0GjYxuIDvJ+16aaz+kRTtv0q5jN2IG4Uco="; }; - postPatch = '' - substituteInPlace src/cfg.cpp --replace "\"/etc" "\"$out/etc" - ''; - strictDeps = true; nativeBuildInputs = [ @@ -35,7 +31,7 @@ stdenv.mkDerivation rec { libinput ]; - makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC="]; + makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC= ROOT_ETC=$(out)/etc"]; meta = with lib; { homepage = "https://github.com/alex-courtis/way-displays"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2b396dc48db4..1b08f6941584e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7736,6 +7736,8 @@ with pkgs; kdigger = callPackage ../tools/security/kdigger { }; + kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { }; + keepalived = callPackage ../tools/networking/keepalived { }; kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; @@ -18636,7 +18638,9 @@ with pkgs; libad9361 = callPackage ../development/libraries/libad9361 { }; - libadwaita = callPackage ../development/libraries/libadwaita { }; + libadwaita = callPackage ../development/libraries/libadwaita { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation; + }; libaec = callPackage ../development/libraries/libaec { }; |