paul/utoy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dependencies, remove Nix overlay

Browse Source
This commit is contained in:
Paul Brinkmeier 2023-12-26 22:30:12 +01:00
parent 77887bb29e
commit 7afe93727c
4 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1680273054, "lastModified": 1703588687,
"narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", "narHash": "sha256-yj/AFxJjW/aE0lmHz1wlTk3jScZqVjQQEeBOnhyroRc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", "rev": "ad9ca03be8aaf8d6e458102e7d77370b7fe71ccf",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "release-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

7
flake.nix
View File

@ -1,15 +1,14 @@
{ {
description = "Unicode toy"; description = "Unicode toy";
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; inputs.nixpkgs.url = "github:nixos/nixpkgs/release-23.11";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let
overlay = import ./nix/overlay.nix;
settings = import ./nix/settings.nix; settings = import ./nix/settings.nix;
haskellDeps = import ./nix/haskell-deps.nix; haskellDeps = import ./nix/haskell-deps.nix;
pkgs = nixpkgs.legacyPackages.x86_64-linux.extend overlay; pkgs = nixpkgs.legacyPackages.x86_64-linux;
haskellPackages = pkgs.haskell.packages."${settings.ghc}"; haskellPackages = pkgs.haskell.packages."${settings.ghc}";
ghc = haskellPackages.ghcWithPackages haskellDeps; ghc = haskellPackages.ghcWithPackages haskellDeps;
@ -37,7 +36,7 @@
({ mkDerivation }: ({ mkDerivation }:
mkDerivation { mkDerivation {
# Keep this in sync with package.yaml # Keep this in sync with package.yaml
version = "0.6"; version = "0.6.1";
pname = "utoy"; pname = "utoy";
license = pkgs.lib.licenses.mit; license = pkgs.lib.licenses.mit;
src = src =

23
nix/overlay.nix
View File

@ -1,23 +0,0 @@
let
settings = import ./settings.nix;
overlay = final: prev: {
haskell = prev.haskell // {
packages = prev.haskell.packages // {
"${settings.ghc}" = prev.haskell.packages."${settings.ghc}".override {
overrides = haskellOverlay prev;
};
};
};
};
haskellOverlay = pkgs: final: prev: {
attoparsec-iso8601 = prev.attoparsec-iso8601_1_1_0_0;
http-api-data = prev.http-api-data_0_5;
servant = pkgs.haskell.lib.doJailbreak prev.servant;
servant-server = pkgs.haskell.lib.doJailbreak prev.servant-server;
unicode-data = prev.unicode-data_0_4_0_1;
unicode-data-names = pkgs.haskell.lib.markUnbroken prev.unicode-data-names;
};
in
overlay

2
package.yaml
View File

@ -2,7 +2,7 @@
name: utoy name: utoy
# Keep this in sync with the version in flake.nix. # Keep this in sync with the version in flake.nix.
version: 0.6 version: 0.6.1
git: "https://git.pbrinkmeier.de/paul/utoy" git: "https://git.pbrinkmeier.de/paul/utoy"
license: MIT license: MIT
author: "Paul Brinkmeier" author: "Paul Brinkmeier"