Skip to content

changelog-d: 0.1-git-2816ddb -> 1.0 #312442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roberth merged 1 commit into from
Jun 3, 2024
Merged

changelog-d: 0.1-git-2816ddb -> 1.0 #312442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions pkgs/by-name/ch/changelog-d/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { });
Copy link
Member Author

@fgaz fgaz May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using a stable version breaks ./updateScript.nix. On the other hand, nix-update should now work. It won't update the list of dependencies, but those shouldn't change much.

Since the haskellPackages part of this packages will no longer be overwritten it might make sense to merge the two files. Should I do that?

Copy link
Member

@roberth roberth May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the separation between generated code and overrides is helpful, but I can see other options, including

  • you taking over the Nixpkgs maintainership of this package
  • publishing releases to hackage


# nix-build -A changelog-d.tests
passthru.tests = {
basic = callPackage ./tests/basic.nix { changelog-d = finalAttrs.finalPackage; };
Expand Down
12 changes: 0 additions & 12 deletions pkgs/by-name/ch/changelog-d/updateScript.nix
View file
Open in desktop

This file was deleted.

21 changes: 11 additions & 10 deletions pkgs/development/misc/haskell/changelog-d/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down