From 5db8a77b01934b09aa351113f8317cd45a419b7e Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Wed, 16 Apr 2025 15:21:32 +0100 Subject: [PATCH] oama: 0.14 -> 0.19.0 --- ...ade-cabal-version-for-ghc-9.6-compat.patch | 22 +++++++++++++++++++ pkgs/by-name/oa/oama/generated-package.nix | 9 +++++--- pkgs/by-name/oa/oama/package.nix | 1 + pkgs/by-name/oa/oama/update.sh | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch diff --git a/pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch b/pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch new file mode 100644 index 000000000000..1e2a4150f0ab --- /dev/null +++ b/pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch @@ -0,0 +1,22 @@ +From d6d43789bf5af99c9c18f4c88e6a6751bdcacbce Mon Sep 17 00:00:00 2001 +From: Nick Hu +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 + diff --git a/pkgs/by-name/oa/oama/generated-package.nix b/pkgs/by-name/oa/oama/generated-package.nix index f024cc98466d..3385f05bf7a6 100644 --- a/pkgs/by-name/oa/oama/generated-package.nix +++ b/pkgs/by-name/oa/oama/generated-package.nix @@ -10,6 +10,7 @@ fetchgit, hsyslog, http-conduit, + http-types, lib, mtl, network, @@ -30,11 +31,11 @@ }: mkDerivation { pname = "oama"; - version = "0.14"; + version = "0.19.0"; src = fetchgit { url = "https://github.com/pdobsan/oama.git"; - sha256 = "1hdhkc6hh4nvx31vkaii7hd2rxlwqrsvr6i1i0a9r1xlda05ffq0"; - rev = "4e1ffd3001034771d284678f0160060c1871707c"; + sha256 = "1nrgpnh76fcmkdw1j3ha5cam7bnxkgfns2plj8609qv0v0swmj4s"; + rev = "3eef17b7e290dfced252375a13bc8dd46849adf0"; fetchSubmodules = true; }; isLibrary = true; @@ -47,6 +48,7 @@ mkDerivation { directory hsyslog http-conduit + http-types mtl network network-uri @@ -72,6 +74,7 @@ mkDerivation { directory hsyslog http-conduit + http-types mtl network network-uri diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index 73a275f431e0..0e4f99ad3d1e 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -8,6 +8,7 @@ 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 ]; diff --git a/pkgs/by-name/oa/oama/update.sh b/pkgs/by-name/oa/oama/update.sh index 60d1c74cbca1..45af4b99fe59 100755 --- a/pkgs/by-name/oa/oama/update.sh +++ b/pkgs/by-name/oa/oama/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq nixfmt-rfc-style +#!nix-shell -i bash -p haskell.packages.ghc910.cabal2nix nix-prefetch-git curl jq nixfmt-rfc-style set -euo pipefail