artemist/packages
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: artemist:6656b07f2cbd2e5343afdd82eb9967c4a3f1bb0f
Branches Tags
artemist:canon
...
compare: artemist:22c0284119cdd5a5664868d032c1cc576a800971
Branches Tags
artemist:canon

2 commits
6656b07f2c ... 22c0284119

Author SHA1 Message Date
Artemis Tosini 22c0284119
jlink: 796b → 796t 2024-07-15 20:18:43 +00:00
Artemis Tosini 0ceb6d3a5f
remove flake-utils, clean up 2024-07-15 20:15:52 +00:00
3 changed files with 46 additions and 74 deletions
Show stats Expand all files Collapse all files

36
flake.lock
View file

@ -18,41 +18,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"utils": "utils"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
} }
} }
}, },

82
flake.nix
View file

@ -3,56 +3,62 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
utils.url = "github:numtide/flake-utils";
}; };
outputs = outputs =
{ { self, nixpkgs }:
self, let
nixpkgs, inherit (nixpkgs) lib;
utils, makePkgs =
}: system:
utils.lib.eachDefaultSystem ( import nixpkgs {
system:
let
pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ self.overlays.default ]; overlays = [ self.overlays.default ];
}; };
inherit (pkgs) lib; forAllSystems =
names = builtins.attrNames (self.overlays.default pkgs pkgs); f:
in lib.listToAttrs (
{ map (system: {
devShells = { name = system;
plotter = pkgs.callPackage ./shells/plotter { }; value = f (makePkgs system);
ryujinx = pkgs.callPackage ./shells/ryujinx { }; }) lib.systems.flakeExposed
zephyr = pkgs.callPackage ./shells/zephyr { }; );
}; makeDummy =
pkg:
if lib.isDerivation pkg then
pkg
else
pkg
// {
type = "derivation";
name = "dummy-attrset";
};
in
{
formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
formatter = pkgs.nixfmt-rfc-style; devShells = forAllSystems (pkgs: {
packages = builtins.listToAttrs ( plotter = pkgs.callPackage ./shells/plotter { };
ryujinx = pkgs.callPackage ./shells/ryujinx { };
zephyr = pkgs.callPackage ./shells/zephyr { };
});
packages = forAllSystems (
pkgs:
builtins.listToAttrs (
let
names = builtins.attrNames (self.overlays.default pkgs pkgs);
in
lib.concatMap ( lib.concatMap (
name: name:
let lib.optional (builtins.typeOf pkgs.${name} == "set") {
pkg = pkgs.${name};
in
lib.optional (builtins.typeOf pkg == "set") {
inherit name; inherit name;
value = value = makeDummy pkgs.${name};
if lib.isDerivation pkg then
pkg
else
pkg
// {
type = "derivation";
name = "dummy-attrset";
};
} }
) names ) names
); )
} );
)
// {
overlays.default = final: prev: { overlays.default = final: prev: {
apotris = final.callPackage ./packages/apotris { }; apotris = final.callPackage ./packages/apotris { };
attic = final.callPackage ./packages/attic { }; attic = final.callPackage ./packages/attic { };

2
packages/jlink/version.json
View file

@ -1 +1 @@
{"x86_64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V796b_x86_64.tgz", "version": "7.96b", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-UsDP+wMS7ZeWMQBObwv5RxbwuWU8nLnHes7LEXK6imE="}, "i686-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V796b_i686.tgz", "version": "7.96b", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-FhKc5FkVQzUDJ1oGDGDgDxadjbx0IX3zOaW9ru5YiI8="}, "armv7l-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V796b_arm.tgz", "version": "7.96b", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-6nTQGQpkbqQntheQqiUAdVS4rp30nl2KRUn5Adsfeoo="}, "aarch64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V796b_arm64.tgz", "version": "7.96b", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-ueIGdqfuIRCuEwaPkgZMgghO9DU11IboLLMryg/mxQ8="}} {"x86_64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V796t_x86_64.tgz", "version": "7.96t", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-1fBQJncpdpqQa0UbpnZrYAskmPGED+nGDfMWBUXUi4U="}, "i686-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V796t_i686.tgz", "version": "7.96t", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-GZ/c+LIBa+qTJJI0vFdrF7YeCAXY2dq8Trbw7ZCgZOY="}, "armv7l-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V796t_arm.tgz", "version": "7.96t", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-VgwOCiyS9RyrQ4MMBmQ8uOMXrZXXJxiGuOPwgmxWQ0g="}, "aarch64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V796t_arm64.tgz", "version": "7.96t", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-Yv8xDRM/1G/JcEfHU8CYeGgfHuYRoVSixtRswlUOuOk="}}