From 850550ae9ad1559740aa8847031c50642cc9d462 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sun, 15 Dec 2024 00:28:06 -0600 Subject: [PATCH] organized pkgs by packaging tests and awaiting pr --- flake.nix | 13 +++++- {pkgs => pkgs_pr}/talk.nix | 0 {pkgs => pkgs_pr}/webcomix.nix | 0 {pkgs => pkgs_wip}/aviator.nix | 0 {pkgs => pkgs_wip}/bencodepy.nix | 0 {pkgs => pkgs_wip}/qbit-manage.nix | 0 pkgs_wip/resources.nix | 70 ++++++++++++++++++++++++++++++ 7 files changed, 82 insertions(+), 1 deletion(-) rename {pkgs => pkgs_pr}/talk.nix (100%) rename {pkgs => pkgs_pr}/webcomix.nix (100%) rename {pkgs => pkgs_wip}/aviator.nix (100%) rename {pkgs => pkgs_wip}/bencodepy.nix (100%) rename {pkgs => pkgs_wip}/qbit-manage.nix (100%) create mode 100644 pkgs_wip/resources.nix diff --git a/flake.nix b/flake.nix index 805582d..609af70 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,7 @@ packages.x86_64-linux = let scriptBin = path: name: pkgs.writeScriptBin name (builtins.readFile path); + pkgsBin = path: name: pkgs.callPackage path { }; in { citra = pkgs.callPackage ./pkgs/citra/default.nix { branch = "nightly"; }; @@ -36,7 +37,17 @@ // generatePackages { dir = "pkgs"; ext = "nix"; - handler = (path: name: pkgs.callPackage path { }); + handler = pkgsBin; + } + // generatePackages { + dir = "pkgs_pr"; + ext = "nix"; + handler = pkgsBin; + } + // generatePackages { + dir = "pkgs_wip"; + ext = "nix"; + handler = pkgsBin; } // generatePackages { dir = "src/scripts"; diff --git a/pkgs/talk.nix b/pkgs_pr/talk.nix similarity index 100% rename from pkgs/talk.nix rename to pkgs_pr/talk.nix diff --git a/pkgs/webcomix.nix b/pkgs_pr/webcomix.nix similarity index 100% rename from pkgs/webcomix.nix rename to pkgs_pr/webcomix.nix diff --git a/pkgs/aviator.nix b/pkgs_wip/aviator.nix similarity index 100% rename from pkgs/aviator.nix rename to pkgs_wip/aviator.nix diff --git a/pkgs/bencodepy.nix b/pkgs_wip/bencodepy.nix similarity index 100% rename from pkgs/bencodepy.nix rename to pkgs_wip/bencodepy.nix diff --git a/pkgs/qbit-manage.nix b/pkgs_wip/qbit-manage.nix similarity index 100% rename from pkgs/qbit-manage.nix rename to pkgs_wip/qbit-manage.nix diff --git a/pkgs_wip/resources.nix b/pkgs_wip/resources.nix new file mode 100644 index 0000000..be9a241 --- /dev/null +++ b/pkgs_wip/resources.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cargo, + meson, + ninja, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, + cairo, + gdk-pixbuf, + glib, + gtk4, + libadwaita, + pango, + desktop-file-utils, + appstream, + git, +}: + +stdenv.mkDerivation rec { + pname = "resources"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "nokyan"; + repo = "resources"; + rev = "v${version}"; + hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-tUD+gx9nQiGWKKRPcR7OHbPvU2j1dQjYck7FF9vYqSQ="; + }; + + nativeBuildInputs = [ + cargo + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + desktop-file-utils + appstream + git + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + libadwaita + pango + ]; + + meta = { + description = "Keep an eye on system resources"; + homepage = "https://github.com/nokyan/resources"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ CaptainJawZ ]; + mainProgram = "resources"; + platforms = lib.platforms.all; + }; +}