commit 3c202d0e2664f7ec1333202f79a275f3452ad5ec · pyrox.dev/nixpkgs

+51 -43

pkgs/misc/lilypond/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         stdenv,

     

       3
       3
        
         lib,

     

       4
       4
       -
         fetchurl,

     

       4
       4
       +
         fetchzip,

     

       5
       5
        
         ghostscript,

     

       6
       6
       -
         gyre-fonts,

     

       7
       6
        
         texinfo,

     

       8
       7
        
         imagemagick,

     

       9
       8
        
         texi2html,

     

       9
       9
       +
         extractpdfmark,

     

       10
       10
        
         guile,

     

       11
       11
        
         python3,

     

       12
       12
        
         gettext,

     

       13
       13
       +
         glib,

     

       14
       14
       +
         gmp,

     

       13
       15
        
         flex,

     

       14
       16
        
         perl,

     

       15
       17
        
         bison,

     
···

       21
       23
        
         pango,

     

       22
       24
        
         fontforge,

     

       23
       25
        
         help2man,

     

       24
       24
       -
         zip,

     

       25
       25
       -
         netpbm,

     

       26
       26
       -
         groff,

     

       27
       26
        
         freefont_ttf,

     

       28
       27
        
         makeFontsConf,

     

       29
       28
        
         makeWrapper,

     
···

       34
       33
        
         texliveSmall,

     

       35
       34
        
         tex ? texliveSmall.withPackages (

     

       36
       35
        
           ps: with ps; [

     

       37
       37
       -
             lh

     

       38
       38
       -
             metafont

     

       39
       36
        
             epsf

     

       40
       37
        
             fontinst

     

       38
       38
       +
             fontware

     

       39
       39
       +
             lh

     

       40
       40
       +
             metafont

     

       41
       41
        
           ]

     

       42
       42
        
         ),

     

       43
       43
        
       }:

     
