cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #245459 from pacien/drop_ldgallery

Browse source 
ldgallery: drop package
This commit is contained in:
Dennis Gosnell 2023-07-26 11:05:06 +09:00 committed by GitHub
commit 1ccdb33cf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 1 additions and 9788 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -3061,7 +3061,6 @@ broken-packages:
- l-bfgs-b
- LC3
- lcs
- ldgallery-compiler
- ldif
- ld-intervals
- leaf

2
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -327,8 +327,6 @@ package-maintainers:
- tasty-expected-failure
- lhs2tex
- rec-def
pacien:
- ldgallery-compiler
peti:
- cabal2spec
- funcmp

2
pkgs/development/haskell-modules/non-hackage-packages.nix
View file

@ -9,8 +9,6 @@ self: super: {
dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { };
ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { };
# Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated
# from the latest master instead of the current version on Hackage.
cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { };

42
pkgs/tools/graphics/ldgallery/compiler/default.nix
View file

@ -1,42 +0,0 @@
# generated with cabal2nix by ./generate.sh
{ mkDerivation, aeson, base, cmdargs, containers, data-ordlist
, directory, fetchgit, filepath, Glob, hpack, lib, parallel-io
, process, safe, text, time, yaml
}:
mkDerivation {
pname = "ldgallery-compiler";
version = "2.1";
src = fetchgit {
url = "https://github.com/pacien/ldgallery.git";
sha256 = "184zysh5qwkbki8mn0br87h65yi5j39qwnmhz05z3ir9wfiniq4b";
rev = "11bbbae2850b9c45da697a8ed9626495a50a38c0";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/compiler; echo source root reset to $sourceRoot";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base cmdargs containers data-ordlist directory filepath Glob
parallel-io process safe text time yaml
];
libraryToolDepends = [ hpack ];
executableHaskellDepends = [
aeson base cmdargs containers data-ordlist directory filepath Glob
parallel-io process safe text time yaml
];
testHaskellDepends = [
aeson base cmdargs containers data-ordlist directory filepath Glob
parallel-io process safe text time yaml
];
prePatch = "hpack";
homepage = "https://ldgallery.pacien.org";
description = "A static generator which turns a collection of tagged pictures into a searchable web gallery";
license = lib.licenses.agpl3Only;
mainProgram = "ldgallery";
maintainers = [ lib.maintainers.pacien ];
# Does not compile with ghc-9.2
hydraPlatforms = lib.platforms.none;
broken = true;
}

19
pkgs/tools/graphics/ldgallery/compiler/generate.sh
View file

@ -1,19 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p cabal2nix
set -euo pipefail
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates the nix file for the ldgallery-compiler package."
echo "Usage: $0 <git release tag>"
exit 1
fi
echo "# generated with cabal2nix by ./generate.sh" > default.nix
cabal2nix \
--maintainer pacien \
--subpath compiler \
--revision $1 \
"https://github.com/pacien/ldgallery.git" \
>> default.nix

53
pkgs/tools/graphics/ldgallery/default.nix
View file

@ -1,53 +0,0 @@
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick, CoreServices }:
with lib;
with haskell.lib.compose;
let
ldgallery-viewer = pkgs.callPackage ./viewer { inherit CoreServices; };
inherit (haskellPackages) ldgallery-compiler;
in
# making sure that the versions of the compiler and viewer parts are in sync
assert ldgallery-compiler.version == versions.majorMinor ldgallery-viewer.version;
justStaticExecutables (overrideCabal (oldAttrs: {
pname = "ldgallery"; # bundled viewer + compiler
buildTools = (oldAttrs.buildTools or []) ++ [ makeWrapper pandoc ];
prePatch = ''
# add viewer dist to data
ln -s "${ldgallery-viewer}/share/ldgallery/viewer" "data/"
${oldAttrs.prePatch or ""}
'';
postInstall = ''
${oldAttrs.postInstall or ""}
# wrapper for runtime dependencies registration
wrapProgram "$out/bin/ldgallery" \
--prefix PATH : ${lib.makeBinPath [ imagemagick ]}
# bash completion
mkdir -p "$out/share/bash-completion/completions"
"$out/bin/ldgallery" \
--help=bash \
> "$out/share/bash-completion/completions/ldgallery"
# man pages
mkdir -p $out/share/man/man{1,7}
ln -s ${ldgallery-viewer}/share/man/man7/* "$out/share/man/man7/"
pandoc --standalone --to man \
"../ldgallery-quickstart.7.md" \
--output "$out/share/man/man7/ldgallery-quickstart.7"
pandoc --standalone --to man \
"ldgallery.1.md" \
--output "$out/share/man/man1/ldgallery.1"
'';
# other package metadata (maintainer, description, license, ...)
# are inherited from the compiler package
}) ldgallery-compiler)

49
pkgs/tools/graphics/ldgallery/viewer/default.nix
View file

@ -1,49 +0,0 @@
{ lib, stdenv, fetchFromGitHub, pkgs, pandoc, CoreServices }:
let
# Note for maintainers:
# * keep version in sync with the ldgallery compiler
# * regenerate node-*.nix with `./generate.sh <git release tag>`
sourcePkg = fetchFromGitHub {
owner = "pacien";
repo = "ldgallery";
rev = "v2.1";
sha256 = "sha256-i+Boo+Mpx/EL+LBajtOQJfpi4EF5AVtRnGtyXKD2n6A=";
};
nodePackages = import ./node-composition.nix {
inherit pkgs;
inherit (stdenv.hostPlatform) system;
};
nodePkg = nodePackages.package.override {
src = "${sourcePkg}/viewer";
postInstall = "npm run build";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
};
in
# making sure that the source and the node package are in sync
assert lib.versions.majorMinor nodePkg.version == lib.removePrefix "v" sourcePkg.rev;
stdenv.mkDerivation {
pname = nodePkg.packageName;
version = nodePkg.version;
src = nodePkg;
buildInputs = [ pandoc ];
installPhase = ''
mkdir -p "$out/share/ldgallery"
cp -rp "lib/node_modules/ldgallery-viewer/dist" \
"$out/share/ldgallery/viewer/"
cp -rp "${sourcePkg}/example" \
"$out/share/ldgallery/viewer/"
mkdir -p "$out/share/man/man7"
pandoc --standalone --to man \
"lib/node_modules/ldgallery-viewer/ldgallery-viewer.7.md" \
--output "$out/share/man/man7/ldgallery-viewer.7"
'';
}

29
pkgs/tools/graphics/ldgallery/viewer/generate.sh
View file

@ -1,29 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix wget
# TODO: merge with other node packages in nixpkgs/pkgs/development/node-packages once
# * support for npm projects in sub-directories is added to node2nix:
# https://github.com/svanderburg/node2nix/issues/177
# * we find a way to enable development dependencies for some of the packages
set -euo pipefail
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates the node composition and package nix files for the ldgallery-viewer package."
echo "Usage: $0 <git release tag>"
exit 1
fi
wget https://github.com/pacien/ldgallery/raw/$1/viewer/package.json
# Development dependencies are required for this Vue application to build
node2nix \
--node-env ../../../../development/node-packages/node-env.nix \
--development \
--input ./package.json \
--output node-packages.nix \
--composition node-composition.nix \
--nodejs-14 \
--no-copy-node-env
rm package.json

17
pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
View file

@ -1,17 +0,0 @@
# This file has been generated by node2nix 1.11.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

9570
pkgs/tools/graphics/ldgallery/viewer/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

1
pkgs/top-level/aliases.nix
View file

@ -850,6 +850,7 @@ mapAliases ({
larynx = piper-tts; # Added 2023-05-09
lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01
latinmodern-math = lmmath;
ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26
letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22
lfs = dysk; # Added 2023-07-03
libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22

4
pkgs/top-level/all-packages.nix
View file

@ -9574,10 +9574,6 @@ with pkgs;
coq = coq_8_14;
};
ldgallery = callPackage ../tools/graphics/ldgallery {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
lego = callPackage ../tools/admin/lego { };
leocad = libsForQt5.callPackage ../applications/graphics/leocad { };