Compare commits
3 commits
bbd9caea83
...
7c95e59ca4
Author | SHA1 | Date | |
---|---|---|---|
Jan-Erik Rediger | 7c95e59ca4 | ||
Jan-Erik Rediger | 2a08a59e8c | ||
Jan-Erik Rediger | e894a59afb |
20
flake.lock
20
flake.lock
|
@ -35,24 +35,32 @@
|
|||
"linux-hare-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-v32f8c4eN2FiSUMZgwByXaFlS6m4ILJsWiTGp4x8qnA=",
|
||||
"type": "file",
|
||||
"lastModified": 1717244404,
|
||||
"narHash": "sha256-iEGez/JfWvAaHbYUQL/BeRPUH5d+xj7AyFM8CvA+oDU=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "a3fd5ec812ee31a7ec4a07053518b64aaa0c3932",
|
||||
"revCount": 3883,
|
||||
"type": "git",
|
||||
"url": "https://git.sr.ht/~sircmpwn/hare"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"type": "git",
|
||||
"url": "https://git.sr.ht/~sircmpwn/hare"
|
||||
}
|
||||
},
|
||||
"linux-harec-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-QjzxiXC2zS8bl2b0RJDwqhcOn8I9rcN830LYHnSyP6k=",
|
||||
"type": "file",
|
||||
"lastModified": 1716809026,
|
||||
"narHash": "sha256-z4D4MMVROoMFnqAjyWWCUdHwCfR14coGFUNdRGQktgQ=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "42f9b39977ce8d94bab1655f07bb82eb08c85dda",
|
||||
"revCount": 1914,
|
||||
"type": "git",
|
||||
"url": "https://git.sr.ht/~sircmpwn/harec"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"type": "git",
|
||||
"url": "https://git.sr.ht/~sircmpwn/harec"
|
||||
}
|
||||
},
|
||||
|
|
22
flake.nix
22
flake.nix
|
@ -12,12 +12,12 @@
|
|||
};
|
||||
|
||||
linux-harec-src = {
|
||||
url = "https://git.sr.ht/~sircmpwn/harec";
|
||||
url = "git+https://git.sr.ht/~sircmpwn/harec";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
linux-hare-src = {
|
||||
url = "https://git.sr.ht/~sircmpwn/hare";
|
||||
url = "git+https://git.sr.ht/~sircmpwn/hare";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
@ -28,7 +28,7 @@
|
|||
linuxSystems = [ "x86_64-linux" "aarch64-linux" ];
|
||||
in
|
||||
{
|
||||
devShells = nixpkgs.lib.genAttrs darwinSystems (system:
|
||||
packages = nixpkgs.lib.genAttrs darwinSystems (system:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
hare-as = pkgs.callPackage ./pkgs/darwin/hare-as.nix { };
|
||||
|
@ -38,26 +38,16 @@
|
|||
hare = pkgs.callPackage ./pkgs/darwin/hare.nix { inherit hare-src harec hare-as hare-cc hare-ld; };
|
||||
in
|
||||
{
|
||||
default = pkgs.mkShell {
|
||||
buildInputs = [
|
||||
harec
|
||||
hare
|
||||
];
|
||||
};
|
||||
inherit hare harec;
|
||||
}) //
|
||||
nixpkgs.lib.genAttrs linuxSystems (system:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
harec = pkgs.callPackage ./pkgs/linux/harec.nix { harec-src = linux-hare-src; };
|
||||
harec = pkgs.callPackage ./pkgs/linux/harec.nix { harec-src = linux-harec-src; };
|
||||
hare = pkgs.callPackage ./pkgs/linux/hare.nix { inherit harec; hare-src = linux-hare-src; };
|
||||
in
|
||||
{
|
||||
default = pkgs.mkShell {
|
||||
buildInputs = [
|
||||
harec
|
||||
hare
|
||||
];
|
||||
};
|
||||
inherit hare harec;
|
||||
});
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, qbe, hare-src }:
|
||||
{ stdenv, qbe, harec-src }:
|
||||
let
|
||||
arch = stdenv.hostPlatform.uname.processor;
|
||||
qbePlatform = {
|
||||
|
@ -10,7 +10,7 @@ in
|
|||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "harec";
|
||||
version = "0.24";
|
||||
src = hare-src;
|
||||
src = harec-src;
|
||||
buildInputs = [ qbe ];
|
||||
nativeBuildInputs = [ qbe ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue