diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ce3fae74cbc5..76d7164710bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2480,6 +2480,7 @@ }; bbenno = { email = "nix@bbenno.com"; + matrix = "@bbenno:matrix.org"; github = "bbenno"; githubId = 32938211; name = "Benno Bielmeier"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 74f911f81f6a..e523d4d20768 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -172,6 +172,7 @@ ./programs/cpu-energy-meter.nix ./programs/command-not-found/command-not-found.nix ./programs/coolercontrol.nix + ./programs/corefreq.nix ./programs/criu.nix ./programs/darling.nix ./programs/dconf.nix diff --git a/nixos/modules/programs/corefreq.nix b/nixos/modules/programs/corefreq.nix new file mode 100644 index 000000000000..c656b4a13da1 --- /dev/null +++ b/nixos/modules/programs/corefreq.nix @@ -0,0 +1,42 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.corefreq; + kernelPackages = config.boot.kernelPackages; +in +{ + options = { + programs.corefreq = { + enable = lib.mkEnableOption "Whether to enable the corefreq daemon and kernel module"; + + package = lib.mkOption { + type = lib.types.package; + default = kernelPackages.corefreq; + defaultText = lib.literalExpression "config.boot.kernelPackages.corefreq"; + description = '' + The corefreq package to use. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + boot.extraModulePackages = [ cfg.package ]; + boot.kernelModules = [ "corefreqk" ]; + + # Create a systemd service for the corefreq daemon + systemd.services.corefreq = { + description = "CoreFreq daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = lib.getExe' cfg.package "corefreqd"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/sftpgo.nix b/nixos/modules/services/web-apps/sftpgo.nix index 3ad6d0436afc..4d9a8e44c2b3 100644 --- a/nixos/modules/services/web-apps/sftpgo.nix +++ b/nixos/modules/services/web-apps/sftpgo.nix @@ -35,13 +35,21 @@ in }; dataDir = mkOption { - type = types.str; + type = types.path; default = "/var/lib/sftpgo"; description = '' The directory where SFTPGo stores its data files. ''; }; + extraReadWriteDirs = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Extra directories where SFTPGo is allowed to write to. + ''; + }; + user = mkOption { type = types.str; default = defaultUser; @@ -63,7 +71,7 @@ in type = with types; nullOr path; description = '' Path to a json file containing users and folders to load (or update) on startup. - Check the [documentation](https://github.com/drakkan/sftpgo/blob/main/docs/full-configuration.md) + Check the [documentation](https://sftpgo.github.io/latest/config-file/) for the `--loaddata-from` command line argument for more info. ''; }; @@ -72,7 +80,7 @@ in default = {}; description = '' The primary sftpgo configuration. See the - [configuration reference](https://github.com/drakkan/sftpgo/blob/main/docs/full-configuration.md) + [configuration reference](https://sftpgo.github.io/latest/config-file/) for possible values. ''; type = with types; submodule { @@ -324,7 +332,7 @@ in User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.dataDir; - ReadWritePaths = [ cfg.dataDir ]; + ReadWritePaths = [ cfg.dataDir ] ++ cfg.extraReadWriteDirs; LimitNOFILE = 8192; # taken from upstream KillMode = "mixed"; ExecStart = "${cfg.package}/bin/sftpgo serve ${utils.escapeSystemdExecArgs cfg.extraArgs}"; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 841570a61919..0ab023e2300c 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.2.4"; + version = "5.2.5"; src = fetchurl { url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/"; - hash = "sha256-/JEJthaFSdad5Hj5sdBQLLyDdp2Rp4ZAlhIA+RgwXRw="; + hash = "sha256-x6Uw6o+a3nArMm1Ev5ytGtLDGQ3r872WqlC022zT8Hk="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ]; diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index da22ade3868c..c3c1fbcc47c9 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitLab { owner = "Geonkick-Synthesizer"; repo = pname; rev = "v${version}"; - hash = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0="; + hash = "sha256-bqdqAr4NX5WZ6zp0Kq7GFHiy/JkBvDvzuZz7jxtru0Q="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 8fbeda219ad6..f7bd5695202e 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.31.0"; + version = "1.31.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-Oy638nIuz2xWVvMGWHUeI4T7eycXIfT+XHp0U7h8G9w="; + hash = "sha256-L+x1a9wttu2OBY5T6AY8k91ystu0uZAGd3px4oNVptM="; }; vendorHash = null; diff --git a/pkgs/by-name/ca/cargo-features-manager/package.nix b/pkgs/by-name/ca/cargo-features-manager/package.nix index 6fd31c30b06d..4ca4ebf16a79 100644 --- a/pkgs/by-name/ca/cargo-features-manager/package.nix +++ b/pkgs/by-name/ca/cargo-features-manager/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-features-manager"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ToBinio"; repo = "cargo-features-manager"; rev = "v${version}"; - hash = "sha256-ez8WIDHV6/f0Kk6cvzB25LoYBPT+JTzmOWrSxXXzpBc="; + hash = "sha256-g4iJ9iZp7vmnSE/P76ocDu/XKeSbPjosB97ojLI30oE="; }; - cargoHash = "sha256-G1MBH4c9b/h87QgCleTMnndjWc70KZI+6W4KWaxk28o="; + cargoHash = "sha256-O0MQAgOZdiVW6GU69BAn2beDDqNNwijLlmfC7I3Qd0A="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix new file mode 100644 index 000000000000..a1b70a67bf5d --- /dev/null +++ b/pkgs/by-name/hy/hyprsunset/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + pkg-config, + hyprland-protocols, + hyprutils, + hyprwayland-scanner, + wayland, + wayland-protocols, + wayland-scanner, + unstableGitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "hyprsunset"; + version = "0-unstable-2024-10-08"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprsunset"; + rev = "f535c1894d71d7639d19b52f5b72e1ac840c2512"; + hash = "sha256-SVkcePzX9PAlWsPSGBaxiNFCouiQmGOezhMo0+zhDIQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + hyprwayland-scanner + ]; + + buildInputs = [ + hyprland-protocols + hyprutils + wayland + wayland-protocols + wayland-scanner + ]; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = { + homepage = "https://github.com/hyprwm/hyprsunset"; + description = "Application to enable a blue-light filter on Hyprland"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + fufexan + johnrtitor + ]; + mainProgram = "hyprsunset"; + }; +}) diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index b67ef56b803b..868355dea3be 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -1,50 +1,55 @@ -{ lib -, python3Packages -, fetchFromGitHub -, nix-update-script -, testers -, icloudpd +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, + testers, + icloudpd, }: python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.19.1"; + version = "1.24.0"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; rev = "v${version}"; - hash = "sha256-0DbYbBs/8irj/55+WHyNj+iLWh7KqxReVWfmsWz43Xo="; + hash = "sha256-IP5bjRmHlVKYmcsR1g9B/p4KzVpCyBomwznPwjay4wA="; }; pythonRelaxDeps = true; - propagatedBuildInputs = with python3Packages; [ - wheel - setuptools - requests - schema - click - python-dateutil - tqdm - piexif - urllib3 - six - tzlocal - pytz + dependencies = with python3Packages; [ certifi + click + flask keyring keyrings-alt + piexif + python-dateutil + pytz + requests + schema + six + srp + tqdm typing-extensions + tzlocal + urllib3 + waitress + wheel ]; + build-system = with python3Packages; [ setuptools ]; + nativeCheckInputs = with python3Packages; [ - pytestCheckHook - mock freezegun - vcrpy + mock pytest-timeout + pytestCheckHook + vcrpy ]; disabledTests = [ @@ -57,6 +62,7 @@ python3Packages.buildPythonApplication rec { "test_autodelete_photos_dry_run" "test_retry_fail_delete_after_download_internal_error" "test_autodelete_invalid_creation_date" + "test_folder_structure_de_posix" ]; passthru = { @@ -75,6 +81,9 @@ python3Packages.buildPythonApplication rec { description = "iCloud Photos Downloader"; license = licenses.mit; mainProgram = "icloudpd"; - maintainers = with maintainers; [ anpin jnsgruk ]; + maintainers = with maintainers; [ + anpin + jnsgruk + ]; }; } diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 81262e2cf051..fa152d3aeb8b 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-15"; + version = "GE-Proton9-16"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-WeqntQxez6XPRZxpPNUAQ8/7sw6TzOKU1yrtPHmQNh0="; + hash = "sha256-n/pU5bAr78Hawo8BMk7VW8uK0FjVsBJGMf78zRMGFPQ="; }; outputs = [ diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix new file mode 100644 index 000000000000..080063968f6c --- /dev/null +++ b/pkgs/by-name/rs/rsop/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + pkg-config, + pcsclite, + nix-update-script, + testers, + rsop, +}: + +rustPlatform.buildRustPackage rec { + pname = "rsop"; + version = "0.3.9"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "heiko"; + repo = "rsop"; + rev = "rsop/v${version}"; + hash = "sha256-K69vyZFaVvZj4yLaV/zQYoItvcTDuFR4mdmMcfl1UDA="; + }; + + cargoHash = "sha256-DJVgnfPpXf8hGX6Dv6W8GzqspMEFZHc2/Fkn1MZRXd0="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ pcsclite ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + command = "rsop version"; + package = rsop; + }; + }; + + meta = { + homepage = "https://codeberg.org/heiko/rsop"; + description = "Stateless OpenPGP (SOP) based on rpgp"; + license = with lib.licenses; [ + mit + apsl20 + cc0 + ]; + maintainers = with lib.maintainers; [ nikstur ]; + mainProgram = "rsop"; + }; +} diff --git a/pkgs/by-name/sp/spread/local-script-path.patch b/pkgs/by-name/sp/spread/local-script-path.patch new file mode 100644 index 000000000000..f720cf1f67ff --- /dev/null +++ b/pkgs/by-name/sp/spread/local-script-path.patch @@ -0,0 +1,13 @@ +diff --git a/spread/client.go b/spread/client.go +index c72d48a..e927567 100644 +--- a/spread/client.go ++++ b/spread/client.go +@@ -791,7 +791,7 @@ func (s *localScript) run() (stdout, stderr []byte, err error) { + buf.WriteString("NOMATCH() { { set +xu; } 2> /dev/null; local stdin=$(cat); if echo $stdin | grep -q -E \"$@\"; then echo \"NOMATCH pattern='$@' found in:\n$stdin\">&2; return 1; fi }\n") + buf.WriteString("export DEBIAN_FRONTEND=noninteractive\n") + buf.WriteString("export DEBIAN_PRIORITY=critical\n") +- buf.WriteString("export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin\n") ++ buf.WriteString(fmt.Sprintf("export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:%s\n", os.Getenv("PATH"))) + + for _, k := range s.env.Keys() { + v := s.env.Get(k) diff --git a/pkgs/by-name/sp/spread/package.nix b/pkgs/by-name/sp/spread/package.nix new file mode 100644 index 000000000000..4fb6a143e051 --- /dev/null +++ b/pkgs/by-name/sp/spread/package.nix @@ -0,0 +1,66 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + bash, + coreutils, + gnutar, + gzip, + makeWrapper, +}: + +buildGoModule { + pname = "spread"; + version = "0-unstable-2023-03-01"; + + src = fetchFromGitHub { + owner = "snapcore"; + repo = "spread"; + rev = "ded9133cdbceaf01f8a1c9decf6ff9ea56e194d6"; + hash = "sha256-uHBzVABfRCyBAGP9f+2GS49Qc8R9d1HaRr6bYPeVSU4="; + }; + + vendorHash = "sha256-SULAfCLtNSnuUXvA33I48hnhU0Ixq79HhADPIKYkWNU="; + + subPackages = [ "cmd/spread" ]; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ + # The upstream project statically assigns a PATH when running scripts in the + # local machine context. This patch keeps that static PATH assignment, but also + # appends the PATH from the environment context in which spread was run, so + # that nix-installed binaries are also available. + ./local-script-path.patch + ]; + + postPatch = '' + # Replace direct calls to /bin/bash + substituteInPlace spread/lxd.go --replace-fail '"/bin/bash", ' '"/usr/bin/env", "bash", ' + substituteInPlace spread/client.go --replace-fail '"/bin/bash", ' '"/usr/bin/env", "bash", ' + substituteInPlace spread/project.go --replace-fail '"/bin/bash", ' '"/usr/bin/env", "bash", ' + ''; + + postInstall = '' + wrapProgram $out/bin/spread --prefix PATH : ${ + lib.makeBinPath [ + bash + coreutils + gnutar + gzip + ] + } + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "spread"; + license = lib.licenses.gpl3Only; + description = "Convenient full-system test (task) distribution"; + homepage = "https://github.com/snapcore/spread"; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ss/ssh-import-id/package.nix b/pkgs/by-name/ss/ssh-import-id/package.nix new file mode 100644 index 000000000000..5f2c2531774d --- /dev/null +++ b/pkgs/by-name/ss/ssh-import-id/package.nix @@ -0,0 +1,63 @@ +{ + lib, + extraHandlers ? [ ], + fetchgit, + installShellFiles, + makeWrapper, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "ssh-import-id"; + version = "5.11"; + pyproject = true; + + src = fetchgit { + url = "https://git.launchpad.net/ssh-import-id"; + rev = "refs/tags/${version}"; + hash = "sha256-tYbaJGH59qyvjp4kwo3ZFVs0EaE0Lsd2CQ6iraFkAdI="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "long_description_content_type='markdown'" "long_description_content_type='text/markdown'" + ''; + + build-system = with python3Packages; [ setuptools ]; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + dependencies = + with python3Packages; + [ + requests + distro + ] + ++ extraHandlers; + + postInstall = '' + installManPage $src/usr/share/man/man1/ssh-import-id.1 + ''; + + # Handlers require main bin, main bin requires handlers + makeWrapperArgs = [ + "--prefix" + ":" + "$out/bin" + ]; + + meta = with lib; { + description = "Retrieves an SSH public key and installs it locally"; + homepage = "https://launchpad.net/ssh-import-id"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ + mkg20001 + viraptor + ]; + mainProgram = "ssh-import-id"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 51b21badf446..039880f363dd 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "3.29.1"; + version = "3.30.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; rev = "refs/tags/v${version}"; - hash = "sha256-qB0XP5y9NjD0AV9gVleq+MbL5l/7M5JBb57pgssbyo4="; + hash = "sha256-8ULIoFKrDAGHwz0EZzYJtl/4h6UVUECLUDbvTJbdD60="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix index 241e95a18985..ee5d92533524 100644 --- a/pkgs/development/python-modules/radios/default.nix +++ b/pkgs/development/python-modules/radios/default.nix @@ -15,12 +15,13 @@ yarl, aresponses, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, }: buildPythonPackage rec { pname = "radios"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,23 +29,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-radios"; - rev = "v${version}"; - hash = "sha256-c0zfpfEdZvjvKtwGcNLLgEkBihhtz/wouHuYRLCxtBY="; + rev = "refs/tags/v${version}"; + hash = "sha256-GXiLwwjZ/pN3HquzLLWq/2EfhmrJyCXq0sovIGRB3uQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - pythonRelaxDeps = [ "pycountry" ]; - - propagatedBuildInputs = [ + dependencies = [ aiodns aiohttp awesomeversion @@ -59,6 +57,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 4ca4dcd04fa3..c7b602ccdab6 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mill"; - version = "0.11.12"; + version = "0.12.0"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly"; - hash = "sha256-k4/oMHvtq5YXY8hRlX4gWN16ClfjXEAn6mRIoEBHNJo="; + hash = "sha256-y4KtBZ1P6TmKaIL2K+MVvn5zX8nOxLjaJkeXCb4SjM8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index 1de803fb6590..b7e7c349f045 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.31.1"; + version = "0.31.2"; # the platform-specific, statically linked binary src = diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index c83a5aea7b06..7346d8e18b64 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-8fRZNnXmP1E75Bk8PjvtZ5fBFwLEq+qPmBoB1b+ho6I=" -, "x86_64-darwin": "sha256-ayc16K60EMGhGZES2KEDGcebCQ1UXOWl1qJJc9KCsEA=" -, "aarch64-linux": "sha256-l4pweKQKHPNUwpm+1hhYjP0oK6Cs0eu2YdzXpvptzLg=" -, "aarch64-darwin": "sha256-LXrxFNevOjkXnQ+hEx1Y5FNfwGHTKksDLLEWbSK34pU=" +, "x86_64-linux": "sha256-vNA6bhbgfzWRSlIitA9VJVOxe+LF3ra6q6lJY1NW13w=" +, "x86_64-darwin": "sha256-p+iis192d77vRWbPtWiFWZSgzdNY3K7VeDmmc7AbBtg=" +, "aarch64-linux": "sha256-IeCyJT8KF3Kh4XXfKmsKAewZWW3C9Gz3GQseMd0WMUw=" +, "aarch64-darwin": "sha256-vXS8YbLb2tCqaGEJSmS147b0m1OMZTFZ5Ou2vtegFWo=" } diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix new file mode 100644 index 000000000000..59da0e077069 --- /dev/null +++ b/pkgs/os-specific/linux/corefreq/default.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + # See the official readme for a list of optional flags: + # https://github.com/cyring/CoreFreq/blob/master/README.md + extraFlags ? [ ], +}: + +stdenv.mkDerivation rec { + pname = "corefreq"; + version = "1.98.4"; + + src = fetchFromGitHub { + owner = "cyring"; + repo = "CoreFreq"; + rev = version; + hash = "sha256-ljo8EDoJmcdfVvC8s+Xbf5TsYruvSOU1OSYBPwQst1c="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + env.NIX_CFLAGS_COMPILE = "-I${src}/${stdenv.hostPlatform.qemuArch}"; + makeFlags = [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + ] ++ extraFlags; + + preInstall = '' + mkdir -p $out/bin + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "CPU monitoring and tuning software designed for 64-bit processors"; + homepage = "https://github.com/cyring/CoreFreq"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mrene ]; + mainProgram = "corefreq-cli"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/servers/monitoring/librenms/default.nix b/pkgs/servers/monitoring/librenms/default.nix index 7555d77baf40..2697fea5d096 100644 --- a/pkgs/servers/monitoring/librenms/default.nix +++ b/pkgs/servers/monitoring/librenms/default.nix @@ -53,6 +53,7 @@ in phpPackage.buildComposerProject rec { (python3.withPackages (ps: with ps; [ pymysql python-dotenv + python-memcached redis setuptools psutil diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix deleted file mode 100644 index e4202033b99c..000000000000 --- a/pkgs/tools/admin/ssh-import-id/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ buildPythonPackage -, lib -, fetchgit -, requests -, distro -, makeWrapper -, installShellFiles -, extraHandlers ? [] -}: - -buildPythonPackage rec { - pname = "ssh-import-id"; - version = "5.11"; - - src = fetchgit { - url = "https://git.launchpad.net/ssh-import-id"; - rev = version; - sha256 = "sha256-tYbaJGH59qyvjp4kwo3ZFVs0EaE0Lsd2CQ6iraFkAdI="; - }; - - propagatedBuildInputs = [ - requests - distro - ] ++ extraHandlers; - - nativeBuildInputs = [ - makeWrapper - installShellFiles - ]; - - postInstall = '' - installManPage $src/usr/share/man/man1/ssh-import-id.1 - ''; - - # handlers require main bin, main bin requires handlers - makeWrapperArgs = [ "--prefix" ":" "$out/bin" ]; - - meta = with lib; { - description = "Retrieves an SSH public key and installs it locally"; - license = licenses.gpl3; - maintainers = with maintainers; [ mkg20001 viraptor ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index 01e6b80efafc..f4c827d334b8 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -111,7 +111,7 @@ in stdenv.mkDerivation rec { description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays"; homepage = "https://github.com/benjamimgois/goverlay"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kira-bruneau ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "goverlay"; }; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index e069d0c8d87f..2097787f4855 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -3,7 +3,6 @@ , rustPlatform , stdenv , installShellFiles -, perl , pkg-config , libiconv , openssl @@ -30,10 +29,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ mandown installShellFiles - perl pkg-config ]; + OPENSSL_NO_VENDOR = 1; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix index 742c24659db6..5520ee7a05ca 100644 --- a/pkgs/tools/networking/gvproxy/default.nix +++ b/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-A2nG3Or5EhUSjTIpV05rWVcLJpGHtAWP5/n07KjM/E8="; + hash = "sha256-lRQqwbhSIvoPcoOesdTumVcrjWVdOGZU1XiSBaGyke8="; }; vendorHash = null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7c329e4a5f1..50a57064c9ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3839,8 +3839,6 @@ with pkgs; ssh-agents = callPackage ../tools/networking/ssh-agents { }; - ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { }; - ssh-key-confirmer = callPackage ../tools/networking/ssh-key-confirmer { }; ssh-mitm = callPackage ../tools/security/ssh-mitm { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index f83e88993450..8d6d9b4d0d05 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -528,6 +528,8 @@ in { turbostat = callPackage ../os-specific/linux/turbostat { }; + corefreq = callPackage ../os-specific/linux/corefreq { }; + trelay = callPackage ../os-specific/linux/trelay { }; universal-pidff = callPackage ../os-specific/linux/universal-pidff { };