From e77bea1a3cc4da6f54c62ba21ca926392e842a21 Mon Sep 17 00:00:00 2001 From: Raging Raspberries Date: Wed, 29 Jun 2022 19:22:27 +1000 Subject: [PATCH] nixos: bumped to HEAD of 22.05 --- nix/sources.json | 14 +++++++------- release.nix | 2 +- resrok-web.cabal | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index a59212e..67b90b0 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,22 +5,22 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "dd13098d01eaa6be68237e7e38f96782b0480755", - "sha256": "1cfjdbsn0219fjzam1k7nqzkz8fb1ypab50rhyj026qbklqq2kvq", + "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41", + "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/dd13098d01eaa6be68237e7e38f96782b0480755.tar.gz", + "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-21.05", + "branch": "nixos-22.05", "description": "Nix Packages collection", "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e86f5f7a19db6da2445f07bafa6694b556f9c6d", - "sha256": "0i2j7bf6jq3s13n12xahramami0n6zn1mksqgi01k7flpgyymcck", + "rev": "62de360d75419386b69ea4af4a8ce104949a8242", + "sha256": "1iincgcgswg29znpn3whpa04c1waj6ihn38db5v330laa0hdjhxp", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/9e86f5f7a19db6da2445f07bafa6694b556f9c6d.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/62de360d75419386b69ea4af4a8ce104949a8242.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/release.nix b/release.nix index 3804653..d7f3eb1 100644 --- a/release.nix +++ b/release.nix @@ -1,5 +1,5 @@ let sources = import ./nix/sources.nix; -in { compiler ? "ghc8104", pkgs ? import sources.nixpkgs { } }: +in { compiler ? "ghc902", pkgs ? import sources.nixpkgs { } }: let inherit (pkgs.lib.trivial) flip pipe; diff --git a/resrok-web.cabal b/resrok-web.cabal index 438a967..3eccb71 100644 --- a/resrok-web.cabal +++ b/resrok-web.cabal @@ -6,7 +6,7 @@ cabal-version: >= 1.10 executable site main-is: site.hs build-depends: base == 4.* - , hakyll == 4.14.* + , hakyll == 4.15.* , containers == 0.6.* , filepath == 1.4.* , pandoc