From 31a42541af1866336297216b421d7abbc3566018 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 17 May 2024 15:45:44 +0200 Subject: [PATCH] changelog-d: 0.1-git-2816ddb -> 1.0 --- pkgs/by-name/ch/changelog-d/package.nix | 6 ------ pkgs/by-name/ch/changelog-d/updateScript.nix | 12 ----------- .../misc/haskell/changelog-d/default.nix | 21 ++++++++++--------- 3 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 pkgs/by-name/ch/changelog-d/updateScript.nix diff --git a/pkgs/by-name/ch/changelog-d/package.nix b/pkgs/by-name/ch/changelog-d/package.nix index 380f4a801afa..a5bff1bfe1de 100644 --- a/pkgs/by-name/ch/changelog-d/package.nix +++ b/pkgs/by-name/ch/changelog-d/package.nix @@ -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; }; diff --git a/pkgs/by-name/ch/changelog-d/updateScript.nix b/pkgs/by-name/ch/changelog-d/updateScript.nix deleted file mode 100644 index fae22a161b6d..000000000000 --- a/pkgs/by-name/ch/changelog-d/updateScript.nix +++ /dev/null @@ -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 - ''; -} diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix index 7abc707540ce..8f44ed950067 100644 --- a/pkgs/development/misc/haskell/changelog-d/default.nix +++ b/pkgs/development/misc/haskell/changelog-d/default.nix @@ -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