From 5bf9329210a5e65ffb57da062903adc69e106ceb Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 2 Sep 2025 09:54:23 -0500 Subject: [PATCH] work --- flake.lock | 40 ++++++++++------------------------------ flake.nix | 20 ++++++++++++++++++-- setup.py | 7 +++++++ 3 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 setup.py diff --git a/flake.lock b/flake.lock index cfe6ab7..cce0b26 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -36,18 +20,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755593991, - "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", - "type": "github" + "lastModified": 1756575425, + "narHash": "sha256-A1KwM4giJ8aDlhWmG8k0HUBulJq6BHvJDc7zKcML+4o=", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre854036.d7600c775f87/nixexprs.tar.xz" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "pyproject-nix": { @@ -57,11 +38,11 @@ ] }, "locked": { - "lastModified": 1754923840, - "narHash": "sha256-QSKpYg+Ts9HYF155ltlj40iBex39c05cpOF8gjoE2EM=", + "lastModified": 1756395552, + "narHash": "sha256-5aJM14MpoLk2cdZAetu60OkLQrtFLWTICAyn1EP7ZpM=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "023cd4be230eacae52635be09eef100c37ef78da", + "rev": "030dffc235dcf240d918c651c78dc5f158067b51", "type": "github" }, "original": { @@ -72,7 +53,6 @@ }, "root": { "inputs": { - "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "pyproject-nix": "pyproject-nix" diff --git a/flake.nix b/flake.nix index fa88910..36e54d0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-25.05"; + url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; }; flake-utils = { url = "github:numtide/flake-utils"; @@ -20,6 +20,22 @@ pyproject-nix, ... }: + let + packages = + system: + import nixpkgs { + inherit system; + }; + forAllSystems = ( + function: + nixpkgs.lib.genAttrs [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ] (system: function (packages system)) + ); + in flake-utils.lib.eachDefaultSystem ( system: let @@ -52,7 +68,7 @@ pkgs.zig_0_15 ]; }; - default = self.devShells.${system}.zig_0_14; + default = self.devShells.${system}.zig_0_15; }; packages = { jtftp = diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..b44db6c --- /dev/null +++ b/setup.py @@ -0,0 +1,7 @@ +from setuptools import find_packages, setup + +setup( + name="jtftp", + version="0.1.0", + packages=["examples", "jtftp"], +) -- 2.51.2