mirror of
https://github.com/NixOS/nix.git
synced 2024-11-21 22:32:26 +00:00
Use Nixpkgs changelog-d
This commit is contained in:
parent
5ddc11d0eb
commit
d494ac15e2
@ -159,8 +159,6 @@
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
changelog-d-nix = final.buildPackages.callPackage ./misc/changelog-d.nix { };
|
|
||||||
|
|
||||||
nix =
|
nix =
|
||||||
let
|
let
|
||||||
officialRelease = false;
|
officialRelease = false;
|
||||||
@ -224,7 +222,7 @@
|
|||||||
rl-next =
|
rl-next =
|
||||||
let pkgs = nixpkgsFor.${system}.native;
|
let pkgs = nixpkgsFor.${system}.native;
|
||||||
in pkgs.buildPackages.runCommand "test-rl-next-release-notes" { } ''
|
in pkgs.buildPackages.runCommand "test-rl-next-release-notes" { } ''
|
||||||
LANG=C.UTF-8 ${pkgs.changelog-d-nix}/bin/changelog-d ${./doc/manual/rl-next} >$out
|
LANG=C.UTF-8 ${pkgs.changelog-d}/bin/changelog-d ${./doc/manual/rl-next} >$out
|
||||||
'';
|
'';
|
||||||
repl-completion = nixpkgsFor.${system}.native.callPackage ./tests/repl-completion.nix { };
|
repl-completion = nixpkgsFor.${system}.native.callPackage ./tests/repl-completion.nix { };
|
||||||
} // (lib.optionalAttrs (builtins.elem system linux64BitSystems)) {
|
} // (lib.optionalAttrs (builtins.elem system linux64BitSystems)) {
|
||||||
@ -238,7 +236,7 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
packages = forAllSystems (system: rec {
|
packages = forAllSystems (system: rec {
|
||||||
inherit (nixpkgsFor.${system}.native) nix changelog-d-nix;
|
inherit (nixpkgsFor.${system}.native) nix changelog-d;
|
||||||
default = nix;
|
default = nix;
|
||||||
} // (lib.optionalAttrs (builtins.elem system linux64BitSystems) {
|
} // (lib.optionalAttrs (builtins.elem system linux64BitSystems) {
|
||||||
nix-static = nixpkgsFor.${system}.static.nix;
|
nix-static = nixpkgsFor.${system}.static.nix;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env nix
|
#!/usr/bin/env nix
|
||||||
#!nix shell .#changelog-d-nix --command bash
|
#!nix shell .#changelog-d --command bash
|
||||||
|
|
||||||
# --- CONFIGURATION ---
|
# --- CONFIGURATION ---
|
||||||
|
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
{ mkDerivation, aeson, base, bytestring, cabal-install-parsers
|
|
||||||
, Cabal-syntax, containers, directory, filepath, frontmatter
|
|
||||||
, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty
|
|
||||||
, regex-applicative, text, pkgs
|
|
||||||
}:
|
|
||||||
let rev = "f30f6969e9cd8b56242309639d58acea21c99d06";
|
|
||||||
in
|
|
||||||
mkDerivation {
|
|
||||||
pname = "changelog-d";
|
|
||||||
version = "0.1";
|
|
||||||
src = pkgs.fetchurl {
|
|
||||||
name = "changelog-d-${rev}.tar.gz";
|
|
||||||
url = "https://codeberg.org/roberth/changelog-d/archive/${rev}.tar.gz";
|
|
||||||
hash = "sha256-8a2+i5u7YoszAgd5OIEW0eYUcP8yfhtoOIhLJkylYJ4=";
|
|
||||||
} // { inherit rev; };
|
|
||||||
isLibrary = false;
|
|
||||||
isExecutable = true;
|
|
||||||
libraryHaskellDepends = [
|
|
||||||
aeson base bytestring cabal-install-parsers Cabal-syntax containers
|
|
||||||
directory filepath frontmatter generic-lens-lite mtl parsec pretty
|
|
||||||
regex-applicative text
|
|
||||||
];
|
|
||||||
executableHaskellDepends = [
|
|
||||||
base bytestring Cabal-syntax directory filepath
|
|
||||||
optparse-applicative
|
|
||||||
];
|
|
||||||
doHaddock = false;
|
|
||||||
description = "Concatenate changelog entries into a single one";
|
|
||||||
license = lib.licenses.gpl3Plus;
|
|
||||||
mainProgram = "changelog-d";
|
|
||||||
}
|
|
@ -1,31 +0,0 @@
|
|||||||
# Taken temporarily from <nixpkgs/pkgs/by-name/ch/changelog-d/package.nix>
|
|
||||||
{
|
|
||||||
callPackage,
|
|
||||||
lib,
|
|
||||||
haskell,
|
|
||||||
haskellPackages,
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
hsPkg = haskellPackages.callPackage ./changelog-d.cabal.nix { };
|
|
||||||
|
|
||||||
addCompletions = haskellPackages.generateOptparseApplicativeCompletions ["changelog-d"];
|
|
||||||
|
|
||||||
haskellModifications =
|
|
||||||
lib.flip lib.pipe [
|
|
||||||
addCompletions
|
|
||||||
haskell.lib.justStaticExecutables
|
|
||||||
];
|
|
||||||
|
|
||||||
mkDerivationOverrides = finalAttrs: oldAttrs: {
|
|
||||||
|
|
||||||
version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}";
|
|
||||||
|
|
||||||
meta = oldAttrs.meta // {
|
|
||||||
homepage = "https://codeberg.org/roberth/changelog-d";
|
|
||||||
maintainers = [ lib.maintainers.roberth ];
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
in
|
|
||||||
(haskellModifications hsPkg).overrideAttrs mkDerivationOverrides
|
|
Loading…
Reference in New Issue
Block a user