use bdwgc from sydpkgs

This commit is contained in:
2026-05-16 14:31:32 -06:00
parent f5536ca2e2
commit 9f3628d8ac
3 changed files with 29 additions and 33 deletions

View File

@@ -1,18 +0,0 @@
{ cmake
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bdwgc";
version = "8.2.12";
src = fetchFromGitHub {
owner = "bdwgc";
repo = "bdwgc";
tag = "v${finalAttrs.version}";
hash = "sha256-5yeAB5Y92YjOutwRXBJkMxoOLkmzmqIJs4PirKX89fE=";
};
nativeBuildInputs = [
cmake
];
})

23
flake.lock generated
View File

@@ -591,7 +591,8 @@
"nixpkgs": [ "nixpkgs": [
"haskellNix", "haskellNix",
"nixpkgs-unstable" "nixpkgs-unstable"
] ],
"sydpkgs": "sydpkgs"
} }
}, },
"stackage": { "stackage": {
@@ -609,6 +610,26 @@
"repo": "stackage.nix", "repo": "stackage.nix",
"type": "github" "type": "github"
} }
},
"sydpkgs": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1778962331,
"narHash": "sha256-qMokSV7hsWYiDCkkBGyG0aD4Ds3JLzJzJ0Cp9f/spJU=",
"ref": "refs/heads/main",
"rev": "59d3a471cd960f9d1f6c645a4fe578a670848e9d",
"revCount": 41,
"type": "git",
"url": "https://git.deertopia.net/msyds/sydpkgs"
},
"original": {
"type": "git",
"url": "https://git.deertopia.net/msyds/sydpkgs"
}
} }
}, },
"root": "root", "root": "root",

View File

@@ -3,9 +3,13 @@
haskellNix.url = "github:input-output-hk/haskell.nix"; haskellNix.url = "github:input-output-hk/haskell.nix";
# nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs.follows = "haskellNix/nixpkgs-unstable"; nixpkgs.follows = "haskellNix/nixpkgs-unstable";
sydpkgs = {
url = "git+https://git.deertopia.net/msyds/sydpkgs";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs, haskellNix, ... }@inputs: outputs = { self, nixpkgs, sydpkgs, haskellNix, ... }@inputs:
let let
supportedSystems = [ supportedSystems = [
"aarch64-darwin" "aarch64-linux" "aarch64-darwin" "aarch64-linux"
@@ -15,21 +19,10 @@
overlays = [ overlays = [
haskellNix.overlay haskellNix.overlay
(final: prev: { (final: prev: {
bdwgc = final.callPackage ./bdwgc.nix {}; inherit (sydpkgs.packages.${final.stdenv.hostPlatform.system})
bdwgc;
}) })
(final: prev: { (final: prev: {
# haskellPackages = prev.haskellPackages.override {
# qbe = final.haskell-nix.project' {
# src = final.fetchFromGitea {
# domain = "git.deertopia.net";
# owner = "msyds";
# repo = "qbe-hs";
# rev = "master";
# hash = "sha256-3Ni2xFOvw7Qjzq7BIXfnSQQ3U99OaEH0j6SdILMYizs=";
# };
# compiler-nix-name = "ghc912";
# };
# };
gyehoek = final.haskell-nix.project' { gyehoek = final.haskell-nix.project' {
src = ./.; src = ./.;
compiler-nix-name = "ghc912"; compiler-nix-name = "ghc912";