···

       46
       46
        
         pname = "lilypond";

     

       47
       47
        
         version = "2.24.4";

     

       48
       48
        
       

     

       49
       49
       -
         src = fetchurl {

     

       49
       49
       +
         src = fetchzip {

     

       50
       50
        
           url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";

     

       51
       51
       -
           sha256 = "sha256-6W+gNXHHnyDhl5ZTr6vb5O5Cdlo9n9FJU/DNnupReBw=";

     

       51
       51
       +
           hash = "sha256-UYdORvodrVchxslOxpMiXrAh7DtB9sWp9yqZU/jeB9Y=";

     

       52
       52
        
         };

     

       53
       53
        
       

     

       54
       54
        
         postInstall = ''

     
···

       68
       68
        
           done

     

       69
       69
        
         '';

     

       70
       70
        
       

     

       71
       71
       -
         configureFlags = [

     

       72
       72
       -
           "--disable-documentation"

     

       73
       73
       -
           # FIXME: these URW fonts are not OTF, configure reports "URW++ OTF files... no".

     

       74
       74
       -
           "--with-urwotf-dir=${ghostscript.fonts}/share/fonts"

     

       75
       75
       -
           "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"

     

       76
       76
       -
         ];

     

       77
       77
       -
       

     

       78
       71
        
         preConfigure = ''

     

       79
       79
       -
           sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl

     

       80
       80
       -
           export HOME=$TMPDIR/home

     

       72
       72
       +
           substituteInPlace scripts/build/mf2pt1.pl \

     

       73
       73
       +
             --replace-fail "mem=mf2pt1" "mem=$PWD/mf/mf2pt1"

     

       81
       74
        
         '';

     

       82
       75
        
       

     

       76
       76
       +
         strictDeps = true;

     

       77
       77
       +
       

     

       78
       78
       +
         depsBuildBuild = [

     

       79
       79
       +
           pkg-config

     

       80
       80
       +
         ];

     

       81
       81
       +
       

     

       83
       82
        
         nativeBuildInputs = [

     

       84
       83
        
           autoreconfHook

     

       85
       84
        
           bison

     

       86
       86
       -
           flex

     

       85
       85
       +
           dblatex

     

       86
       86
       +
           extractpdfmark

     

       87
       87
       +
           flex # for flex binary

     

       88
       88
       +
           fontconfig

     

       89
       89
       +
           fontforge

     

       90
       90
       +
           gettext

     

       91
       91
       +
           ghostscript

     

       92
       92
       +
           guile

     

       93
       93
       +
           help2man

     

       94
       94
       +
           imagemagick

     

       87
       95
        
           makeWrapper

     

       96
       96
       +
           perl

     

       88
       97
        
           pkg-config

     

       98
       98
       +
           python3

     

       99
       99
       +
           rsync

     

       100
       100
       +
           t1utils

     

       101
       101
       +
           tex

     

       102
       102
       +
           texi2html

     

       103
       103
       +
           texinfo

     

       89
       104
        
         ];

     

       90
       105
        
       

     

       91
       106
        
         buildInputs = [

     

       92
       92
       -
           ghostscript

     

       93
       93
       -
           texinfo

     

       94
       94
       -
           imagemagick

     

       95
       95
       -
           texi2html

     

       96
       96
       -
           guile

     

       97
       97
       -
           dblatex

     

       98
       98
       -
           tex

     

       99
       99
       -
           zip

     

       100
       100
       -
           netpbm

     

       101
       101
       -
           python3

     

       102
       102
       -
           gettext

     

       103
       103
       -
           perl

     

       104
       104
       -
           fontconfig

     

       107
       107
       +
           boehmgc

     

       108
       108
       +
           flex # FlexLexer.h

     

       105
       109
        
           freetype

     

       110
       110
       +
           glib

     

       111
       111
       +
           gmp

     

       106
       112
        
           pango

     

       107
       107
       -
           fontforge

     

       108
       108
       -
           help2man

     

       109
       109
       -
           groff

     

       110
       110
       -
           t1utils

     

       111
       111
       -
           boehmgc

     

       112
       112
       -
           rsync

     

       113
       113
        
         ];

     

       114
       114
        
       

     

       115
       115
        
         autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh";

     
···

       121
       121
        
           supportedFeatures = [ "commit" ];

     

       122
       122
        
         };

     

       123
       123
        
       

     

       124
       124
       -
         meta = with lib; {

     

       124
       124
       +
         # documentation makefile uses "out" for different purposes, hence we explicitly set it to an empty string

     

       125
       125
       +
         makeFlags = [ "out=" ];

     

       126
       126
       +
       

     

       127
       127
       +
         meta = {

     

       125
       128
        
           description = "Music typesetting system";

     

       126
       126
       -
           homepage = "http://lilypond.org/";

     

       127
       127
       -
           license = licenses.gpl3;

     

       128
       128
       -
           maintainers = with maintainers; [

     

       129
       129
       +
           homepage = "https://lilypond.org/";

     

       130
       130
       +
           license = with lib.licenses; [

     

       131
       131
       +
             gpl3Plus # most code

     

       132
       132
       +
             gpl3Only # ly/articulate.ly

     

       133
       133
       +
             fdl13Plus # docs

     

       134
       134
       +
             ofl # mf/

     

       135
       135
       +
           ];

     

       136
       136
       +
           maintainers = with lib.maintainers; [

     

       129
       137
        
             marcweber

     

       130
       138
        
             yurrriq

     

       131
       139
        
           ];

     

       132
       132
       -
           platforms = platforms.all;

     

       140
       140
       +
           platforms = lib.platforms.all;

     

       133
       141
        
         };

     

       134
       142
        
       

     

       135
       143
        
         FONTCONFIG_FILE = lib.optional stdenv.hostPlatform.isDarwin (makeFontsConf {

+4 -4

pkgs/misc/lilypond/unstable.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         fetchurl,

     

       3
       3
       +
         fetchzip,

     

       4
       4
        
         lilypond,

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       lilypond.overrideAttrs (oldAttrs: rec {

     

       8
       8
       -
         version = "2.25.24";

     

       9
       9
       -
         src = fetchurl {

     

       8
       8
       +
         version = "2.25.25";

     

       9
       9
       +
         src = fetchzip {

     

       10
       10
        
           url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";

     

       11
       11
       -
           hash = "sha256-1n6mJBbZcfQYsmrjWxcG/EtIyF9uHNRVT7fX3+zoXc4=";

     

       11
       11
       +
           hash = "sha256-OO3yXA2PgOuUUR4Bo5wP4PieBvIxV1N9hPiapOB6cAE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         passthru.updateScript = {

+1 -1

pkgs/misc/lilypond/update.sh

···

       21
       21
        
       

     

       22
       22
        
       # update hash

     

       23
       23
        
       PREV=$(nix eval --raw -f default.nix $ATTR.src.outputHash)

     

       24
       24
       -
       NEXT=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 $(nix eval --raw -f default.nix $ATTR.src.url)))

     

       24
       24
       +
       NEXT=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 --unpack $(nix eval --raw -f default.nix $ATTR.src.url)))

     

       25
       25
        
       sed -i "s|$PREV|$NEXT|" "$FILE"