Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gbataille/gitHUD
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.3.0
Choose a base ref
...
head repository: gbataille/gitHUD
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Jan 8, 2023

  1. Copy the full SHA
    9b41213 View commit details
  2. Copy the full SHA
    91ab913 View commit details

Commits on Sep 11, 2023

  1. Copy the full SHA
    be26bad View commit details

Commits on Nov 2, 2023

  1. Fix compatibility with unix version and allow newer daemons

    unix broke us in 2.8.0.0 haskell/unix@7681b0e
    voidus authored and gbataille committed Nov 2, 2023
    Copy the full SHA
    bf26c6d View commit details

Commits on Nov 18, 2023

  1. Update nixpkgs now that NixOS/nixpkgs#264934 is merged

    Not that daemons 0.3.0.0 is actually broken on ghc9.6 so we're building
    with the default ghc again.
    voidus authored and gbataille committed Nov 18, 2023
    Copy the full SHA
    7385fcb View commit details
Showing with 34 additions and 17 deletions.
  1. +1 −1 README.md
  2. +24 −7 flake.lock
  3. +4 −4 flake.nix
  4. +4 −4 githud.cabal
  5. +1 −1 src/GitHUD.hs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ You need to add the following to the extra-deps in your stack.yml file

``` ./.stack/global-project/stack.yaml
extra-deps:
- daemons-0.3.0
- daemons-0.4.0
- network-2.8.0.1
```

31 changes: 24 additions & 7 deletions flake.lock

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

8 changes: 4 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
description = "githud flake";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
};

@@ -38,9 +38,9 @@
packages.default = pkgs.githud;
devShells.default = pkgs.mkShell {
buildInputs = [
(pkgs.haskell.lib.justStaticExecutables pkgs.haskellPackages.ghcid)
(pkgs.cabal-install)
];
(pkgs.haskell.lib.justStaticExecutables pkgs.haskellPackages.ghcid)
(pkgs.cabal-install)
];
inputsFrom = [ self.packages.${system}.default.env ];
};
});
8 changes: 4 additions & 4 deletions githud.cabal
Original file line number Diff line number Diff line change
@@ -34,16 +34,16 @@ library
, GitHUD.Terminal.Types
, GitHUD.Types
build-depends: base >= 4.11 && < 5
, bytestring >= 0.10 && < 0.11
, daemons >= 0.3 && < 0.4
, bytestring >= 0.10 && < 0.12
, daemons >= 0.3 && < 0.5
, data-default >= 0.7 && < 0.8
, directory >= 1.3 && < 1.4
, filelock >= 0.1.1.4 && < 0.1.2.0
, mtl >= 2.2.2 && < 3
, network >= 2.8 && < 4.0
, parsec >= 3.1.13 && < 4
, process
, text >= 1.2 && < 1.3
, text >= 1.2 && < 2.2
, temporary >= 1.3 && < 2
, unix >= 2.7 && < 3
, utf8-string >= 1.0 && < 1.1
@@ -74,7 +74,7 @@ test-suite githud-test
, tasty-hunit >= 0.10 && < 0.11
, tasty-smallcheck >= 0.8 && < 0.9
, tasty-quickcheck >= 0.10 && < 0.11
, daemons >= 0.3 && < 0.4
, daemons >= 0.3 && < 0.5
, parsec >= 3.1.13 && < 4
, mtl >= 2.2.2 && < 3
, githud
2 changes: 1 addition & 1 deletion src/GitHUD.hs
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import System.Environment (getArgs)
import System.Exit (ExitCode (ExitSuccess))
import System.FileLock (SharedExclusive (Exclusive), withTryFileLock)
import System.Posix.Files (fileExist)
import System.Posix.User (UserEntry (..), getRealUserID, getUserEntryForID)
import System.Posix.User (getRealUserID, getUserEntryForID, homeDirectory)
import System.Process (readProcessWithExitCode)

githud :: IO ()