oama: 0.19.0 -> 0.20.1 (#408872)

This commit is contained in:
Nick Hu
2025-05-20 07:32:09 +01:00
committed by GitHub
parent ab8e5cefd6
commit 03875543f1
3 changed files with 4 additions and 28 deletions
@@ -1,22 +0,0 @@
From d6d43789bf5af99c9c18f4c88e6a6751bdcacbce Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Wed, 16 Apr 2025 15:18:02 +0100
Subject: [PATCH] Downgrade cabal-version for ghc 9.6 compat
---
oama.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oama.cabal b/oama.cabal
index 658c051..4d0c428 100644
--- a/oama.cabal
+++ b/oama.cabal
@@ -1,4 +1,4 @@
-cabal-version: 3.12
+cabal-version: 3.8
name: oama
version: 0.19.0
license: BSD-3-Clause
--
2.48.1
+3 -3
View File
@@ -31,11 +31,11 @@
}:
mkDerivation {
pname = "oama";
version = "0.19.0";
version = "0.20.1";
src = fetchgit {
url = "https://github.com/pdobsan/oama.git";
sha256 = "1nrgpnh76fcmkdw1j3ha5cam7bnxkgfns2plj8609qv0v0swmj4s";
rev = "3eef17b7e290dfced252375a13bc8dd46849adf0";
sha256 = "sha256-59tKAHL7rCZJyfraD7NnwFR5iP6784IcgH82hfsFHiA=";
rev = "99659a8567808b28885ed241abe4df03f37e92fc";
fetchSubmodules = true;
};
isLibrary = true;
+1 -3
View File
@@ -1,6 +1,5 @@
{
haskell,
haskellPackages,
lib,
stdenv,
}:
@@ -8,7 +7,6 @@ let
inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
overrides = {
patches = [ ./0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch ];
description = "OAuth credential MAnager";
homepage = "https://github.com/pdobsan/oama";
maintainers = with lib.maintainers; [ aidalgol ];
@@ -16,7 +14,7 @@ let
passthru.updateScript = ./update.sh;
};
raw-pkg = haskellPackages.callPackage ./generated-package.nix { };
raw-pkg = haskell.packages.ghc912.callPackage ./generated-package.nix { };
in
lib.pipe raw-pkg [
(overrideCabal overrides)