From ff1ff8d805a8c64423e9611dfab6f6c4edc2da97 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Wed, 25 Mar 2026 03:53:02 +0000 Subject: [PATCH] Bump cabal format version --- cabal2nix/cabal2nix.cabal | 8 +++++--- distribution-nixpkgs/distribution-nixpkgs.cabal | 5 +++-- hackage-db/hackage-db.cabal | 5 ++--- language-nix/language-nix.cabal | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cabal2nix/cabal2nix.cabal b/cabal2nix/cabal2nix.cabal index f6b03053..b41134f1 100644 --- a/cabal2nix/cabal2nix.cabal +++ b/cabal2nix/cabal2nix.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cabal2nix version: 2.21.3 synopsis: Convert Cabal files into Nix build instructions. @@ -6,7 +7,7 @@ description: version by running: . > nix-env -i cabal2nix -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: Peter Simons -- list all contributors: git log --pretty='%an' | sort | uniq @@ -21,7 +22,6 @@ extra-doc-files: README.md CHANGELOG.md extra-source-files: test/golden-test-cases/*.cabal test/golden-test-cases/*.nix.golden -cabal-version: 1.24 source-repository head type: git @@ -47,6 +47,7 @@ library Distribution.Nixpkgs.Haskell.OrphanInstances Distribution.Nixpkgs.Haskell.PackageSourceSpec Distribution.Nixpkgs.Haskell.Platform + autogen-modules: Paths_cabal2nix other-modules: Paths_cabal2nix hs-source-dirs: src build-depends: base > 4.11 && <5 @@ -94,6 +95,7 @@ executable cabal2nix executable hackage2nix main-is: Main.hs + autogen-modules: Paths_cabal2nix other-modules: HackageGit Paths_cabal2nix hs-source-dirs: hackage2nix @@ -134,5 +136,5 @@ test-suite regression-test , tasty , tasty-golden default-language: Haskell2010 - build-tools: cabal2nix + build-tool-depends: cabal2nix:cabal2nix ghc-options: -threaded -with-rtsopts=-K64K diff --git a/distribution-nixpkgs/distribution-nixpkgs.cabal b/distribution-nixpkgs/distribution-nixpkgs.cabal index 06ac3096..540a4eee 100644 --- a/distribution-nixpkgs/distribution-nixpkgs.cabal +++ b/distribution-nixpkgs/distribution-nixpkgs.cabal @@ -1,8 +1,9 @@ +cabal-version: 2.2 name: distribution-nixpkgs 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 +license: BSD-3-Clause license-file: LICENSE author: Peter Simons maintainer: sternenseemann @@ -11,7 +12,6 @@ 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.18 data-files: derivation-attr-paths.nix extra-doc-files: CHANGELOG.md README.md @@ -28,6 +28,7 @@ library Distribution.Nixpkgs.Meta Distribution.Nixpkgs.PackageMap Language.Nix.PrettyPrinting + autogen-modules: Paths_distribution_nixpkgs other-modules: Paths_distribution_nixpkgs hs-source-dirs: src build-depends: base > 4.2 && < 5 diff --git a/hackage-db/hackage-db.cabal b/hackage-db/hackage-db.cabal index e53a71ce..63d48138 100644 --- a/hackage-db/hackage-db.cabal +++ b/hackage-db/hackage-db.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: hackage-db version: 2.1.3 synopsis: Access cabal-install's Hackage database via Data.Map @@ -5,7 +6,7 @@ description: This library provides convenient access to the local copy of the database that \"cabal update\" creates. Check out for a collection of simple example programs that demonstrate how to use this code. -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: Peter Simons, Alexander Altman, Ben James, Kevin Quick maintainer: sternenseemann @@ -14,7 +15,6 @@ 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.18 extra-doc-files: README.md CHANGELOG.md @@ -36,7 +36,6 @@ library Distribution.Hackage.DB.Path Distribution.Hackage.DB.Unparsed Distribution.Hackage.DB.Utility - other-modules: Paths_hackage_db hs-source-dirs: src build-depends: base >= 4.9 && < 5 , Cabal >= 3.4 diff --git a/language-nix/language-nix.cabal b/language-nix/language-nix.cabal index 579cb357..cddcf641 100644 --- a/language-nix/language-nix.cabal +++ b/language-nix/language-nix.cabal @@ -1,9 +1,10 @@ +cabal-version: 2.2 name: language-nix version: 2.3.0 synopsis: Data types and functions to represent the Nix language description: Data types and useful functions to represent and manipulate the Nix language. -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: Peter Simons maintainer: simons@cryp.to @@ -12,7 +13,6 @@ 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.18 extra-doc-files: README.md CHANGELOG.md