Skip to content

Commit b206e70

Browse files
authored
oama: 0.14 -> 0.19.0 (#399231)
2 parents abb41d2 + 5db8a77 commit b206e70

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From d6d43789bf5af99c9c18f4c88e6a6751bdcacbce Mon Sep 17 00:00:00 2001
2+
From: Nick Hu <[email protected]>
3+
Date: Wed, 16 Apr 2025 15:18:02 +0100
4+
Subject: [PATCH] Downgrade cabal-version for ghc 9.6 compat
5+
6+
---
7+
oama.cabal | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/oama.cabal b/oama.cabal
11+
index 658c051..4d0c428 100644
12+
--- a/oama.cabal
13+
+++ b/oama.cabal
14+
@@ -1,4 +1,4 @@
15+
-cabal-version: 3.12
16+
+cabal-version: 3.8
17+
name: oama
18+
version: 0.19.0
19+
license: BSD-3-Clause
20+
--
21+
2.48.1
22+

pkgs/by-name/oa/oama/generated-package.nix

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
fetchgit,
1111
hsyslog,
1212
http-conduit,
13+
http-types,
1314
lib,
1415
mtl,
1516
network,
@@ -30,11 +31,11 @@
3031
}:
3132
mkDerivation {
3233
pname = "oama";
33-
version = "0.14";
34+
version = "0.19.0";
3435
src = fetchgit {
3536
url = "https://github.com/pdobsan/oama.git";
36-
sha256 = "1hdhkc6hh4nvx31vkaii7hd2rxlwqrsvr6i1i0a9r1xlda05ffq0";
37-
rev = "4e1ffd3001034771d284678f0160060c1871707c";
37+
sha256 = "1nrgpnh76fcmkdw1j3ha5cam7bnxkgfns2plj8609qv0v0swmj4s";
38+
rev = "3eef17b7e290dfced252375a13bc8dd46849adf0";
3839
fetchSubmodules = true;
3940
};
4041
isLibrary = true;
@@ -47,6 +48,7 @@ mkDerivation {
4748
directory
4849
hsyslog
4950
http-conduit
51+
http-types
5052
mtl
5153
network
5254
network-uri
@@ -72,6 +74,7 @@ mkDerivation {
7274
directory
7375
hsyslog
7476
http-conduit
77+
http-types
7578
mtl
7679
network
7780
network-uri

pkgs/by-name/oa/oama/package.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ let
88
inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
99

1010
overrides = {
11+
patches = [ ./0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch ];
1112
description = "OAuth credential MAnager";
1213
homepage = "https://github.com/pdobsan/oama";
1314
maintainers = with lib.maintainers; [ aidalgol ];

pkgs/by-name/oa/oama/update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env nix-shell
2-
#!nix-shell -i bash -p cabal2nix curl jq nixfmt-rfc-style
2+
#!nix-shell -i bash -p haskell.packages.ghc910.cabal2nix nix-prefetch-git curl jq nixfmt-rfc-style
33

44
set -euo pipefail
55

0 commit comments

Comments
 (0)