Merge pull request #316959 from NixOS/backport-312442-to-release-24.05

[Backport release-24.05] changelog-d: 0.1-git-2816ddb -> 1.0
This commit is contained in:
Robert Hensing 2024-06-03 18:37:20 +02:00 committed by GitHub
commit 88269ab304
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 28 deletions

View File

@ -13,17 +13,11 @@ let
haskellModifications =
lib.flip lib.pipe [
addCompletions
haskell.lib.doJailbreak
haskell.lib.justStaticExecutables
];
mkDerivationOverrides = finalAttrs: oldAttrs: {
version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}";
# nix-shell ./maintainers/scripts/update.nix --argstr package changelog-d
passthru.updateScript = lib.getExe (callPackage ./updateScript.nix { });
# nix-build -A changelog-d.tests
passthru.tests = {
basic = callPackage ./tests/basic.nix { changelog-d = finalAttrs.finalPackage; };

View File

@ -1,12 +0,0 @@
{ writeShellApplication, cabal2nix }:
writeShellApplication {
name = "update-changelog-d";
runtimeInputs = [
cabal2nix
];
text = ''
cd pkgs/development/misc/haskell/changelog-d
cabal2nix https://codeberg.org/fgaz/changelog-d >default.nix
'';
}

View File

@ -1,23 +1,24 @@
{ mkDerivation, base, bytestring, cabal-install-parsers
, Cabal-syntax, containers, directory, fetchgit, filepath
, Cabal-syntax, containers, directory, fetchFromGitea, filepath
, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty
, regex-applicative
, regex-applicative, frontmatter
}:
mkDerivation {
mkDerivation rec {
pname = "changelog-d";
version = "0.1";
src = fetchgit {
url = "https://codeberg.org/fgaz/changelog-d";
sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7";
rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314";
fetchSubmodules = true;
version = "1.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "fgaz";
repo = "changelog-d";
rev = "v${version}";
hash = "sha256-cXczIJb5z+Obq13F90oWcgSN1JAVqRWWw4jp2HT5G5Y=";
};
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
base bytestring cabal-install-parsers Cabal-syntax containers
directory filepath generic-lens-lite mtl parsec pretty
regex-applicative
regex-applicative frontmatter
];
executableHaskellDepends = [
base bytestring Cabal-syntax directory filepath