jer/hare-nix
1
Fork 0
Code Actions Activity

Compare commits

base: jer:bbd9caea83ea8a0191503a47ab7e919783804456
Branches Tags
jer:main
...
compare: jer:7c95e59ca463112e1c7b43f452dbfe864fd8468c
Branches Tags
jer:main

3 commits
bbd9caea83 ... 7c95e59ca4

Author SHA1 Message Date
Jan-Erik Rediger 7c95e59ca4 generate packages, not a devshell 2024-06-02 00:42:42 +02:00
Jan-Erik Rediger 2a08a59e8c build on linux 2024-06-02 00:40:02 +02:00
Jan-Erik Rediger e894a59afb update harec 2024-06-02 00:29:32 +02:00
3 changed files with 22 additions and 24 deletions
Show stats Expand all files Collapse all files

20
flake.lock
View file

@ -35,24 +35,32 @@
"linux-hare-src": { "linux-hare-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-v32f8c4eN2FiSUMZgwByXaFlS6m4ILJsWiTGp4x8qnA=", "lastModified": 1717244404,
"type": "file", "narHash": "sha256-iEGez/JfWvAaHbYUQL/BeRPUH5d+xj7AyFM8CvA+oDU=",
"ref": "refs/heads/master",
"rev": "a3fd5ec812ee31a7ec4a07053518b64aaa0c3932",
"revCount": 3883,
"type": "git",
"url": "https://git.sr.ht/~sircmpwn/hare" "url": "https://git.sr.ht/~sircmpwn/hare"
}, },
"original": { "original": {
"type": "file", "type": "git",
"url": "https://git.sr.ht/~sircmpwn/hare" "url": "https://git.sr.ht/~sircmpwn/hare"
} }
}, },
"linux-harec-src": { "linux-harec-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-QjzxiXC2zS8bl2b0RJDwqhcOn8I9rcN830LYHnSyP6k=", "lastModified": 1716809026,
"type": "file", "narHash": "sha256-z4D4MMVROoMFnqAjyWWCUdHwCfR14coGFUNdRGQktgQ=",
"ref": "refs/heads/master",
"rev": "42f9b39977ce8d94bab1655f07bb82eb08c85dda",
"revCount": 1914,
"type": "git",
"url": "https://git.sr.ht/~sircmpwn/harec" "url": "https://git.sr.ht/~sircmpwn/harec"
}, },
"original": { "original": {
"type": "file", "type": "git",
"url": "https://git.sr.ht/~sircmpwn/harec" "url": "https://git.sr.ht/~sircmpwn/harec"
} }
}, },

22
flake.nix
View file

@ -12,12 +12,12 @@
}; };
linux-harec-src = { linux-harec-src = {
url = "https://git.sr.ht/~sircmpwn/harec"; url = "git+https://git.sr.ht/~sircmpwn/harec";
flake = false; flake = false;
}; };
linux-hare-src = { linux-hare-src = {
url = "https://git.sr.ht/~sircmpwn/hare"; url = "git+https://git.sr.ht/~sircmpwn/hare";
flake = false; flake = false;
}; };
}; };
@ -28,7 +28,7 @@
linuxSystems = [ "x86_64-linux" "aarch64-linux" ]; linuxSystems = [ "x86_64-linux" "aarch64-linux" ];
in in
{ {
devShells = nixpkgs.lib.genAttrs darwinSystems (system: packages = nixpkgs.lib.genAttrs darwinSystems (system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
hare-as = pkgs.callPackage ./pkgs/darwin/hare-as.nix { }; 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; }; hare = pkgs.callPackage ./pkgs/darwin/hare.nix { inherit hare-src harec hare-as hare-cc hare-ld; };
in in
{ {
default = pkgs.mkShell { inherit hare harec;
buildInputs = [
harec
hare
];
};
}) // }) //
nixpkgs.lib.genAttrs linuxSystems (system: nixpkgs.lib.genAttrs linuxSystems (system:
let let
pkgs = nixpkgs.legacyPackages.${system}; 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; }; hare = pkgs.callPackage ./pkgs/linux/hare.nix { inherit harec; hare-src = linux-hare-src; };
in in
{ {
default = pkgs.mkShell { inherit hare harec;
buildInputs = [
harec
hare
];
};
}); });
}; };
} }

4
pkgs/linux/harec.nix
View file

@ -1,4 +1,4 @@
{ stdenv, qbe, hare-src }: { stdenv, qbe, harec-src }:
let let
arch = stdenv.hostPlatform.uname.processor; arch = stdenv.hostPlatform.uname.processor;
qbePlatform = { qbePlatform = {
@ -10,7 +10,7 @@ in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "harec"; pname = "harec";
version = "0.24"; version = "0.24";
src = hare-src; src = harec-src;
buildInputs = [ qbe ]; buildInputs = [ qbe ];
nativeBuildInputs = [ qbe ]; nativeBuildInputs = [ qbe ];