diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a5913541c407..c75dc1ff747d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5504,6 +5504,12 @@ githubId = 37965; name = "Léo Stefanesco"; }; + infinidoge = { + name = "Infinidoge"; + email = "infinidoge@inx.moe"; + github = "Infinidoge"; + githubId = 22727114; + }; infinisil = { email = "contact@infinisil.com"; matrix = "@infinisil:matrix.org"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7ca90fc3ec34..5f01c6bcfdf7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -137,6 +137,7 @@ ./programs/captive-browser.nix ./programs/ccache.nix ./programs/cdemu.nix + ./programs/cfs-zen-tweaks.nix ./programs/chromium.nix ./programs/clickshare.nix ./programs/cnping.nix diff --git a/nixos/modules/programs/cfs-zen-tweaks.nix b/nixos/modules/programs/cfs-zen-tweaks.nix new file mode 100644 index 000000000000..f168662bbefe --- /dev/null +++ b/nixos/modules/programs/cfs-zen-tweaks.nix @@ -0,0 +1,28 @@ +# CFS Zen Tweaks + +{ config, pkgs, lib, ... }: + +with lib; + +let + + cfg = config.programs.cfs-zen-tweaks; + +in + +{ + + meta = { + maintainers = with maintainers; [ mkg20001 ]; + }; + + options = { + programs.cfs-zen-tweaks.enable = mkEnableOption "CFS Zen Tweaks"; + }; + + config = mkIf cfg.enable { + systemd.packages = [ pkgs.cfs-zen-tweaks ]; + + systemd.services.set-cfs-tweak.wantedBy = [ "multi-user.target" "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ]; + }; +} diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 9d64a31dded9..388d166c5814 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-pYinePs7WFVfRMNYTY+Is8B+cv5w6IF7Ce+9v/mLRYg="; + sha256 = "sha256-9oRNyspFmvIG63aJ8qyaVmi1GW1eW+Rg0+z8la3LuKA="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 642fbc5ed7b2..32b785c5cfb2 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.13"; + version = "3.3.14"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-QfsHVP2FIp2kn6blKbeerNxUOWXbxpgRkSBGorViVYs="; + hash = "sha256-v52QVyd2Rl1nixKD1TY1YQaSPKRsbw4BCtfRly9aMrM="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 90a0cd6f53a3..51279394df5c 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.44.0"; + version = "8.45.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-6BhhUfULtCUO5jZFF+HxGuFCg0XojQ0NJUXHxMtnwN4="; + sha256 = "sha256-qSLKPtBjhbPGX9axbQnyCb+Tcq47xDMvVGj18hEPw28="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index 7bea0226195f..77c753d00f83 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220412"; + version = "20220427"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-LIGYPsOoPN3KIe0XrjCIf7yV3p3Gfzx8zci57+HzW18="; + sha256 = "sha256-nuhJZNsnD/DZ3WOsW+bBYH/OT6ma/qemlGoKaFzfj4c="; }; dontBuild = true; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index c3fe3ba2ce76..d1d8ed052fb0 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.02.28.00"; + version = "2022.05.16.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-9h2NsfQMQ7ps9Rt0HhTD+YKwk/soGchCC9GyEJGcm4g="; + sha256 = "sha256-JCA6NhsL2mVmpXVV5wmZhtjaYrvp39mvy1r8/nMYcuI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index dca9b44c8173..466f3e1e6dfa 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.13.0"; + version = "0.13.1"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-Iv1Lb45n2XUHSluZzdF2Bf/hXZmgs++9/av26rHgePc="; + hash = "sha256-1GC119AUfmse3fhQQxSi9eDJJorYvt2NeE7UY1GrW3E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index d0d32de0ce13..2b09f72b868d 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+P1oXG+uvnFDGis5pz9VUQ4n1C7mjuetXz1OtN7IIrg="; + sha256 = "sha256-gEYN9r5hHRya1nqle8qHaUaOpuBN8cSLJx2FBRqyztw="; }; - vendorSha256 = "sha256-EvOyOy7DFQtFavOC9eBUZRJsj3pNdx7jumVmZ/THdaM="; + vendorSha256 = "sha256-RGEoewLDKo+D9Wp/v8PI/LPjCh2rFrdLO/AS4RWFliY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 1af15e82110e..ce8ade8d6b3b 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.38"; + version = "0.14.39"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-rvMi1oC7qGidvi4zrm9KCMMntu6LJGVOGN6VmU2ivQE="; + sha256 = "sha256-li8uVs7SZ3KX0AbzyTDUesiqm8dQecrzyLjYKnQncj8="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix b/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix new file mode 100644 index 000000000000..a894e0bd4b69 --- /dev/null +++ b/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, makeWrapper +, gawk +}: + +stdenv.mkDerivation rec { + pname = "cfs-zen-tweaks"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "igo95862"; + repo = "cfs-zen-tweaks"; + rev = version; + sha256 = "HRR2tdjNmWyrpbcMlihSdb/7g/tHma3YyXogQpRCVyo="; + }; + + postPatch = '' + patchShebangs set-cfs-zen-tweaks.bash + chmod +x set-cfs-zen-tweaks.bash + substituteInPlace set-cfs-zen-tweaks.bash \ + --replace '$(gawk' '$(${gawk}/bin/gawk' + ''; + + buildInputs = [ + gawk + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + + meta = with lib; { + description = "Tweak Linux CPU scheduler for desktop responsiveness"; + homepage = "https://github.com/igo95862/cfs-zen-tweaks"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 654d9a30f30d..1b71dd01c8e8 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5tnitx2KdyARgeaaDINWbn5JtQ4j0aq2BQBljRZOmsk="; + sha256 = "sha256-NmUI4pXwf6PHuLbkFy/hoA67j++A2Ju7zG/4og9U+qk="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index feb55d9ccdef..9687b83122bf 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-GEuBYN6HVAjiAbusVuEA7zBG9fIVZHLV628Jt6Cv5cM="; + sha256 = "sha256-9BknWrYgLv9xx9TlVAJxRzVUmbz5v6f7swPDsE4P6WY="; }; strictDeps = true; diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/tools/games/minecraft/packwiz/default.nix new file mode 100644 index 000000000000..3be2798312e7 --- /dev/null +++ b/pkgs/tools/games/minecraft/packwiz/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "packwiz"; + version = "unstable-2022-5-25"; + + src = fetchFromGitHub { + owner = "packwiz"; + repo = "packwiz"; + rev = "e71b63ea98283c8c1f0e03ee51ae40f452f22a61"; + sha256 = "sha256-XwGacEVfQAduDCSMQFRw7Xnx4bND2zaV7l27B+2u5xg="; + }; + + vendorSha256 = "sha256-M9u7N4IrL0B4pPRQwQG5TlMaGT++w3ZKHZ0RdxEHPKk="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd packwiz \ + --bash <($out/bin/packwiz completion bash) \ + --fish <($out/bin/packwiz completion fish) \ + --zsh <($out/bin/packwiz completion zsh) + ''; + + meta = with lib; { + description = "A command line tool for editing and distributing Minecraft modpacks, using a git-friendly TOML format"; + homepage = "https://packwiz.infra.link/"; + license = licenses.mit; + maintainers = with maintainers; [ infinidoge ]; + mainProgram = "packwiz"; + }; +} diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 500aae3fc080..f33eee62549f 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-jdkyDsuOOG1dJmgRmMp2KhY9ermccjrxK2JAIzpO6nw="; + sha256 = "sha256-krY1NbFilUHn6ePMRX4+EddsIu33Y7W8Wt5bIeB6wRE="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "12a12ng9wz2rrj3xzhgrqlg3lxpqxwdgvkz3fxny17nysmmpnhvv"; + cargoSha256 = "sha256-nE6sl8n12fHLWH/tEXZhDjVBxGDoLyFDtVC5GFNClzM="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 888993ca7bfa..b8ccf20676a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1356,6 +1356,10 @@ with pkgs; python = python3; }; + packwiz = callPackage ../tools/games/minecraft/packwiz { + buildGoModule = buildGo118Module; + }; + pcem = callPackage ../applications/emulators/pcem { }; pcsx2 = callPackage ../applications/emulators/pcsx2 { @@ -4851,6 +4855,8 @@ with pkgs; cfssl = callPackage ../tools/security/cfssl { }; + cfs-zen-tweaks = callPackage ../os-specific/linux/cfs-zen-tweaks { }; + chafa = callPackage ../tools/misc/chafa { inherit (darwin.apple_sdk.frameworks) Foundation; };