Merge pull request #633 from NixOS/distribution-nixpkgs-1.7.1.1

distribution-nixpkgs: prepare release 1.7.1.1
NixOS · Dec 1, 2024 · 5908d6a · 5908d6a
2 parents 3d543b6 + 7932b9a
commit 5908d6a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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