diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index fdaefbe17f2d..44fc359b6a7d 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -409,7 +409,7 @@ in provision = { enable = cfg.provision.grafana.datasource || cfg.provision.grafana.dashboard; - datasources = + datasources.settings.datasources = let esVersion = lib.getVersion config.services.elasticsearch.package; in @@ -435,7 +435,7 @@ in }; } ]; - dashboards = lib.mkIf cfg.provision.grafana.dashboard [{ + dashboards.settings.providers = lib.mkIf cfg.provision.grafana.dashboard [{ name = "parsedmarc"; options.path = "${pkgs.python3Packages.parsedmarc.dashboard}"; }]; diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 63168968cd6b..cb3b0ba5ca2d 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -165,6 +165,7 @@ let majorVersion = "12"; lib libcCross libmpc + libucontext libxcrypt mpfr name diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 9fd1295733c4..0da05c75f2db 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,18 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, async-timeout }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, async-timeout +}: buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "3.0.2"; + version = "3.1.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1"; + hash = "sha256-sheNYtmp1panthglpEqJTdaCgGBTUJRswikl5hu9k7s="; }; - propagatedBuildInputs = [ async-timeout ]; + propagatedBuildInputs = [ + async-timeout + ]; # only manual tests doCheck = false; @@ -24,8 +31,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/pvizeli/ha-ffmpeg"; - description = "Library for home-assistant to handle ffmpeg"; + description = "Library for Home Assistant to handle ffmpeg"; + homepage = "https://github.com/home-assistant-libs/ha-ffmpeg/"; + changelog = "https://github.com/home-assistant-libs/ha-ffmpeg/releases/tag/${version}"; license = licenses.bsd3; maintainers = teams.home-assistant.members; }; diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index f58ce1fecbf7..dc378d34d013 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "winacl"; - version = "0.1.6"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GAw3Vgej9v8gSIpMaN2pbOptWsqTvC0Kph70yfj2LDQ="; + hash = "sha256-ymYsCRRxpsYp12xe7GPYob8a98BUNI8JwSQvM4hQsr0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/paging-calculator/default.nix b/pkgs/development/tools/paging-calculator/default.nix new file mode 100644 index 000000000000..f57d7b137b1a --- /dev/null +++ b/pkgs/development/tools/paging-calculator/default.nix @@ -0,0 +1,31 @@ +{ fetchCrate +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "paging-calculator"; + version = "0.1.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-9DbpfJbarWXYGNzTqfHHSaKFqSJ59E/VhOhuMUWk8ho="; + }; + + cargoHash = "sha256-IfOhJwR5eRHeeAbEZ8zeUVojQXtrYHdzAeht/lvdlUQ="; + + meta = { + description = "CLI utility that helps calculating page table indices from a virtual address"; + longDescription = '' + paging-calculator is a CLI utility written in Rust that helps you find the indices that a virtual + address will have on different architectures or paging implementations. + + It takes a (virtual) address in hexadecimal format and shows you which index will be used for + what page-table level. It can be installed with $ cargo install paging-calculator. + ''; + homepage = "https://github.com/phip1611/paging-calculator"; + changelog = "https://github.com/phip1611/paging-calculator/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} diff --git a/pkgs/development/tools/wambo/default.nix b/pkgs/development/tools/wambo/default.nix new file mode 100644 index 000000000000..f5e277d415ef --- /dev/null +++ b/pkgs/development/tools/wambo/default.nix @@ -0,0 +1,30 @@ +{ fetchCrate +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "wambo"; + version = "0.3.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-WZQgQmoFmsWLgPYRWonJmyKq9IIJ+a6J+O19XPppJG4="; + }; + + cargoHash = "sha256-ghUdhWW5gURWxj/OhbcKPNeLzeJvndqAxEZmwKBATUk="; + + meta = { + description = "All-in-one tool to convert decimal/bin/oct/hex and interpret bits as integers"; + longDescription = '' + wambo is a binary that can easily shows you a numeric value in all important numeral systems + (bin, hex, dec) + interprets the input as both signed and unsigned values (from i8 to i64, + including f32 and f64). It also easily calculates you mibibytes to bytes, kilobytes to gibibytes, + and so on. + ''; + homepage = "https://github.com/phip1611/wambo"; + changelog = "https://github.com/phip1611/wambo/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index f6de3d57c130..08599cccb212 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch +{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison , less , buildPackages , x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5 @@ -19,23 +19,14 @@ let binPath = lib.makeBinPath [ coreutils less ]; in stdenv.mkDerivation rec { - version = "3.6.6"; + version = "3.6.7"; pname = if x11Mode then "nethack-x11" else if qtMode then "nethack-qt" else "nethack"; - patches = [ - # Don't unset `__warn_unused_result__`, breaks on glibc-2.34 - (fetchpatch { - url = "https://github.com/NetHack/NetHack/commit/81d73ce417dda6a98e2e918e06922e68b67c53f7.patch"; - sha256 = "sha256-PX9XtJTEE3K1yg/IwIzEIT+EZWi02gU+9msrsG9ZWQY="; - revert = true; - }) - ]; - src = fetchurl { url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz"; - sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng"; + sha256 = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI="; }; buildInputs = [ ncurses ] diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 2bbbb43c963c..f0d8ea56693b 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "ioquake3"; - version = "unstable-2021-07-20"; + version = "unstable-2022-11-24"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "bc8737d707595aebd7cc11d6d5a5d65ede750f59"; - sha256 = "1icrkaw6c5c5ndy886bn65lycwnxzxwvz0ndz4p9i6r716k11add"; + rev = "70d07d91d62dcdd2f2268d1ac401bfb697b4c991"; + sha256 = "sha256-WDjR0ik+xAs6OA1DNbUGIF1MXSuEoy8nNkPiHaegfF0="; }; nativeBuildInputs = [ which pkg-config ]; @@ -50,10 +50,10 @@ stdenv.mkDerivation { installTargets = [ "copyfiles" ]; - installFlags = [ "COPYDIR=$(out)" ]; + installFlags = [ "COPYDIR=$(out)" "COPYBINDIR=$(out)/bin" ]; preInstall = '' - mkdir -p $out/baseq3 + mkdir -p $out/baseq3 $out/bin ''; meta = with lib; { diff --git a/pkgs/misc/nflz/default.nix b/pkgs/misc/nflz/default.nix new file mode 100644 index 000000000000..10a87f85b117 --- /dev/null +++ b/pkgs/misc/nflz/default.nix @@ -0,0 +1,34 @@ +{ fetchCrate +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "nflz"; + version = "1.0.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-c9+79zrIU/M1Rh+DiaLJzbrNSa4IKrYk1gP0dsabUiw="; + }; + + cargoHash = "sha256-+SOoZFVJ6mASRKufQE4JmHGKR5rbBgg1PmCrI6dvvko="; + + # Tests do not work in the package published on crates.io, since the folder + # with test resources is not packaged. + doCheck = false; + + meta = { + description = "Numbered Files Leading Zeros helps you to manage ascending numbered file names"; + longDescription = '' + CLI to add leading zeros to ascending numbered file names. + NFLZ stands for Numbered Files Leading Zeros. + + This library helps you to manage files inside your file system that + belong to a set of ordered files. An example are photos from a camera. + ''; + homepage = "https://github.com/phip1611/nflz"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a346ba031f3..0b3d3237e83f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10120,6 +10120,8 @@ with pkgs; nfs-ganesha = callPackage ../servers/nfs-ganesha { }; + nflz = callPackage ../misc/nflz { }; + ngrep = callPackage ../tools/networking/ngrep { }; ngrok = callPackage ../tools/networking/ngrok { }; @@ -10680,6 +10682,8 @@ with pkgs; PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { }; + paging-calculator = callPackage ../development/tools/paging-calculator { }; + pagmo2 = callPackage ../development/libraries/pagmo2 { }; paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { }; @@ -13132,6 +13136,8 @@ with pkgs; wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; + wambo = callPackage ../development/tools/wambo { }; + weather = callPackage ../applications/misc/weather { }; wego = callPackage ../applications/misc/wego { };