From 5280effa98ac07eae7d3ded1197d65c1a6608ff2 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Mon, 23 Sep 2024 11:38:01 +0900 Subject: [PATCH 01/14] tflint: modernized derivation and formatted via nixfmt-rfc-style - Removed `rec` - Removed `with lib;` - Formatted via nixfmt-rfc-style --- .../tools/analysis/tflint/default.nix | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index c3a7b65b051d..5ec4650a11a6 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -1,21 +1,25 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, runCommand -, makeWrapper -, tflint -, tflint-plugins -, symlinkJoin +{ + lib, + buildGoModule, + fetchFromGitHub, + runCommand, + makeWrapper, + tflint, + tflint-plugins, + symlinkJoin, }: -buildGoModule rec { +let pname = "tflint"; version = "0.52.0"; +in +buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-H27krznCX00F0EZ4ahdsMVh+wcAAUC/ErQac9Y4QaJs="; }; @@ -25,9 +29,13 @@ buildGoModule rec { subPackages = [ "." ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; - passthru.withPlugins = plugins: + passthru.withPlugins = + plugins: let actualPlugins = plugins tflint-plugins; pluginDir = symlinkJoin { @@ -38,17 +46,18 @@ buildGoModule rec { runCommand "tflint-with-plugins" { nativeBuildInputs = [ makeWrapper ]; - } '' - makeWrapper ${tflint}/bin/tflint $out/bin/tflint \ - --set TFLINT_PLUGIN_DIR "${pluginDir}" - ''; + } + '' + makeWrapper ${tflint}/bin/tflint $out/bin/tflint \ + --set TFLINT_PLUGIN_DIR "${pluginDir}" + ''; - meta = with lib; { + meta = { description = "Terraform linter focused on possible errors, best practices, and so on"; mainProgram = "tflint"; homepage = "https://github.com/terraform-linters/tflint"; changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = [ ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ momeemt ]; }; } From 373cbc318a4156578e70d1b6135c6f3cb772d696 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Mon, 23 Sep 2024 11:39:28 +0900 Subject: [PATCH 02/14] tflint: moved to by-name --- .../tflint/default.nix => by-name/tf/tflint/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/analysis/tflint/default.nix => by-name/tf/tflint/package.nix} (100%) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/by-name/tf/tflint/package.nix similarity index 100% rename from pkgs/development/tools/analysis/tflint/default.nix rename to pkgs/by-name/tf/tflint/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 587c69d8ed05..bb6433d72512 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18803,8 +18803,6 @@ with pkgs; time-ghc-modules = callPackage ../development/tools/time-ghc-modules { }; - tflint = callPackage ../development/tools/analysis/tflint { }; - tflint-plugins = recurseIntoAttrs ( callPackage ../development/tools/analysis/tflint-plugins { } ); From 8e6e68bb608b03dfdf37271889cd32d63458e8e2 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Tue, 1 Oct 2024 14:18:16 +0900 Subject: [PATCH 03/14] buildpack: modernized derivation and formatted via nixfmt-rfc-style - Removed `rec` - Removed `with lib;` - Changed `v${version}` to `refs/tags/v${version}` in `rev` - Formatted via nixfmt-rfc-style - Added @momeemt to maintainers --- pkgs/development/tools/buildpack/default.nix | 26 ++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 31a4c70bd68f..548550164391 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -1,13 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: -buildGoModule rec { +let pname = "pack"; version = "0.35.1"; +in +buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-iQkYtnobhAt73JMRrejk0DkOH1ZW2bqfZx05ZrDG5bA="; }; @@ -17,7 +25,11 @@ buildGoModule rec { subPackages = [ "cmd/pack" ]; - ldflags = [ "-s" "-w" "-X github.com/buildpacks/pack.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/buildpacks/pack.Version=${version}" + ]; postInstall = '' installShellCompletion --cmd pack \ @@ -26,12 +38,12 @@ buildGoModule rec { --fish $(PACK_HOME=$PWD $out/bin/pack completion --shell fish) ''; - meta = with lib; { + meta = { homepage = "https://buildpacks.io/"; changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}"; description = "CLI for building apps using Cloud Native Buildpacks"; mainProgram = "pack"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ momeemt ]; }; } From b5b06a23ec63f12ad68914bff7b977be9bedf087 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Tue, 1 Oct 2024 14:19:12 +0900 Subject: [PATCH 04/14] buildpack: moved to by-name --- .../buildpack/default.nix => by-name/bu/buildpack/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/buildpack/default.nix => by-name/bu/buildpack/package.nix} (100%) diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/by-name/bu/buildpack/package.nix similarity index 100% rename from pkgs/development/tools/buildpack/default.nix rename to pkgs/by-name/bu/buildpack/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 131cca72e54e..51dae615f91b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4189,8 +4189,6 @@ with pkgs; btrbk = callPackage ../tools/backup/btrbk { }; - buildpack = callPackage ../development/tools/buildpack { }; - bonk = callPackage ../tools/misc/bonk { }; bottom-rs = callPackage ../tools/misc/bottom-rs { }; From 975f15e86c395f548367ff97a086e50e760436d5 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Wed, 23 Oct 2024 21:13:47 +0200 Subject: [PATCH 05/14] fcft: 3.1.8 -> 3.1.9 - remove patches, upstreamed Changes: https://codeberg.org/dnkl/fcft/releases/tag/3.1.9 --- pkgs/development/libraries/fcft/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index ec8c9962125e..2a36329b386f 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -17,25 +17,16 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.1.8"; + version = "3.1.9"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - hash = "sha256-Wgm2QdW4rg573soF/8HhDmlyN4S2cA0VWOejow464gU="; + hash = "sha256-D4W62IHuM7ofEeU/3sp038tv2a1+xQd0mdSKXaY7Ikg="; }; - patches = [ - (fetchpatch { - name = "system-nanosvg.patch"; - url = "https://codeberg.org/dnkl/fcft/commit/5cee776e1d7f1bdb0df383c3dd798831a6fe4fa0.patch"; - excludes = [ "CHANGELOG.md" ]; - hash = "sha256-yRBtKCKT/Oih66/OQqt4GPg3GfHmhiLM8mlLEWYYRC0="; - }) - ]; - depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig nanosvg pixman tllist ] From a1b6668d792c3caf2830b7f7f92a7096611460ea Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Wed, 23 Oct 2024 21:20:51 +0200 Subject: [PATCH 06/14] foot: 1.18.0 -> 1.19.0 Changes: https://codeberg.org/dnkl/foot/releases/tag/1.19.0 --- pkgs/applications/terminal-emulators/foot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index e7eb39e8a756..d84858ad07f8 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -26,7 +26,7 @@ }: let - version = "1.18.1"; + version = "1.19.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -98,7 +98,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256:15s7fbkibvq53flf5yy9ad37y53pl83rcnjwlnfh96a4s5mj6v5d"; + hash = "sha256-EY6VNrAxqA20RHLqfusbdxJPfEE7Fchi1W0noHfbxws="; }; separateDebugInfo = true; From 8a98f989fb9e93668d95c7b44756d75e7447d7dd Mon Sep 17 00:00:00 2001 From: isabel Date: Wed, 23 Oct 2024 22:54:20 +0100 Subject: [PATCH 07/14] hyfetch: move to by-name --- .../misc/hyfetch/default.nix => by-name/hy/hyfetch/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/hyfetch/default.nix => by-name/hy/hyfetch/package.nix} (100%) diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/by-name/hy/hyfetch/package.nix similarity index 100% rename from pkgs/tools/misc/hyfetch/default.nix rename to pkgs/by-name/hy/hyfetch/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a80d2fc17fa1..088074b9f238 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37129,8 +37129,6 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; - hyfetch = callPackage ../tools/misc/hyfetch { }; - hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; From beed7cee4ea46e3c99f11cd8865319add5cee542 Mon Sep 17 00:00:00 2001 From: isabel Date: Wed, 23 Oct 2024 22:58:11 +0100 Subject: [PATCH 08/14] hyfetch: 1.4.11 -> 1.99.0 --- pkgs/by-name/hy/hyfetch/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 2e906541bda1..c83bf1d697c2 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "hyfetch"; - version = "1.4.11"; + version = "1.99.0"; format = "setuptools"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; rev = "refs/tags/${version}"; - hash = "sha256-xzN/tbS5BUvpKeozesE99gNp3NRDjvf4Qx7BHLc4svo="; + hash = "sha256-GL1/V+LgSXJ4b28PfinScDrJhU9VDa4pVi24zWEzbAk="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -44,3 +44,5 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ yisuidenghua ]; }; } + + From 5429f7f841ec70238ff89dc6856f29ec2d650010 Mon Sep 17 00:00:00 2001 From: isabel Date: Wed, 23 Oct 2024 22:58:41 +0100 Subject: [PATCH 09/14] hyfetch: reformat with nixfmt-rfc-style --- pkgs/by-name/hy/hyfetch/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index c83bf1d697c2..0c1cfe85c27a 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -1,8 +1,8 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: - python3.pkgs.buildPythonApplication rec { pname = "hyfetch"; version = "1.99.0"; @@ -44,5 +44,3 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ yisuidenghua ]; }; } - - From 77f5f203cf0566e7ff5a273a7a16bb236bad51ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Oct 2024 15:53:30 +0000 Subject: [PATCH 10/14] syncyomi: 1.1.1 -> 1.1.2 --- pkgs/by-name/sy/syncyomi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix index 103bc5831957..96bb04803eeb 100644 --- a/pkgs/by-name/sy/syncyomi/package.nix +++ b/pkgs/by-name/sy/syncyomi/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "syncyomi"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "SyncYomi"; repo = "SyncYomi"; rev = "refs/tags/v${version}"; - hash = "sha256-90MA62Zm9ouaf+CnYsbOm/njrUui21vW/VrwKYfsCZs="; + hash = "sha256-PPE6UXHo2ZlN0A0VkUH+8pkdfm6WEvpofusk6c3RBHk="; }; vendorHash = "sha256-/rpT6SatIZ+GVzmVg6b8Zy32pGybprObotyvEgvdL2w="; From b78661a7c167ecd30799f32367eaeba5ea88b6cd Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sat, 15 Jun 2024 00:43:12 -0300 Subject: [PATCH 11/14] zenergy: init at 0-unstable-2024-10-10 --- pkgs/os-specific/linux/zenergy/default.nix | 45 ++++++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/os-specific/linux/zenergy/default.nix diff --git a/pkgs/os-specific/linux/zenergy/default.nix b/pkgs/os-specific/linux/zenergy/default.nix new file mode 100644 index 000000000000..cfdb63d2a135 --- /dev/null +++ b/pkgs/os-specific/linux/zenergy/default.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + kmod, +}: + +let + kernelDirectory = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; +in +stdenv.mkDerivation { + pname = "zenergy"; + version = "0-unstable-2024-10-10"; + + src = fetchFromGitHub { + owner = "BoukeHaarsma23"; + repo = "zenergy"; + rev = "7c4e83d5e2f887f4c31edaf92e5f94e9448e9764"; + hash = "sha256-5fYelEr4IYnuXrly15IcyicFrF0tYjs7OBqIhUYQXZ0="; + }; + + nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + hardeningDisable = [ + "format" + "pic" + ]; + + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernelDirectory}" ]; + + installTargets = [ "modules_install" ]; + + preBuild = '' + substituteInPlace Makefile --replace-fail "PWD modules_install" "PWD INSTALL_MOD_PATH=$out modules_install" + ''; + + meta = with lib; { + description = "Based on AMD_ENERGY driver, but with some jiffies added so non-root users can read it safely."; + homepage = "https://github.com/BoukeHaarsma23/zenergy"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ wizardlink ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index b9225acdb2b7..f83e88993450 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -407,6 +407,8 @@ in { new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { }; + zenergy = callPackage ../os-specific/linux/zenergy { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); From 2f3919ecc92132335ba3e5fc1ac485844c81f474 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sat, 15 Jun 2024 00:43:34 -0300 Subject: [PATCH 12/14] maintainers: adding wizardlink --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f44254be32e4..fed81e98a0ff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23179,6 +23179,17 @@ githubId = 36118348; keys = [ { fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; } ]; }; + wizardlink = { + name = "wizardlink"; + email = "contact@thewizard.link"; + github = "wizardlink"; + githubId = 26727907; + keys = [ + { + fingerprint = "A1D3 A2B4 E14B D7C0 445B B749 A576 7B54 367C FBDF"; + } + ]; + }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman"; From f625128f925ea82b14a7b709c955424a17c990f4 Mon Sep 17 00:00:00 2001 From: isabel Date: Wed, 23 Oct 2024 23:03:33 +0100 Subject: [PATCH 13/14] hyfetch: use modern builders --- pkgs/by-name/hy/hyfetch/package.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 0c1cfe85c27a..e88178b7880e 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, - python3, + python3Packages, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "hyfetch"; version = "1.99.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "hykilpikonna"; @@ -15,9 +15,12 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-GL1/V+LgSXJ4b28PfinScDrJhU9VDa4pVi24zWEzbAk="; }; - propagatedBuildInputs = with python3.pkgs; [ - typing-extensions - setuptools + build-system = [ + python3Packages.setuptools + ]; + + dependencies = [ + python3Packages.typing-extensions ]; # No test available @@ -27,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { "hyfetch" ]; - meta = with lib; { + meta = { description = "neofetch with pride flags <3"; longDescription = '' HyFetch is a command-line system information tool fork of neofetch. @@ -39,8 +42,11 @@ python3.pkgs.buildPythonApplication rec { icon set you are using, etc. ''; homepage = "https://github.com/hykilpikonna/HyFetch"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "hyfetch"; - maintainers = with maintainers; [ yisuidenghua ]; + maintainers = with lib.maintainers; [ + yisuidenghua + isabelroses + ]; }; } From 148d579567fa52880cdc6fd3f6b0c8f98dcf8ff0 Mon Sep 17 00:00:00 2001 From: gmvar Date: Thu, 24 Oct 2024 15:04:24 -0700 Subject: [PATCH 14/14] bitwarden-desktop: add URL scheme --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 6531632cc1bd..edd016c15139 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -189,6 +189,7 @@ in buildNpmPackage rec { comment = description; desktopName = "Bitwarden"; categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/bitwarden" ]; }) ];