maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Remove overrides

Browse source
This commit is contained in:
Malte 2023-02-13 13:23:27 +01:00
parent e7d7fd1243
commit f6a48e7b02
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -279,11 +279,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1676110339, "lastModified": 1676202775,
"narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=", "narHash": "sha256-gV/RnfVZkGLHn+5rmX2GSh5aquVHpWOJw1cnpEV03tQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8", "rev": "d917136f550a8c36efb1724390c7245105f79023",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
packages/flake-module.nix
View file

@ -4,7 +4,7 @@
... ...
}: let }: let
pkgs = inputs.nixos-unstable.legacyPackages.x86_64-linux; pkgs = inputs.nixos-unstable.legacyPackages.x86_64-linux;
inherit (pkgs.haskell.lib.compose) unmarkBroken doJailbreak dontCheck appendPatch; inherit (pkgs.haskell.lib.compose) appendPatch;
includePatterns = [ includePatterns = [
".hs" ".hs"
".cabal" ".cabal"
@ -25,11 +25,7 @@
haskellPackagesOverlay = final: prev: haskellPackagesOverlay = final: prev:
lib.mapAttrs (_: package: package final) myHaskellPackages lib.mapAttrs (_: package: package final) myHaskellPackages
// { // {
# For kassandra # For nixpkgs-bot, this patch is already merged upstream and can be removed on the next release
clay = unmarkBroken (doJailbreak prev.clay);
streamly-bytestring =
unmarkBroken (dontCheck prev.streamly-bytestring);
# For nixpkgs-bot
matrix-client = matrix-client =
appendPatch (pkgs.fetchpatch { appendPatch (pkgs.fetchpatch {
url = "https://github.com/softwarefactory-project/matrix-client-haskell/commit/97cb1918fcdf9b0249c6c8e70c7bfc664d718022.patch"; url = "https://github.com/softwarefactory-project/matrix-client-haskell/commit/97cb1918fcdf9b0249c6c8e70c7bfc664d718022.patch";
@ -37,7 +33,6 @@
relative = "matrix-client"; relative = "matrix-client";
}) })
prev.matrix-client; prev.matrix-client;
aeson-schemas = unmarkBroken (dontCheck prev.aeson-schemas);
}; };
selectHaskellPackages = attrs: lib.mapAttrs (name: _: attrs.${name}) myHaskellPackages; selectHaskellPackages = attrs: lib.mapAttrs (name: _: attrs.${name}) myHaskellPackages;
myHaskellPackages = { myHaskellPackages = {