Skip to content

Commit

Permalink
lift inappropriate SafeToInsert constraints
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-martin committed Dec 13, 2023
1 parent 5d26091 commit 8566747
Show file tree
Hide file tree
Showing 13 changed files with 519 additions and 67 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
## [*Unreleased*](https://github.com/freckle/graphula/compare/v2.0.2.1...main)
## [_Unreleased_](https://github.com/freckle/graphula/compare/v2.1.0.0...main)

None
## [v2.1.0.0](https://github.com/freckle/graphula/compare/v2.0.2.2...v2.1.0.0)

- Some unnecessary `SafeToInsert` have been removed from `node` and `nodeKeyed`.
- `node` only requires `SafeToInsert` when the `KeySource` is `SourceDefault`,
not when the `KeySource` is `KeyArbitrary`.
- `nodeKeyed` no longer ever requires `SafeToInsert`
- `MonadGraphulaFrontend` has a new `insertKeyed` method.

## [v2.0.2.2](https://github.com/freckle/graphula/compare/v2.0.2.1...v2.0.2.2)

Expand Down
251 changes: 251 additions & 0 deletions flake.lock

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

78 changes: 78 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
inputs = {
stable.url = "github:nixos/nixpkgs/nixos-23.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
freckle.url = "github:freckle/flakes?dir=main";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = inputs:
inputs.flake-utils.lib.eachDefaultSystem (system:
let
nixpkgsArgs = { inherit system; config = { }; };

nixpkgs = {
stable = import inputs.stable nixpkgsArgs;
unstable = import inputs.unstable nixpkgsArgs;
};
freckle = inputs.freckle.packages.${system};
freckleLib = inputs.freckle.lib.${system};

in
rec {
packages = {
cabal = nixpkgs.stable.cabal-install;

fourmolu = freckle.fourmolu-0-13-x;

ghc = freckleLib.haskellBundle {
ghcVersion = "ghc-9-4-6";
packageSelection = p: [
p.annotated-exception
p.case-insensitive
p.http-client
p.http-client-tls
p.hspec
p.iproute
p.network
p.QuickCheck
p.unliftio
p.wai
p.warp
p.yesod-core
];
};

haskell-language-server =
nixpkgs.stable.haskell-language-server.override
{ supportedGhcVersions = [ "946" ]; };

stack = nixpkgs.stable.writeShellApplication {
name = "stack";
text = ''
${nixpkgs.stable.stack}/bin/stack --system-ghc --no-nix "$@"
'';
};
};

devShells.default = nixpkgs.stable.mkShell {
buildInputs = with (nixpkgs.stable); [
pcre
pcre.dev
zlib
zlib.dev
];

nativeBuildInputs = with (packages); [
cabal
fourmolu
ghc
haskell-language-server
stack
];

shellHook = ''
export STACK_YAML=stack.yaml
'';
};
});
}
6 changes: 3 additions & 3 deletions graphula.cabal
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack
--
-- hash: ca3c9631f0eb250d085bf4e69cf99d4cd5d82c6c7975a14ce18b57fc549575c5
-- hash: 77f36204ab2afc392bf0f4eb7413aaf8ff36c25b86f28dde5747f3ed9121f0d4

name: graphula
version: 2.0.2.2
version: 2.1.0.0
synopsis: A simple interface for generating persistent data and linking its dependencies
description: Please see README.md
category: Network
Expand Down
3 changes: 1 addition & 2 deletions package.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
name: graphula
version: 2.0.2.2
version: 2.1.0.0
maintainer: Freckle Education
category: Network
github: freckle/graphula
synopsis: >-
A simple interface for generating persistent data and linking its dependencies
description: Please see README.md

extra-source-files:
- README.md
- CHANGELOG.md
Expand Down
Loading

0 comments on commit 8566747

Please sign in to comment.