From 3559807fdfec6fa2a9be5dd41f6187da37ae8d95 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 30 Nov 2024 18:08:35 +0100 Subject: [PATCH 1/2] treewide: use extra-doc-files where appropriate --- cabal2nix/cabal2nix.cabal | 4 ++-- distribution-nixpkgs/distribution-nixpkgs.cabal | 6 +++--- hackage-db/hackage-db.cabal | 4 ++-- language-nix/language-nix.cabal | 4 +++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cabal2nix/cabal2nix.cabal b/cabal2nix/cabal2nix.cabal index d7329a5d..85176050 100644 --- a/cabal2nix/cabal2nix.cabal +++ b/cabal2nix/cabal2nix.cabal @@ -17,9 +17,9 @@ category: Distribution, Nix homepage: https://github.com/nixos/cabal2nix#readme bug-reports: https://github.com/nixos/cabal2nix/issues build-type: Simple -extra-source-files: README.md +extra-doc-files: README.md CHANGELOG.md - test/golden-test-cases/*.cabal +extra-source-files: test/golden-test-cases/*.cabal test/golden-test-cases/*.nix.golden cabal-version: 1.24 diff --git a/distribution-nixpkgs/distribution-nixpkgs.cabal b/distribution-nixpkgs/distribution-nixpkgs.cabal index 103d4ca9..c876d70e 100644 --- a/distribution-nixpkgs/distribution-nixpkgs.cabal +++ b/distribution-nixpkgs/distribution-nixpkgs.cabal @@ -11,11 +11,11 @@ category: Distribution, Nix homepage: https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme bug-reports: https://github.com/NixOS/cabal2nix/issues build-type: Simple -cabal-version: >= 1.10 +cabal-version: 1.18 data-files: derivation-attr-paths.nix -extra-source-files: CHANGELOG.md +extra-doc-files: CHANGELOG.md README.md - test/data/all-system-tuples.json +extra-source-files: test/data/all-system-tuples.json source-repository head type: git diff --git a/hackage-db/hackage-db.cabal b/hackage-db/hackage-db.cabal index b3c4e897..fd2b541c 100644 --- a/hackage-db/hackage-db.cabal +++ b/hackage-db/hackage-db.cabal @@ -14,8 +14,8 @@ category: Distribution homepage: https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme bug-reports: https://github.com/NixOS/cabal2nix/issues build-type: Simple -cabal-version: >= 1.10 -extra-source-files: README.md +cabal-version: 1.18 +extra-doc-files: README.md CHANGELOG.md source-repository head diff --git a/language-nix/language-nix.cabal b/language-nix/language-nix.cabal index d9d0617a..f2eed2f4 100644 --- a/language-nix/language-nix.cabal +++ b/language-nix/language-nix.cabal @@ -12,7 +12,9 @@ category: Distribution, Language, Nix homepage: https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme bug-reports: https://github.com/NixOS/cabal2nix/issues build-type: Simple -cabal-version: >= 1.10 +cabal-version: 1.18 +extra-doc-files: README.md +-- TODO: add changelog source-repository head type: git From 7932b9a4388fdbf0ad73664077d252aa6d2b3ebb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 30 Nov 2024 18:13:46 +0100 Subject: [PATCH 2/2] distribution-nixpkgs: prepare release 1.7.1.1 --- distribution-nixpkgs/CHANGELOG.md | 5 +++++ distribution-nixpkgs/distribution-nixpkgs.cabal | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/distribution-nixpkgs/CHANGELOG.md b/distribution-nixpkgs/CHANGELOG.md index 056237cf..995e0741 100644 --- a/distribution-nixpkgs/CHANGELOG.md +++ b/distribution-nixpkgs/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for distribution-nixpkgs +## 1.7.1.1 + +* Adapt test suite to added representation of `RISCV64` and + `LoongArch64` architectures in Cabal 3.12. + ## 1.7.1 * GHC and nixpkgs now diff --git a/distribution-nixpkgs/distribution-nixpkgs.cabal b/distribution-nixpkgs/distribution-nixpkgs.cabal index c876d70e..710e851f 100644 --- a/distribution-nixpkgs/distribution-nixpkgs.cabal +++ b/distribution-nixpkgs/distribution-nixpkgs.cabal @@ -1,5 +1,5 @@ name: distribution-nixpkgs -version: 1.7.1 +version: 1.7.1.1 synopsis: Types and functions to manipulate the Nixpkgs distribution description: Types and functions to represent, query, and manipulate the Nixpkgs distribution. license: BSD3