diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 6027e4f3d4bf..09761d6300e8 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -58,7 +58,7 @@ in { Configuration for the media session core. For details see https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf ''; - default = {}; + default = defaults.media-session; }; alsa-monitor = mkOption { @@ -67,7 +67,7 @@ in { Configuration for the alsa monitor. For details see https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf ''; - default = {}; + default = defaults.alsa-monitor; }; bluez-monitor = mkOption { @@ -76,7 +76,7 @@ in { Configuration for the bluez5 monitor. For details see https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf ''; - default = {}; + default = defaults.bluez-monitor; }; v4l2-monitor = mkOption { @@ -85,7 +85,7 @@ in { Configuration for the V4L2 monitor. For details see https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf ''; - default = {}; + default = defaults.v4l2-monitor; }; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml index c2d4b05996a4..1df88bb61a12 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.xml +++ b/nixos/modules/services/monitoring/prometheus/exporters.xml @@ -19,6 +19,7 @@ services.prometheus.exporters.node = { enable = true; + port = 9100; enabledCollectors = [ "logind" "systemd" @@ -42,6 +43,26 @@ available options. + + + Prometheus can now be configured to consume the metrics produced by the exporter: + + services.prometheus = { + # ... + + scrapeConfigs = [ + { + job_name = "node"; + static_configs = [{ + targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; + }]; + } + ]; + + # ... + } + +
Adding a new exporter diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index b36d977b2bdf..9801f2d2b2ad 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-uwRSOJ5WvDH4mfL9pCTCGzuSRT8SIBrI+Wsbumzejv0="; + sha256 = "sha256-AtgKgw+F5lc0Ma3zOxmk3iaZQp2KZb2FP5F8QvvYTT4="; }; buildInputs = [ diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 65604926b8fd..a91c5f64c097 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "6.5"; src = fetchurl { - url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; + url = "https://github.com/Pinegrow/PinegrowReleases/releases/download/pg${version}/PinegrowLinux64.${version}.zip"; sha256 = "1l7cf5jgidpykaf68mzf92kywl1vxwl3fg43ibgr2rg4cnl1g82b"; }; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fe1afe5b07b6..6f4fdd689098 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,7 +5,7 @@ { config, lib, pkgs }: let - inherit (pkgs) stdenv fetchurl pkg-config intltool glib fetchFromGitHub; + inherit (pkgs) stdenv fetchurl fetchpatch pkg-config intltool glib fetchFromGitHub; in lib.makeScope pkgs.newScope (self: @@ -66,6 +66,45 @@ in # Allow overriding GIMP package in the scope. inherit (pkgs) gimp; + bimp = pluginDerivation rec { + /* menu: + File/Batch Image Manipulation... + */ + pname = "bimp"; + version = "2.6"; + + src = fetchFromGitHub { + owner = "alessandrofrancesconi"; + repo = "gimp-plugin-bimp"; + rev = "v${version}"; + hash = "sha256-IJ3+/9UwxJTRo0hUdzlOndOHwso1wGv7Q4UuhbsFkco="; + }; + + patches = [ + # Allow overriding installation path + # https://github.com/alessandrofrancesconi/gimp-plugin-bimp/pull/311 + (fetchpatch { + url = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp/commit/098edb5f70a151a3f377478fd6e0d08ed56b8ef7.patch"; + sha256 = "2Afx9fmdn6ztbsll2f2j7mfffMWYWyr4BuBy9ySV6vM="; + }) + ]; + + nativeBuildInputs = with pkgs; [ which ]; + + installFlags = [ + "SYSTEM_INSTALL_DIR=${placeholder "out"}/${gimp.targetPluginDir}/bimp" + ]; + + installTargets = [ "install-admin" ]; + + meta = with lib; { + description = "Batch Image Manipulation Plugin for GIMP"; + homepage = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samuelgrf ]; + }; + }; + gap = pluginDerivation { /* menu: Video diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix index f440208e947b..bd4d61d698cb 100644 --- a/pkgs/development/compilers/uasm/default.nix +++ b/pkgs/development/compilers/uasm/default.nix @@ -2,31 +2,18 @@ stdenv.mkDerivation rec { pname = "uasm"; - version = "2.53"; + version = "2.55"; src = fetchFromGitHub { owner = "Terraspace"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Aohwrcb/KTKUFFpfmqVDPNjJh1dMYSNnBJ2eFaP20pM="; + # Specifying only the tag results in the following error during download: + # the given path has multiple possibilities: #, # + # Probably because upstream has both a tag and a branch with the same name + rev = "refs/tags/v${version}"; + sha256 = "sha256-CIbHPKJa60SyJeFgF1Tux7RfJZBChhUVXR7HGa+gCtQ="; }; - # https://github.com/Terraspace/UASM/pull/154 - patches = [ - # fix `invalid operands to binary - (have 'char *' and 'uint_8 *' {aka 'unsigned char *'})` - (fetchpatch { - name = "fix_pointers_compare.patch"; - url = "https://github.com/clouds56/UASM/commit/9cd3a400990e230571e06d4c758bd3bd35f90ab6.patch"; - sha256 = "sha256-8mY36dn+g2QNJ1JbWt/y4p0Ha9RSABnOE3vlWANuhsA="; - }) - # fix `dbgcv.c:*:*: fatal error: direct.h: No such file or directory` - (fetchpatch { - name = "fix_build_dbgcv_c_on_unix.patch"; - url = "https://github.com/clouds56/UASM/commit/806d54cf778246c96dcbe61a4649bf0aebcb0eba.patch"; - sha256 = "sha256-uc1LaizdYEh1Ry55Cq+6wrCa1OeBPFo74H5iBpmteAE="; - }) - ]; - enableParallelBuilding = true; makefile = "gccLinux64.mak"; @@ -43,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.terraspace.co.uk/uasm.html"; description = "A free MASM-compatible assembler based on JWasm"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ thiagokokada ]; license = licenses.watcom; }; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index ffa8c5d191b9..4f520772b750 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -45,8 +45,7 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - nativeBuildInputs = [ unzip ]; - buildInputs = [ bash coreutils which zip ]; + nativeBuildInputs = [ bash coreutils which zip unzip ]; patchPhase = '' substituteInPlace ortograf/herramientas/make_dict.sh \ --replace /bin/bash bash \ @@ -234,7 +233,7 @@ let sha256 = "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p"; }; - buildInputs = [ ispell perl hunspell ]; + nativeBuildInputs = [ ispell perl hunspell ]; dontBuild = true; diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 4df5bde22871..8bba9945abfe 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxcrypt"; - version = "4.4.18"; + version = "4.4.28"; src = fetchFromGitHub { owner = "besser82"; repo = "libxcrypt"; rev = "v${version}"; - sha256 = "4015bf1b3a2aab31da5a544424be36c1a0f0ffc1eaa219c0e7b048e4cdcbbfe1"; + sha256 = "sha256-Ohf+RCOXnoCxAFnXXV9e2TCqpfZziQl+FGJTGDSQTF0="; }; preConfigure = '' diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index ea009083e8d1..2bf671c6a09e 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -16,12 +16,12 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-bap"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap"; rev = "v${version}"; - sha256 = "0c53sps6ba9n5cjdmapi8ylzlpcc11pksijp9swzlwgxyz5d276f"; + sha256 = "1xc8zfcwm40zihs3ajcrh2x32xd08qnygay03qy3qxhybr5hqngr"; }; sigs = fetchurl { @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { ''; disableIda = "--disable-ida"; + disableGhidra = "--disable-ghidra"; patches = [ ./curses_is_ncurses.patch ]; @@ -69,7 +70,7 @@ stdenv.mkDerivation rec { substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring ''; - configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm.dev}/bin/llvm-config" ]; + configureFlags = [ "--enable-everything ${disableIda} ${disableGhidra}" "--with-llvm-config=${llvm.dev}/bin/llvm-config" ]; meta = with lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 77a6ef01ac9f..5dc5f612fd32 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.0"; + version = "1.1.3"; useDune2 = true; @@ -9,7 +9,7 @@ rec { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "13rc3d0n963a28my5ahv78r82rh450hvbsc74mb6ld0r9v210r0p"; + sha256 = "1l40dfc0v3wn2drfq0mclrc1lrlpycdjrkrw4knkwpsg0za68v4c"; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix index c05422497ee7..c4ec0908fb0d 100644 --- a/pkgs/development/ocaml-modules/frontc/default.nix +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -1,26 +1,19 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub, ocaml, menhir }: -let - meta_file = fetchurl { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/META"; - sha256 = "0s2wsinycldk8y5p09xd0hsgbhckhy7bkghzl63bph6mwv64kq2d"; - }; -in - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-FrontC"; - version = "3.4.1"; +buildDunePackage rec { + pname = "FrontC"; + version = "4.1.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "FrontC"; - rev = "V_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak"; + rev = "v${version}"; + sha256 = "1mi1vh4qgscnb470qwidccaqd068j1bqlz6pf6wddk21paliwnqb"; }; - nativeBuildInputs = [ ocaml findlib ]; + minimalOCamlVersion = "4.08"; - strictDeps = true; + nativeBuildInputs = [ menhir ]; meta = with lib; { inherit (src.meta) homepage; @@ -29,14 +22,4 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = [ maintainers.maurer ]; }; - - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/opam.patch"; - sha256 = "0v4f6740jbj1kxg1y03dzfa3x3gsrhv06wpzdj30gl4ki5fvj4hs"; - }) - ]; - - makeFlags = [ "PREFIX=$(out)" "OCAML_SITE=$(OCAMLFIND_DESTDIR)" ]; - - postInstall = "cp ${meta_file} $OCAMLFIND_DESTDIR/FrontC/META"; } diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index c38a4f061435..5b0131576cd3 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "2.2.1"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "RBOL4mM9VciHHNmCTlRBIoXqeln19MKYxgv9p6GCNvU="; + sha256 = "sha256-hJVVRhaElroZ1GVlbGK49gzts2tozLqp9xfoaPdbb3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 9d017b242235..a63754f0c09e 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.52.0"; + version = "0.54.0"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-la2+cpTnHZQn/FXtySp+3zDCBTONiLC16Tm+hDiIERc="; + hash = "sha256-RiKGxyCPYlAJ5YbxvEKxCYgUg1D9s29YSCT4tY3FIEE="; }; checkInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Work with email and mailbox by IMAP"; homepage = "https://github.com/ikvk/imap_tools"; + changelog = "https://github.com/ikvk/imap_tools/blob/v${version}/docs/release_notes.rst"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index ab814061b58d..5f4997259136 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.0.0a9"; + version = "2.0.0a10"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = version; - hash = "sha256-9UJLfSYud/pIkIkJ75jE3pxsYm5bKNNRCwjDerDHp9c="; + hash = "sha256-p99WJ4y2iJQTI3wHbh+jwJyLnE3aBXnHxrehDYYek/4="; }; patches = [ diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 971b8015a417..d4d49fd26268 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "1.4.12"; + version = "1.4.16"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Pyrogram"; inherit version; - hash = "sha256-rNGdWnZuhCU0Kg/CkeNjazKb76h8/VanZdF4yi0KWGU="; + hash = "sha256-ZYAPaAa92z3KtciVHOexdZf9bwZjKQ9WKg6+We0dW+Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index fa436ff84463..b5b154763221 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -3,15 +3,19 @@ , fetchPypi , pillow , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "svg.path"; - version = "5.1"; + version = "6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CltSq7BGQNmC/3EI5N0wx4QDu0zZWMJLovCUdtXZIws="; + hash = "sha256-X78HaJFzywl3aA4Sl58wHQu2r1NVyjlsww0+ESx5TdU="; }; checkInputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { "test_image" ]; - pythonImportsCheck = [ "svg.path" ]; + pythonImportsCheck = [ + "svg.path" + ]; meta = with lib; { description = "SVG path objects and parser"; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 91e8512d18d1..1281d90cdaf5 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; rev = version; - sha256 = "sha256-JfYuuE1BP+HdiEl7l01sZ/XXlEwHyAsLjK9nqhRd/3o="; + sha256 = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wallbox/default.nix b/pkgs/development/python-modules/wallbox/default.nix index a1136d89342e..53ccd00a75f5 100644 --- a/pkgs/development/python-modules/wallbox/default.nix +++ b/pkgs/development/python-modules/wallbox/default.nix @@ -2,22 +2,24 @@ , buildPythonPackage , pythonOlder , fetchPypi +, aenum , requests , simplejson }: buildPythonPackage rec { pname = "wallbox"; - version = "0.4.6"; + version = "0.4.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "651c61e2264258382d1f54c4f0bf6bcd198482a744d8f1db3dd73084c240d9bb"; + sha256 = "f8965b0ae3a873f570986e712a4e667d0b6634c9e3afb51fbd5596856412878c"; }; propagatedBuildInputs = [ + aenum requests simplejson ]; diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix index 55f2180ebf44..fc0a49687e34 100644 --- a/pkgs/development/python-modules/zulip/default.nix +++ b/pkgs/development/python-modules/zulip/default.nix @@ -1,28 +1,27 @@ { lib , buildPythonPackage -, isPy3k +, pythonOlder , fetchFromGitHub , requests , matrix-client , distro , click -, cryptography -, pyopenssl +, typing-extensions , pytestCheckHook }: buildPythonPackage rec { pname = "zulip"; - version = "0.8.1"; + version = "0.8.2"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; # no sdist on PyPI src = fetchFromGitHub { owner = "zulip"; repo = "python-zulip-api"; rev = version; - sha256 = "sha256-vYeZEz8nuZYL1stHLa595IbhyNbqqxH4mx7ISbqRAlA="; + hash = "sha256-Z5WrV/RDQwdKUBF86M5/xWhXn3fGNqJtqO5PTd7s5ME="; }; sourceRoot = "${src.name}/zulip"; @@ -31,20 +30,13 @@ buildPythonPackage rec { matrix-client distro click - - # from requests[security] - cryptography - pyopenssl + typing-extensions ]; checkInputs = [ pytestCheckHook ]; - preCheck = '' - export COLUMNS=80 - ''; - pythonImportsCheck = [ "zulip" ]; meta = with lib; { diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index d1173e4cbf33..1a7d7807d696 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.1065"; + version = "2.0.1067"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-q51do9Kbl85p+wOMnFM4QpjezHll8sTmw8vffWcQrRE="; + hash = "sha256-WK6fot5YAC5l/0EiJuIQ5Xvz5NiEWnU+BfzsKv+caJ8="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index f6f45944a816..a43c88671f85 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/fiber-${version}.tbz"; - sha256 = "sha256-1QRJmhZY8Nmcrvv/1zhvLjHUbOynMWcVf+RobEHlcy8="; + sha256 = "sha256-B31SCwhFxW4Q7FhW18ZuvnofG+pKMCfRgvRLJSlRnYE="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 7a1da6f6398c..2346e6022d94 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -1,31 +1,44 @@ -{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsa-lib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, makeWrapper +, curl, libGL, libX11, libXxf86dga, alsa-lib, libXrandr, libXxf86vm, libXext, SDL2, glibc +}: stdenv.mkDerivation rec { pname = "Quake3e"; - version = "2020-04-04"; + version = "2022-04-01-dev"; src = fetchFromGitHub { owner = "ec-"; repo = pname; - rev = version; - sha256 = "1jvk8qd0mi0x8lslknhkfd8h6ridwca34c6qahsbmmpcgsvdv16s"; + rev = "c6cec00b858aa5955eb1d6eb65b9bfd41fd869cb"; + sha256 = "0qd13fndbhgkkmhxbprpzmj2l2v9ihacxagpdqi9sg9nrzvahr9h"; }; - buildInputs = [ curl libGL libX11 libXxf86dga alsa-lib libXrandr libXxf86vm libXext ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ curl libGL libX11 libXxf86dga alsa-lib libXrandr libXxf86vm libXext SDL2 glibc ]; + NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2"; enableParallelBuilding = true; postPatch = '' sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c + sed -i -e 's#Sys_LoadLibrary( "libpthread.so.0" )#Sys_LoadLibrary( "${glibc}/lib/libpthread.so.0" )#' code/unix/linux_snd.c sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsa-lib}/lib/libasound.so.2" )#' code/unix/linux_snd.c + sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c - sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c + sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_vidmode.c sed -i -e 's#"libcurl.so.4"#"${curl.out}/lib/libcurl.so.4"#' code/client/cl_curl.h ''; + # Default value for `USE_SDL` changed (from 0 to 1) in 5f8ce6d (2020-12-26) + # Setting `USE_SDL=0` in `makeFlags` doesn't work + preConfigure = '' + sed -i 's/USE_SDL *= 1/USE_SDL = 0/' Makefile + ''; + installPhase = '' - mkdir -p $out/bin - cp build/*/*x64 $out/bin + make install DESTDIR=$out/lib + makeWrapper $out/lib/quake3e.x64 $out/bin/quake3e + makeWrapper $out/lib/quake3e.ded.x64 $out/bin/quake3e.ded ''; meta = with lib; { diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index 9bf3aca75422..93a6296f6759 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -3,12 +3,12 @@ buildPythonApplication rec { pname = "rare"; - version = "1.8.8"; + version = "1.8.9"; src = fetchPypi { inherit version; pname = "Rare"; - sha256 = "sha256-00CtvBqSrT9yJUHZ5529VrIQtCOYkHRc8+rJHmrTSpg="; + sha256 = "sha256-UEvGwWjr4FCsvyFz6Db3VnhVS6MS3FYzYSucumzOoEA="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 64a5fd183813..e2b3abc6c0a6 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -21,36 +21,13 @@ , meson , ninja }: -let - # hqplayerd relies on some package versions available for the fc34 release, - # which has out-of-date pkgs compared to nixpkgs. The following drvs - # can/should be removed when the fc35 hqplayer rpm is made available. - gupnp_1_2 = gupnp.overrideAttrs (old: rec { - pname = "gupnp"; - version = "1.2.7"; - src = fetchurl { - url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hEEnbxr9AXbm9ZUCajpQfu0YCav6BAJrrT8hYis1I+w="; - }; - }); - - gupnp-av_0_12 = gupnp-av.overrideAttrs (old: rec { - pname = "gupnp-av"; - version = "0.12.11"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-aJ3PFJKriZHa6ikTZaMlSKd9GiKU2FszYitVzKnOb9w="; - }; - nativeBuildInputs = lib.subtractLists [ meson ninja ] old.nativeBuildInputs; - }); -in stdenv.mkDerivation rec { pname = "hqplayerd"; version = "4.30.3-87"; src = fetchurl { - url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm"; - hash = "sha256-RX9KI+4HGDUJ3y3An1zTMJTz28Of2Awn7COeX6EQc38="; + url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm"; + hash = "sha256-fEze4aScWDwHDTXU0GatdopQf6FWcywWCGhR/7zXK7A="; }; unpackPhase = '' @@ -66,8 +43,8 @@ stdenv.mkDerivation rec { gcc11.cc.lib gnome.rygel gssdp - gupnp_1_2 - gupnp-av_0_12 + gupnp + gupnp-av lame libgmpris llvmPackages_10.openmp diff --git a/pkgs/servers/roundcube/plugins/persistent_login/default.nix b/pkgs/servers/roundcube/plugins/persistent_login/default.nix index e210c1006845..0b97dd8a0502 100644 --- a/pkgs/servers/roundcube/plugins/persistent_login/default.nix +++ b/pkgs/servers/roundcube/plugins/persistent_login/default.nix @@ -2,12 +2,12 @@ roundcubePlugin rec { pname = "persistent_login"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "mfreiholz"; repo = pname; rev = "version-${version}"; - sha256 = "0aasc2ns318s1g8vf2hhqwsplchhrhv5cd725rnfldim1y8k0n1i"; + sha256 = "1qf7q1sypwa800pgxa3bg6ngcpkf4dqgg6jqx8cnd6cb7ikbfldb"; }; } diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index c4ccae0272eb..144a1b275926 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -3,7 +3,7 @@ , fetchurl , uasm -, useUasm ? stdenv.isx86_64 +, useUasm ? stdenv.isLinux # RAR code is under non-free unRAR license # see the meta.license section below for more details @@ -13,11 +13,12 @@ let inherit (stdenv.hostPlatform) system; platformSuffix = - if useUasm then - { - x86_64-linux = "_x64"; - }.${system} or (throw "`useUasm` is not supported for system ${system}") - else ""; + lib.optionalString useUasm { + aarch64-linux = "_arm64"; + i686-linux = "_x86"; + x86_64-linux = "_x64"; + }.${system} or + (builtins.trace "7zz's ASM optimizations not available for `${system}`. Building without optimizations." ""); in stdenv.mkDerivation rec { pname = "7zz"; diff --git a/pkgs/tools/misc/f2/default.nix b/pkgs/tools/misc/f2/default.nix new file mode 100644 index 000000000000..943ce72cc6ce --- /dev/null +++ b/pkgs/tools/misc/f2/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "f2"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "ayoisaiah"; + repo = "f2"; + rev = "v${version}"; + sha256 = "sha256-bNcPzvjVBH7x60kNjlUILiQGG3GDmqIB5T2WP3+nZ+s="; + }; + + vendorSha256 = "sha256-Cahqk+7jDMUtZq0zhBll1Tfryu2zSPBN7JKscV38360="; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Command-line batch renaming tool"; + homepage = "https://github.com/ayoisaiah/f2"; + license = licenses.mit; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f4fc54285df..7717c2bc7fe1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3362,6 +3362,8 @@ with pkgs; extrude = callPackage ../tools/security/extrude { }; + f2 = callPackage ../tools/misc/f2 {}; + f3 = callPackage ../tools/filesystems/f3 { }; f3d = callPackage ../applications/graphics/f3d { @@ -6431,7 +6433,11 @@ with pkgs; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; - google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { + abseil-cpp = abseil-cpp.override { + cxxStandard = "14"; + }; + }; google-java-format = callPackage ../development/tools/google-java-format { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a56b366dca1b..9998cc59c408 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -55,7 +55,7 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { - inherit (pkgs.llvmPackages_8) llvm; + inherit (pkgs.llvmPackages) llvm; }; batteries = callPackage ../development/ocaml-modules/batteries { };