From 2b80fceac41c2ee1633a5b45f03aad01ab2ce10b Mon Sep 17 00:00:00 2001 From: bad Date: Sat, 4 Dec 2021 14:36:05 +0100 Subject: [PATCH] Add pycdc --- flake.lock | 19 ++++++++++++++++++- flake.nix | 14 +++++++++++--- pycdc.nix | 8 ++++++++ 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 pycdc.nix diff --git a/flake.lock b/flake.lock index 4afdffe..a114383 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,28 @@ "type": "indirect" } }, + "pycdc": { + "flake": false, + "locked": { + "lastModified": 1637645353, + "narHash": "sha256-iLf0pwmIF13/IS+vzpudT5O54Jj933pBZi0gbiz6Ebc=", + "owner": "zrax", + "repo": "pycdc", + "rev": "99b35a114a6fb84352ca92802c1a26fb8692a7b0", + "type": "github" + }, + "original": { + "owner": "zrax", + "repo": "pycdc", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", "jwt-tool": "jwt-tool", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "pycdc": "pycdc" } } }, diff --git a/flake.nix b/flake.nix index 48f6862..e5075df 100644 --- a/flake.nix +++ b/flake.nix @@ -7,21 +7,29 @@ url = "github:MaeIsBad/jwt_tool"; flake = false; }; + pycdc = { + url = "github:zrax/pycdc"; + flake = false; + }; }; - outputs = { self, nixpkgs, flake-utils, jwt-tool }: + outputs = { self, nixpkgs, flake-utils, jwt-tool, pycdc }: flake-utils.lib.eachDefaultSystem (system: let - nixpkgs = import self.inputs.nixpkgs { system = "x86_64-linux"; }; + nixpkgs = import self.inputs.nixpkgs { system = system; }; in rec { packages.jwt-tool = (import ./jwt-tool.nix { inherit nixpkgs jwt-tool; }); - defaultPackage = packages.jwt-tool; apps.jwt-tool = { type = "app"; program = "${packages.jwt-tool}/bin/jwt_tool"; }; + packages.pycdc = (import ./pycdc.nix { inherit nixpkgs pycdc; }); + apps.pycdc = { + type = "app"; + program = "${packages.pycdc}/bin/pycdc"; + }; } ); } diff --git a/pycdc.nix b/pycdc.nix new file mode 100644 index 0000000..e228a07 --- /dev/null +++ b/pycdc.nix @@ -0,0 +1,8 @@ +{ nixpkgs, pycdc }: with nixpkgs; +stdenv.mkDerivation { + pname = "pycdc"; + src = pycdc.outPath; + version = pycdc.shortRev; + buildInputs = [ python ]; + nativeBuildInputs = [ cmake ]; +}