jer/hare-nix
1
Fork 0
Code Actions Activity

linux hare src as inputs

Browse source
This commit is contained in:
Jan-Erik Rediger 2024-06-02 00:22:03 +02:00
parent 8e7bec40c9
commit bbd9caea83
4 changed files with 43 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
flake.lock
View file

@ -32,6 +32,30 @@
"type": "github" "type": "github"
} }
}, },
"linux-hare-src": {
"flake": false,
"locked": {
"narHash": "sha256-v32f8c4eN2FiSUMZgwByXaFlS6m4ILJsWiTGp4x8qnA=",
"type": "file",
"url": "https://git.sr.ht/~sircmpwn/hare"
},
"original": {
"type": "file",
"url": "https://git.sr.ht/~sircmpwn/hare"
}
},
"linux-harec-src": {
"flake": false,
"locked": {
"narHash": "sha256-QjzxiXC2zS8bl2b0RJDwqhcOn8I9rcN830LYHnSyP6k=",
"type": "file",
"url": "https://git.sr.ht/~sircmpwn/harec"
},
"original": {
"type": "file",
"url": "https://git.sr.ht/~sircmpwn/harec"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716220750, "lastModified": 1716220750,
@ -50,6 +74,8 @@
"inputs": { "inputs": {
"hare-src": "hare-src", "hare-src": "hare-src",
"harec-src": "harec-src", "harec-src": "harec-src",
"linux-hare-src": "linux-hare-src",
"linux-harec-src": "linux-harec-src",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

16
flake.nix
View file

@ -10,9 +10,19 @@
url = "github:badboy/harelang"; url = "github:badboy/harelang";
flake = false; flake = false;
}; };
linux-harec-src = {
url = "https://git.sr.ht/~sircmpwn/harec";
flake = false;
}; };
outputs = { nixpkgs, harec-src, hare-src, ... }: linux-hare-src = {
url = "https://git.sr.ht/~sircmpwn/hare";
flake = false;
};
};
outputs = { nixpkgs, harec-src, hare-src, linux-harec-src, linux-hare-src, ... }:
let let
darwinSystems = [ "x86_64-darwin" "aarch64-darwin" ]; darwinSystems = [ "x86_64-darwin" "aarch64-darwin" ];
linuxSystems = [ "x86_64-linux" "aarch64-linux" ]; linuxSystems = [ "x86_64-linux" "aarch64-linux" ];
@ -38,8 +48,8 @@
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 = pkgs.callPackage ./pkgs/linux/harec.nix { harec-src = linux-hare-src; };
hare = pkgs.callPackage ./pkgs/linux/hare.nix { inherit harec; }; hare = pkgs.callPackage ./pkgs/linux/hare.nix { inherit harec; hare-src = linux-hare-src; };
in in
{ {
default = pkgs.mkShell { default = pkgs.mkShell {

11
pkgs/linux/hare.nix
View file

@ -3,8 +3,8 @@
lib, lib,
makeWrapper, makeWrapper,
scdoc, scdoc,
substituteAll,
qbe, qbe,
hare-src,
harec, harec,
binutils-unwrapped, binutils-unwrapped,
tzdata tzdata
@ -20,14 +20,7 @@ in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "hare"; pname = "hare";
version = "0.24"; version = "0.24";
src = builtins.fetchGit { src = hare-src;
url = "https://git.sr.ht/~sircmpwn/hare";
ref = "master";
rev = "0cd51184a7acdfd4ef20195d1648622b04477293";
};
patches = [
];
nativeBuildInputs = [ nativeBuildInputs = [
harec harec

8
pkgs/linux/harec.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, qbe }: { stdenv, qbe, hare-src }:
let let
arch = stdenv.hostPlatform.uname.processor; arch = stdenv.hostPlatform.uname.processor;
qbePlatform = { qbePlatform = {
@ -10,11 +10,7 @@ in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "harec"; pname = "harec";
version = "0.24"; version = "0.24";
src = builtins.fetchGit { src = hare-src;
url = "https://git.sr.ht/~sircmpwn/harec";
ref = "master";
rev = "3be960cf19ecf9528b8b3aaafc135229291e01b1";
};
buildInputs = [ qbe ]; buildInputs = [ qbe ];
nativeBuildInputs = [ qbe ]; nativeBuildInputs = [ qbe ];