From f672a3d2a037931f2af44bf2cc40ff16c766581b Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Thu, 7 Mar 2024 18:41:23 -0800 Subject: [PATCH 1/2] `nix flake update` --- flake.lock | 18 +++++++++--------- flake.nix | 4 +++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 77842480..6075d613 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1706356277, - "narHash": "sha256-a4pla2tu/MYWa6psyfSvaLvom38AL8m+/QVe9pO5/XI=", + "lastModified": 1709467224, + "narHash": "sha256-xnPTkLMqq78BiTqt6WXj2TXLupclJi+NEH84HDbQSPc=", "owner": "srid", "repo": "haskell-flake", - "rev": "db8b111a53f3584fb6d0b4c2d56ed37b68196302", + "rev": "9173cc45aeb72b7e7adfe0e5a53a425fe439e3ca", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706400827, - "narHash": "sha256-0Llt2cpAvMG6zCkb0gJuiAc2ZZztutAIaT04MweJMuY=", + "lastModified": 1709856773, + "narHash": "sha256-QJ3yNJLhfDZbln1HEhIGXmPlwqCk22MbyicFNfSVs3A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc838f6bd7a7ceaa6cf8f7cad4815716d052fe81", + "rev": "a32bb438c0219345fc535b4f910da21fa4c4aaa2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a571c5ca..a8b1d18d 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,9 @@ ap-normalize.check = false; # https://community.flake.parts/haskell-flake/dependency#nixpkgs tar = { super, ... }: - { custom = _: super.tar_0_6_0_0; }; + { custom = _: super.tar_0_6_1_0; }; + # tasty = { super, ... }: + # { custom = _: super.tasty_1_5; }; }; packages = { # https://community.flake.parts/haskell-flake/dependency#path From 66b13d99df352d62a737988914b54dce36a2907a Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Thu, 7 Mar 2024 18:44:38 -0800 Subject: [PATCH 2/2] fix badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b6b65fbb..51cd6f01 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # hackage-server -[![Build status](https://github.com/haskell/hackage-server/actions/workflows/cabal.yml/badge.svg)](https://github.com/haskell/hackage-server/actions/workflows/cabal.yml) +[![Build status](https://github.com/haskell/hackage-server/actions/workflows/haskell-ci.yml/badge.svg)](https://github.com/haskell/hackage-server/actions/workflows/haskell-ci.yml) [![Build status](https://github.com/haskell/hackage-server/actions/workflows/nix-flake.yml/badge.svg)](https://github.com/haskell/hackage-server/actions/workflows/nix-flake.yml) This is the `hackage-server` code. This is what powers , and many other private hackage instances. The `master` branch is suitable for general usage. Specific policy and documentation for the central hackage instance exists in the `central-server` branch.