ihaveamac/ninfs
1
Fork 0
mirror of https://github.com/ihaveamac/ninfs.git synced 2025-06-18 17:05:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove flake-utils, some other cleanup

Browse Source
This commit is contained in:
ihaveahax 2025-01-19 20:29:19 -06:00
parent 78461945f0
commit 7227f6c9cb
No known key found for this signature in database
3 changed files with 45 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
default.nix
View File

@ -1,9 +1,10 @@
{ pkgs ? import <nixpkgs> {} }: {
pkgs ? import <nixpkgs> {},
let
# just so i can use the same pinned version as the flake... # just so i can use the same pinned version as the flake...
pyctr = (import (builtins.getFlake (builtins.toString ./.)).inputs.pyctr { inherit pkgs; }).pyctr; pyctr ? (import (builtins.getFlake (builtins.toString ./.)).inputs.pyctr { inherit pkgs; }).pyctr
in rec { }:
rec {
haccrypto = pkgs.python3Packages.callPackage ./nix/haccrypto.nix {}; haccrypto = pkgs.python3Packages.callPackage ./nix/haccrypto.nix {};
mfusepy = pkgs.python3Packages.callPackage ./nix/mfusepy.nix {}; mfusepy = pkgs.python3Packages.callPackage ./nix/mfusepy.nix {};
ninfs = pkgs.python3Packages.callPackage ./package.nix { inherit pyctr; haccrypto = haccrypto; mfusepy = mfusepy; }; ninfs = pkgs.python3Packages.callPackage ./package.nix { inherit pyctr; haccrypto = haccrypto; mfusepy = mfusepy; };

49
flake.lock generated
View File

@ -1,30 +1,12 @@
{ {
"nodes": { "nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736657626, "lastModified": 1737110817,
"narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", "narHash": "sha256-DSenga8XjPaUV5KUFW/i3rNkN7jm9XmguW+qQ1ZJTR4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", "rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,19 +18,16 @@
}, },
"pyctr": { "pyctr": {
"inputs": { "inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1736721451, "lastModified": 1737340038,
"narHash": "sha256-F+eURnmxXynO1tPhgwR9Lkz6nC4ecq+CP3EUM2MHz1k=", "narHash": "sha256-WExQ1nczGdtlzna3yT2+CcEzVCcrLKqjZF4fnWe3lCE=",
"owner": "ihaveamac", "owner": "ihaveamac",
"repo": "pyctr", "repo": "pyctr",
"rev": "3c12647f29f25b5cca01d0672670b6b984e5770b", "rev": "e8bdcf4688ea4c7f485e75aa0f484658eada5461",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,25 +39,9 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"pyctr": "pyctr" "pyctr": "pyctr"
} }
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

49
flake.nix
View File

@ -5,22 +5,39 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
pyctr.url = "github:ihaveamac/pyctr/master"; pyctr.url = "github:ihaveamac/pyctr/master";
pyctr.inputs.nixpkgs.follows = "nixpkgs"; pyctr.inputs.nixpkgs.follows = "nixpkgs";
pyctr.inputs.flake-utils.follows = "flake-utils";
flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = inputs@{ self, nixpkgs, flake-utils, pyctr }: outputs =
inputs@{
flake-utils.lib.eachDefaultSystem (system: self,
let pkgs = nixpkgs.legacyPackages.${system}; in { nixpkgs,
pyctr,
packages = rec { }:
haccrypto = pkgs.python3Packages.callPackage ./nix/haccrypto.nix {}; let
mfusepy = pkgs.python3Packages.callPackage ./nix/mfusepy.nix {}; systems = [
ninfs = pkgs.python3Packages.callPackage ./package.nix { haccrypto = haccrypto; mfusepy = mfusepy; pyctr = pyctr.packages.${system}.pyctr; }; "x86_64-linux"
ninfsNoGUI = ninfs.override { withGUI = false; }; "i686-linux"
default = ninfs; "x86_64-darwin"
}; "aarch64-darwin"
} "aarch64-linux"
); "armv6l-linux"
"armv7l-linux"
];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
in
{
legacyPackages = forAllSystems (
system:
(import ./default.nix {
pkgs = import nixpkgs { inherit system; };
pyctr = pyctr.packages.${system}.pyctr;
})
// {
default = self.legacyPackages.${system}.ninfs;
}
);
packages = forAllSystems (
system: nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system}
);
};
} }