From 9f3628d8ac59942e57b7cafc4d8a08d88ec8986d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sat, 16 May 2026 14:31:32 -0600 Subject: [PATCH] use bdwgc from sydpkgs --- bdwgc.nix | 18 ------------------ flake.lock | 23 ++++++++++++++++++++++- flake.nix | 21 +++++++-------------- 3 files changed, 29 insertions(+), 33 deletions(-) delete mode 100644 bdwgc.nix diff --git a/bdwgc.nix b/bdwgc.nix deleted file mode 100644 index 2a08f99..0000000 --- a/bdwgc.nix +++ /dev/null @@ -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 - ]; -}) diff --git a/flake.lock b/flake.lock index 3519aef..f283755 100644 --- a/flake.lock +++ b/flake.lock @@ -591,7 +591,8 @@ "nixpkgs": [ "haskellNix", "nixpkgs-unstable" - ] + ], + "sydpkgs": "sydpkgs" } }, "stackage": { @@ -609,6 +610,26 @@ "repo": "stackage.nix", "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", diff --git a/flake.nix b/flake.nix index 6d4039c..d7c0738 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,13 @@ haskellNix.url = "github:input-output-hk/haskell.nix"; # nixpkgs.url = "github:NixOS/nixpkgs/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 supportedSystems = [ "aarch64-darwin" "aarch64-linux" @@ -15,21 +19,10 @@ overlays = [ haskellNix.overlay (final: prev: { - bdwgc = final.callPackage ./bdwgc.nix {}; + inherit (sydpkgs.packages.${final.stdenv.hostPlatform.system}) + bdwgc; }) (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' { src = ./.; compiler-nix-name = "ghc912";