From 48a221fff3361cc0ed2a37b7928cc2d81464c1ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreira?= Date: Tue, 7 Jan 2025 18:08:37 -0300 Subject: [PATCH 1/2] maintainers: add joaomoreira --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3e1a1e1cbcfe..74009f788ac0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10935,6 +10935,13 @@ githubId = 22916782; name = "Joan Massachs"; }; + joaomoreira = { + matrix = "@joaomoreira:matrix.org"; + github = "joaoymoreira"; + githubId = 151087767; + name = "João Moreira"; + keys = [ { fingerprint = "F457 0A3A 5F89 22F8 F572 E075 EF8B F2C8 C5F4 097D"; } ]; + }; joaquintrinanes = { email = "hi@joaquint.io"; github = "JoaquinTrinanes"; From 0d9c02cd8892359fa991459a9f3be26464fbb333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreira?= Date: Tue, 7 Jan 2025 18:14:14 -0300 Subject: [PATCH 2/2] kind-lang: init at 0.1.0.0-unstable-2024-12-09 Co-authored-by: maralorn Co-authored-by: Lukas Epple Co-authored-by: Lin Jian Co-authored-by: Emily Co-authored-by: Bryan Richter Co-authored-by: Niklas Korz Co-authored-by: Ilya K. Co-authored-by: Alexandre Esteves Co-authored-by: Arne Keller Co-authored-by: Gaetan Lepage REFERENCES - pkgs/by-name/ni/nixfmt-rfc-style - https://github.com/nixos/cabal2nix --- pkgs/by-name/ki/kind-lang/derivation.nix | 46 ++++++++++++++++++++++++ pkgs/by-name/ki/kind-lang/package.nix | 34 ++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 pkgs/by-name/ki/kind-lang/derivation.nix create mode 100644 pkgs/by-name/ki/kind-lang/package.nix diff --git a/pkgs/by-name/ki/kind-lang/derivation.nix b/pkgs/by-name/ki/kind-lang/derivation.nix new file mode 100644 index 000000000000..a2c55b89a043 --- /dev/null +++ b/pkgs/by-name/ki/kind-lang/derivation.nix @@ -0,0 +1,46 @@ +# CABAL2NIX AUTOGENERATED THIS FILE. +{ + mkDerivation, + ansi-terminal, + base, + containers, + directory, + fetchgit, + filepath, + hs-highlight, + lib, + mtl, + parsec, +}: +mkDerivation { + pname = "kind-lang"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/higherorderco/kind.git"; + sha256 = "1g4pikxh42p3hikzyfzf11cs7zd1miaxapyf8pijdcxhpdx7wwl0"; + rev = "5cfff210b3aeed01ebd73b2364cf9e5d2df658af"; + fetchSubmodules = false; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal + base + containers + directory + filepath + hs-highlight + mtl + parsec + ]; + executableHaskellDepends = [ + ansi-terminal + base + directory + filepath + hs-highlight + mtl + ]; + license = lib.licenses.mit; + mainProgram = "kind"; +} diff --git a/pkgs/by-name/ki/kind-lang/package.nix b/pkgs/by-name/ki/kind-lang/package.nix new file mode 100644 index 000000000000..613d310a5dfe --- /dev/null +++ b/pkgs/by-name/ki/kind-lang/package.nix @@ -0,0 +1,34 @@ +{ + haskell, + lib, +}: + +let + inherit (haskell.lib.compose) overrideCabal justStaticExecutables; + + # See kind-lang.cabal. GHC2024 >= ghc910. + ghcVersion = "ghc910"; + haskellPackages = haskell.packages.${ghcVersion}; + + overrides = rec { + version = "${raw-pkg.version}-unstable-2024-12-09"; + + postPatch = '' + sed -i -E \ + 's/([ ,]+[^ =]+)[ =^><]+[0-9.]+/\1/' \ + kind-lang.cabal + ''; + + # Test suite does nothing. + doCheck = false; + + maintainers = with lib.maintainers; [ joaomoreira ]; + }; + + # cabal2nix auto-generated derivation.nix. + raw-pkg = haskellPackages.callPackage ./derivation.nix { }; +in +lib.pipe raw-pkg [ + (overrideCabal overrides) + justStaticExecutables +]