Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates to Nixpkgs 23.11 #38

Merged
merged 1 commit into from
Dec 6, 2023
Merged

Updates to Nixpkgs 23.11 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 3 additions & 19 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,28 @@
description = "Monoidal Functors";

inputs = {
nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11;
flake-utils.url = github:numtide/flake-utils;
};

outputs = { self, nixpkgs, flake-utils }:
let
ghcVersion = "962";
ghcVersion = "948";
compiler = "ghc${ghcVersion}";
# default systems compatible with pre-commit-hooks.nix
# https://github.com/cachix/pre-commit-hooks.nix/pull/122
defaultSystems = [
"aarch64-linux"
# "aarch64-darwin"
"i686-linux"
"x86_64-darwin"
"x86_64-linux"
];
in
flake-utils.lib.eachSystem defaultSystems (system:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; };
hsPkgs = pkgs.haskell.packages.${compiler}.override {
overrides = hfinal: hprev: with pkgs.haskell.lib.compose; {
monoidal-functors = hfinal.callCabal2nix "monoidal-functors" ./. { };
assoc = hfinal.assoc_1_1;
bifunctors = hfinal.bifunctors_5_6_1;
foldable1-classes-compat = dontCheck hprev.foldable1-classes-compat;
indexed-traversable-instances = dontCheck hprev.indexed-traversable-instances;
semialign = hfinal.semialign_1_3;
semigroupoids = hfinal.semigroupoids_6_0_0_1;
tagged = hfinal.tagged_0_8_7;
these = hfinal.these_1_2;
};
};
in
rec {
devShell = pkgs.mkShell {
withHoogle = true;
buildInputs = with pkgs; [
cabal2nix
cabal-install
Expand Down
Loading