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.

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

Fix old tar breaking keter #292

Merged
merged 4 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
# signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
# # Only needed for private caches
# #authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix-build .
- run: nix-shell --run "cd incoming; make all"
# - run: nix-build .
# - run: nix-shell --run "cd incoming; make all"
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2.1.7
+ add lower limit for tar to 0.6.0.0, which fixes "FileNotExecutable" bug.
see #291, special thanks to @scheottl for finding and debugging.

## 2.1.6
+ Bump network
Expand Down
4 changes: 2 additions & 2 deletions keter.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: keter
version: 2.1.6
version: 2.1.7
synopsis:
Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime.

Expand Down Expand Up @@ -60,7 +60,7 @@ library
random >=1.2.1 && <1.3,
regex-tdfa >=1.3.1 && <1.4,
stm >=2.5.0 && <2.6,
tar >=0.5.1 && <0.7,
tar >=0.6.0.0 && <0.7,
template-haskell >=2.17.0 && <3.0,
text >=1.2.5 && <3.0,
time >=1.9.3 && <2.0,
Expand Down
4 changes: 2 additions & 2 deletions nix/pin.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import (builtins.fetchGit {
# Descriptive name to make the store path easier to identify
name = "nixos-pin-2022.05.13";
name = "nixos-pin-2024.06.26";
url = "https://github.com/nixos/nixpkgs/";
rev = "6925d06dd1e2039835ffe749cda11660431ffefa";
rev = "00ba4c2c35f5e450f28e13e931994c730df05563";
})
12 changes: 5 additions & 7 deletions nix/pkgs.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import ./pin.nix {
config = {

packageOverrides = pkgs: {
packageOverrides = pkgs:
let lib = pkgs.haskell.lib;
in
{

haskell = pkgs.lib.recursiveUpdate pkgs.haskell {
packageOverrides = hpNew: hpOld: {
keter = hpNew.callPackage ../default.nix {};

http-reverse-proxy = hpNew.callHackageDirect {
pkg = "http-reverse-proxy";
ver = "0.6.0.1";
sha256 = "09z9swznhzxb97ns8hnyjssm91ngsi4bvlqy6bmphqhj9c1m345x";
} {};
stm-lifted = lib.doJailbreak (lib.markUnbroken hpOld.stm-lifted);
};
};
};
Expand Down
Loading