Compare commits
24 Commits
master
...
9be165d6ee
| Author | SHA1 | Date | |
|---|---|---|---|
|
9be165d6ee
|
|||
|
1c55e7c772
|
|||
|
a981d185cf
|
|||
|
d91951ca97
|
|||
|
09a2ffc3bc
|
|||
|
a6444658da
|
|||
|
ed5615033c
|
|||
|
d1319a497c
|
|||
|
cf7c34555c
|
|||
|
d96eecded0
|
|||
|
6863bcafd1
|
|||
|
39f023d0e5
|
|||
|
a8a2f692e7
|
|||
|
19f24c7206
|
|||
|
320432774a
|
|||
|
0721b0fe6d
|
|||
|
418e4a874d
|
|||
|
8378e7a2c9
|
|||
|
6210c9f272
|
|||
|
c2038fa925
|
|||
|
d797cca1f2
|
|||
|
2a51b433c8
|
|||
|
e5ce36532b
|
|||
|
4c647388b0
|
+15
-1
@@ -207,6 +207,17 @@ func parse(
|
|||||||
c.SchedPriority = ext.Int(v)
|
c.SchedPriority = ext.Int(v)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
case "insecure":
|
||||||
|
switch value {
|
||||||
|
case "pipewire":
|
||||||
|
*c.Enablements |= hst.EPipeWire
|
||||||
|
c.DirectPipeWire = true
|
||||||
|
continue
|
||||||
|
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("invalid insecure flag %q", value)
|
||||||
|
}
|
||||||
|
|
||||||
case "env":
|
case "env":
|
||||||
if key, value, ok = strings.Cut(value, "="); !ok {
|
if key, value, ok = strings.Cut(value, "="); !ok {
|
||||||
return nil, fmt.Errorf("invalid environment %q", key)
|
return nil, fmt.Errorf("invalid environment %q", key)
|
||||||
@@ -309,7 +320,10 @@ func parse(
|
|||||||
c.SystemBus = nil
|
c.SystemBus = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.Container.Flags&hst.FShareTmpdir == 0 {
|
if c.Container.Flags&hst.FShareTmpdir == 0 &&
|
||||||
|
(c.Enablements.Unwrap()&hst.EX11 == 0 ||
|
||||||
|
c.Container.Flags&(hst.FHostNet|hst.FHostAbstract) ==
|
||||||
|
hst.FHostNet|hst.FHostAbstract) {
|
||||||
c.Container.Filesystem = append(c.Container.Filesystem,
|
c.Container.Filesystem = append(c.Container.Filesystem,
|
||||||
hst.FilesystemConfigJSON{FilesystemConfig: &hst.FSEphemeral{
|
hst.FilesystemConfigJSON{FilesystemConfig: &hst.FSEphemeral{
|
||||||
Target: fhs.AbsTmp,
|
Target: fhs.AbsTmp,
|
||||||
|
|||||||
+7
-2
@@ -35,6 +35,7 @@ func main() {
|
|||||||
var (
|
var (
|
||||||
flagVerbose bool
|
flagVerbose bool
|
||||||
flagBase string
|
flagBase string
|
||||||
|
flagInsecure bool
|
||||||
|
|
||||||
base, template, initial *check.Absolute
|
base, template, initial *check.Absolute
|
||||||
)
|
)
|
||||||
@@ -61,6 +62,10 @@ func main() {
|
|||||||
&flagBase,
|
&flagBase,
|
||||||
"d", command.StringFlag("$ROSA_APP_PATH"),
|
"d", command.StringFlag("$ROSA_APP_PATH"),
|
||||||
"Configuration and state directory",
|
"Configuration and state directory",
|
||||||
|
).Flag(
|
||||||
|
&flagInsecure,
|
||||||
|
"insecure", command.BoolFlag(false),
|
||||||
|
"Allow use of insecure compatibility options",
|
||||||
)
|
)
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -132,7 +137,7 @@ func main() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
err = run(ctx, msg, &config)
|
err = run(ctx, msg, false, &config)
|
||||||
return errors.Join(err, remove())
|
return errors.Join(err, remove())
|
||||||
},
|
},
|
||||||
).Flag(
|
).Flag(
|
||||||
@@ -206,7 +211,7 @@ func main() {
|
|||||||
if err = enterTemplate(base, name); err != nil {
|
if err = enterTemplate(base, name); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return run(ctx, msg, config, args[1:]...)
|
return run(ctx, msg, flagInsecure, config, args[1:]...)
|
||||||
},
|
},
|
||||||
).
|
).
|
||||||
Flag(
|
Flag(
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import (
|
|||||||
func run(
|
func run(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
msg message.Msg,
|
msg message.Msg,
|
||||||
|
insecure bool,
|
||||||
config *hst.Config,
|
config *hst.Config,
|
||||||
args ...string,
|
args ...string,
|
||||||
) error {
|
) error {
|
||||||
@@ -29,6 +30,9 @@ func run(
|
|||||||
if msg.IsVerbose() {
|
if msg.IsVerbose() {
|
||||||
cmd.Args = append(cmd.Args, "-v")
|
cmd.Args = append(cmd.Args, "-v")
|
||||||
}
|
}
|
||||||
|
if insecure {
|
||||||
|
cmd.Args = append(cmd.Args, "--insecure")
|
||||||
|
}
|
||||||
cmd.Args = append(cmd.Args, "run", "3")
|
cmd.Args = append(cmd.Args, "run", "3")
|
||||||
cmd.Args = append(cmd.Args, args...)
|
cmd.Args = append(cmd.Args, args...)
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ package main
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
|
"io"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
@@ -51,13 +52,14 @@ func init() {
|
|||||||
func fatal(v ...any) {
|
func fatal(v ...any) {
|
||||||
log.Println(v...)
|
log.Println(v...)
|
||||||
log.Println("unable to continue, please reboot and resolve the problem manually")
|
log.Println("unable to continue, please reboot and resolve the problem manually")
|
||||||
|
log.SetOutput(io.Discard)
|
||||||
select {}
|
select {}
|
||||||
}
|
}
|
||||||
|
|
||||||
// must calls fatal with err if it is non-nil.
|
// must calls fatal with err if it is non-nil.
|
||||||
func must(err error) {
|
func must(err error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println(err)
|
fatal(err)
|
||||||
select {}
|
select {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,8 +26,9 @@ var _ report.RepresentableError = ModprobeError{}
|
|||||||
func (ModprobeError) Representable() {}
|
func (ModprobeError) Representable() {}
|
||||||
func (e ModprobeError) Error() string {
|
func (e ModprobeError) Error() string {
|
||||||
return fmt.Sprintf(
|
return fmt.Sprintf(
|
||||||
"modprobe exit status %d: %s",
|
"%s (exit status %d)",
|
||||||
e.ExitCode, strings.TrimSpace(e.Stderr),
|
strings.TrimPrefix(strings.TrimSpace(e.Stderr), "modprobe: "),
|
||||||
|
e.ExitCode,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
|
|
||||||
Date: Sat, 30 Mar 2024 10:17:10 +0100
|
|
||||||
Subject: tools/attr.c: Add missing libgen.h include for basename(3)
|
|
||||||
|
|
||||||
Fixes compilation issue with musl and modern C99 compilers.
|
|
||||||
|
|
||||||
See: https://bugs.gentoo.org/926294
|
|
||||||
---
|
|
||||||
tools/attr.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/tools/attr.c b/tools/attr.c
|
|
||||||
index f12e4af..6a3c1e9 100644
|
|
||||||
--- a/tools/attr.c
|
|
||||||
+++ b/tools/attr.c
|
|
||||||
@@ -28,6 +28,7 @@
|
|
||||||
#include <errno.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <locale.h>
|
|
||||||
+#include <libgen.h>
|
|
||||||
|
|
||||||
#include <attr/attributes.h>
|
|
||||||
|
|
||||||
--
|
|
||||||
cgit v1.1
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
diff --git a/test/attr.test b/test/attr.test
|
diff --git a/test/attr.run b/test/attr.run
|
||||||
index 6ce2f9b..e9bde92 100644
|
index 27d17f6..a4d60c0 100644
|
||||||
--- a/test/attr.test
|
--- a/test/attr.run
|
||||||
+++ b/test/attr.test
|
+++ b/test/attr.run
|
||||||
@@ -11,7 +11,7 @@ Try various valid and invalid names
|
@@ -11,7 +11,7 @@ Try various valid and invalid names
|
||||||
|
|
||||||
$ touch f
|
$ touch f
|
||||||
|
|||||||
@@ -3,17 +3,15 @@ package attr {
|
|||||||
website = "https://savannah.nongnu.org/projects/attr";
|
website = "https://savannah.nongnu.org/projects/attr";
|
||||||
anitya = 137;
|
anitya = 137;
|
||||||
|
|
||||||
version# = "2.5.2";
|
version# = "2.6.0";
|
||||||
source = remoteTar {
|
source = remoteTar {
|
||||||
url = "https://download.savannah.nongnu.org/releases/attr/"+
|
url = "https://download.savannah.nongnu.org/releases/attr/"+
|
||||||
"attr-"+version+".tar.gz";
|
"attr-"+version+".tar.gz";
|
||||||
checksum = "YWEphrz6vg1sUMmHHVr1CRo53pFXRhq_pjN-AlG8UgwZK1y6m7zuDhxqJhD0SV0l";
|
checksum = "pp-NvD1cMIwZycNwZGW2ez-PbTEpHxrRnVH27csj9QdN4oEBkEbJOZX1IIvKnTWS";
|
||||||
compress = gzip;
|
compress = gzip;
|
||||||
};
|
};
|
||||||
patches = [
|
|
||||||
"libgen-basename.patch",
|
patches = [ "musl-errno.patch" ];
|
||||||
"musl-errno.patch",
|
|
||||||
];
|
|
||||||
|
|
||||||
early = `
|
early = `
|
||||||
ln -s ../../system/bin/perl /usr/bin
|
ln -s ../../system/bin/perl /usr/bin
|
||||||
@@ -21,7 +19,11 @@ ln -s ../../system/bin/perl /usr/bin
|
|||||||
|
|
||||||
exec = make {};
|
exec = make {};
|
||||||
|
|
||||||
inputs = [ perl ];
|
inputs = [
|
||||||
|
perl,
|
||||||
|
|
||||||
|
kernel-headers,
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
package acl {
|
package acl {
|
||||||
@@ -29,11 +31,11 @@ package acl {
|
|||||||
website = "https://savannah.nongnu.org/projects/acl";
|
website = "https://savannah.nongnu.org/projects/acl";
|
||||||
anitya = 16;
|
anitya = 16;
|
||||||
|
|
||||||
version# = "2.3.2";
|
version# = "2.4.0";
|
||||||
source = remoteTar {
|
source = remoteTar {
|
||||||
url = "https://download.savannah.nongnu.org/releases/acl/"+
|
url = "https://download.savannah.nongnu.org/releases/acl/"+
|
||||||
"acl-"+version+".tar.gz";
|
"acl-"+version+".tar.gz";
|
||||||
checksum = "-fY5nwH4K8ZHBCRXrzLdguPkqjKI6WIiGu4dBtrZ1o0t6AIU73w8wwJz_UyjIS0P";
|
checksum = "U2eaAsWrhhzEfhyprwHQQG55bFPZxtsHk1Usnd9Jb_g-H__pJod4H3RTrL4ipXDw";
|
||||||
compress = gzip;
|
compress = gzip;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -42,6 +44,6 @@ package acl {
|
|||||||
skipCheck = true;
|
skipCheck = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
inputs = [ attr ];
|
inputs = [ attr, kernel-headers ];
|
||||||
runtime = [ attr ];
|
runtime = [ attr ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ package curl {
|
|||||||
website = "https://curl.se";
|
website = "https://curl.se";
|
||||||
anitya = 381;
|
anitya = 381;
|
||||||
|
|
||||||
version# = "8.20.0";
|
version# = "8.21.0";
|
||||||
source = remoteTar {
|
source = remoteTar {
|
||||||
url = "https://curl.se/download/curl-"+version+".tar.bz2";
|
url = "https://curl.se/download/curl-"+version+".tar.bz2";
|
||||||
checksum = "xyHXwrngIRGMasuzhn-I5MSCOhktwINbsWt1f_LuR-5jRVvyx_g6U1EQfDLEbr9r";
|
checksum = "lJSm8bVjS0OmsarEdbvejdQdvXsb7yGarlr6oMtA9FW1EXOga8zZxa1LPtfaq_qX";
|
||||||
compress = bzip2;
|
compress = bzip2;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ package git {
|
|||||||
website = "https://www.git-scm.com";
|
website = "https://www.git-scm.com";
|
||||||
anitya = 5350;
|
anitya = 5350;
|
||||||
|
|
||||||
version# = "2.54.0";
|
version# = "2.55.0";
|
||||||
source = remoteTar {
|
source = remoteTar {
|
||||||
url = "https://www.kernel.org/pub/software/scm/git/"+
|
url = "https://www.kernel.org/pub/software/scm/git/"+
|
||||||
"git-"+version+".tar.gz";
|
"git-"+version+".tar.gz";
|
||||||
checksum = "7vGKtFOJGqY8DO4e8UMRax7dLgImXKQz5MMalec6MlgYrsarffSJjgOughwRFpSH";
|
checksum = "lOer6jb8vZQk6Nd1rLZIgsYys8whLvjJq8XbmCdTATcPFAYuQcK1Rgj1Jj6a00W8";
|
||||||
compress = gzip;
|
compress = gzip;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -20,6 +20,7 @@ rm -f /system/bin/httpd
|
|||||||
|
|
||||||
// uses source tree as scratch space
|
// uses source tree as scratch space
|
||||||
enterSource = true;
|
enterSource = true;
|
||||||
|
env = [ "NO_RUST=YesPlease" ];
|
||||||
|
|
||||||
exec = make {
|
exec = make {
|
||||||
inPlace = true;
|
inPlace = true;
|
||||||
@@ -85,6 +86,7 @@ disable_test t5515-fetch-merge-logic
|
|||||||
zlib,
|
zlib,
|
||||||
curl,
|
curl,
|
||||||
libexpat,
|
libexpat,
|
||||||
|
kernel-headers,
|
||||||
];
|
];
|
||||||
|
|
||||||
runtime = [
|
runtime = [
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ package glib {
|
|||||||
website = "https://developer.gnome.org/glib";
|
website = "https://developer.gnome.org/glib";
|
||||||
anitya = 10024;
|
anitya = 10024;
|
||||||
|
|
||||||
version# = "2.89.0";
|
version# = "2.89.1";
|
||||||
source = remoteGit {
|
source = remoteGit {
|
||||||
url = "https://gitlab.gnome.org/GNOME/glib.git";
|
url = "https://gitlab.gnome.org/GNOME/glib.git";
|
||||||
tag = version;
|
tag = version;
|
||||||
checksum = "4FXKhdS3pC98LevYa_h7piRylG86cZ_c9zAtGr78oHodU1ob8rBxGU0hoIZ4nzcA";
|
checksum = "9_6Eew2KIwa1AHopjU7CqC13_nur5FPJMu-iGUd7sD_1gAM1pa_HVUuAtqExJoYU";
|
||||||
};
|
};
|
||||||
|
|
||||||
files = {
|
files = {
|
||||||
|
|||||||
@@ -504,10 +504,10 @@ package parallel {
|
|||||||
website = "https://www.gnu.org/software/parallel";
|
website = "https://www.gnu.org/software/parallel";
|
||||||
anitya = 5448;
|
anitya = 5448;
|
||||||
|
|
||||||
version# = "20260522";
|
version# = "20260622";
|
||||||
source = remoteTar {
|
source = remoteTar {
|
||||||
url = "https://ftpmirror.gnu.org/gnu/parallel/parallel-"+version+".tar.bz2";
|
url = "https://ftpmirror.gnu.org/gnu/parallel/parallel-"+version+".tar.bz2";
|
||||||
checksum = "ezg3NZMlY-q-478YXmjWmDrDlaL55T7aBCuv3B7Z3DkAlfZRQEKO8eumqbcxTIy6";
|
checksum = "pEkZ_J18AvKCMoPfxEprC0Smw7zP6qXASmC1uFf_HVD_jc95H06LvzGi40-mtCUo";
|
||||||
compress = bzip2;
|
compress = bzip2;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -2,11 +2,11 @@ package hakurei-source {
|
|||||||
description = "hakurei source tree";
|
description = "hakurei source tree";
|
||||||
exclude = true;
|
exclude = true;
|
||||||
|
|
||||||
version# = "0.4.4";
|
version# = "0.4.5";
|
||||||
output = remoteTar {
|
output = remoteTar {
|
||||||
url = "https://git.gensokyo.uk/rosa/hakurei/archive/"+
|
url = "https://git.gensokyo.uk/rosa/hakurei/archive/"+
|
||||||
"v"+version+".tar.gz";
|
"v"+version+".tar.gz";
|
||||||
checksum = "BCIKpRiVv2tDg8lyX1bG_VgTBBMFCByv726x6DfJ0LiRg5ma4T5fcxYUaQl8JMVB";
|
checksum = "5bvbuIRcDIrtijogwqXn3y8h5f3rVS4ZSVhOig6Galfzt3g-O3Ufb-tHL1kQCQWK";
|
||||||
compress = gzip;
|
compress = gzip;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ package system-image {
|
|||||||
version = unversioned;
|
version = unversioned;
|
||||||
exclude = true;
|
exclude = true;
|
||||||
|
|
||||||
source = earlyinit;
|
|
||||||
extra = [
|
extra = [
|
||||||
musl,
|
musl,
|
||||||
mksh,
|
mksh,
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ package json-c {
|
|||||||
website = "https://json-c.github.io/json-c";
|
website = "https://json-c.github.io/json-c";
|
||||||
anitya = 390279;
|
anitya = 390279;
|
||||||
|
|
||||||
version# = "0.18-20240915";
|
version# = "0.19-20260627";
|
||||||
source = remoteGitHub {
|
source = remoteGitHub {
|
||||||
suffix = "json-c/json-c";
|
suffix = "json-c/json-c";
|
||||||
tag = "json-c-"+version;
|
tag = "json-c-"+version;
|
||||||
checksum = "LXY6AqXtavysCqcWrniSkgV8fv54iDowsrQ7RXM-upH-ZoJr2R34ff7coFRvOr-k";
|
checksum = "_yfWLtcd185xgLJaWC63pByFpROncoX7z1kHA02sCqYv2EEKG4YhJqc-8zdgtZ0c";
|
||||||
};
|
};
|
||||||
|
|
||||||
exec = cmake {
|
exec = cmake {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package libexpat {
|
|||||||
website = "https://libexpat.github.io";
|
website = "https://libexpat.github.io";
|
||||||
anitya = 770;
|
anitya = 770;
|
||||||
|
|
||||||
version# = "2.8.1";
|
version# = "2.8.2";
|
||||||
source = remoteGitHubRelease {
|
source = remoteGitHubRelease {
|
||||||
suffix = "libexpat/libexpat";
|
suffix = "libexpat/libexpat";
|
||||||
tag = "R_"+replace {
|
tag = "R_"+replace {
|
||||||
@@ -12,7 +12,7 @@ package libexpat {
|
|||||||
new = "_";
|
new = "_";
|
||||||
};
|
};
|
||||||
name = "expat-"+version+".tar.bz2";
|
name = "expat-"+version+".tar.bz2";
|
||||||
checksum = "iMEtbOJhQfGof2GxSlxffQSI1va_NDDQ9VIuqcPbNZ0291Dr8wttD5QecYyjIQap";
|
checksum = "98Pdyj5QtO7QRtNFXTWsCNCixQDx701ZGql2B-JIrTDkw49J5WXXUwnS4AdMlM4L";
|
||||||
compress = bzip2;
|
compress = bzip2;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -3,12 +3,12 @@ package libpsl {
|
|||||||
website = "https://rockdaboot.github.io/libpsl";
|
website = "https://rockdaboot.github.io/libpsl";
|
||||||
anitya = 7305;
|
anitya = 7305;
|
||||||
|
|
||||||
version# = "0.21.5";
|
version# = "0.22.0";
|
||||||
source = remoteGitHubRelease {
|
source = remoteGitHubRelease {
|
||||||
suffix = "rockdaboot/libpsl";
|
suffix = "rockdaboot/libpsl";
|
||||||
tag = version;
|
tag = version;
|
||||||
name = "libpsl-"+version+".tar.gz";
|
name = "libpsl-"+version+".tar.gz";
|
||||||
checksum = "XjfxSzh7peG2Vg4vJlL8z4JZJLcXqbuP6pLWkrGCmRxlnYUFTKNBqWGHCxEOlCad";
|
checksum = "sYrq75kNAJvU5gA2gv2tFYIFbFFit6PuYuW1tYSgcsJsIUzwMJTodofsaEGq3iGf";
|
||||||
compress = gzip;
|
compress = gzip;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -21,5 +21,8 @@ test_disable 'int main(){return 0;}' tests/test-is-public-builtin.c
|
|||||||
|
|
||||||
exec = make {};
|
exec = make {};
|
||||||
|
|
||||||
inputs = [ python ];
|
inputs = [
|
||||||
|
pkg-config,
|
||||||
|
python,
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package noto {
|
||||||
|
description = "a typeface for the world";
|
||||||
|
website = "https://fonts.google.com/noto";
|
||||||
|
anitya = 10671;
|
||||||
|
|
||||||
|
version# = "2026.06.01";
|
||||||
|
source = remoteGitHub {
|
||||||
|
suffix = "notofonts/notofonts.github.io";
|
||||||
|
tag = "noto-monthly-release-"+version;
|
||||||
|
checksum = "QpCYYssOY-OIFKn0_K_7JG7Ij2VDbIkccWrWTC4db1ZPPE1yZnLrf7Kja-IuB4XS";
|
||||||
|
};
|
||||||
|
|
||||||
|
enterSource = true;
|
||||||
|
exec = generic {
|
||||||
|
inPlace = true;
|
||||||
|
install = `
|
||||||
|
DEST=/work/system/share/fonts/noto
|
||||||
|
for font in $(ls -d fonts/*/); do
|
||||||
|
if [[ -d "$font"unhinted/variable-ttf ]]; then
|
||||||
|
install -m444 -vDt "$DEST" "$font"unhinted/variable-ttf/*.ttf
|
||||||
|
elif [[ -d "$font"unhinted/otf ]]; then
|
||||||
|
install -m444 -vDt "$DEST" "$font"unhinted/otf/*.otf
|
||||||
|
else
|
||||||
|
install -m444 -vDt "$DEST" "$font"unhinted/ttf/*.ttf
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
rename -v 's/\[.*\]//' $DEST/*
|
||||||
|
`;
|
||||||
|
};
|
||||||
|
|
||||||
|
inputs = [ rename ];
|
||||||
|
}
|
||||||
@@ -3,12 +3,12 @@ package pango {
|
|||||||
website = "https://www.pango.org";
|
website = "https://www.pango.org";
|
||||||
anitya = 11783;
|
anitya = 11783;
|
||||||
|
|
||||||
version# = "1.57.1";
|
version# = "1.58.0";
|
||||||
source = remoteGitLab {
|
source = remoteGitLab {
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
suffix = "GNOME/pango";
|
suffix = "GNOME/pango";
|
||||||
ref = version;
|
ref = version;
|
||||||
checksum = "BzfdEym2eIyL5ownJ1LfqQwZkY3yH71YAsQF5R-sRV2pIOmc_CULAcfqVQki_Ose";
|
checksum = "k-Jcw7ys4-Q5gS0Y3WCb1MzIWauweIdknf61hRXJmQFfszw7sM7v0dItOoHMZLQJ";
|
||||||
};
|
};
|
||||||
|
|
||||||
exec = meson {
|
exec = meson {
|
||||||
|
|||||||
@@ -124,11 +124,11 @@ package python-vcs-versioning {
|
|||||||
website = "https://setuptools-scm.readthedocs.io/en/latest";
|
website = "https://setuptools-scm.readthedocs.io/en/latest";
|
||||||
anitya = 389421;
|
anitya = 389421;
|
||||||
|
|
||||||
version# = "2.1.1";
|
version# = "2.2.2";
|
||||||
source = remoteGitHub {
|
source = remoteGitHub {
|
||||||
suffix = "pypa/setuptools-scm";
|
suffix = "pypa/setuptools-scm";
|
||||||
tag = "vcs-versioning-v"+version;
|
tag = "vcs-versioning-v"+version;
|
||||||
checksum = "9QRY65iBhyohRC0xPJeq4KUalL-a7p3qTPeD7Y7l6O4qMfvq0psg0X-bb4WPqdGW";
|
checksum = "dqKZGEjxWZ5xo4BjcpFOHxlEZfqrVWM79cRWa8OhGZY7VDSdOxrg7QVIhA6jsPcB";
|
||||||
};
|
};
|
||||||
|
|
||||||
env = [
|
env = [
|
||||||
@@ -158,11 +158,11 @@ package python-setuptools-scm {
|
|||||||
website = "https://setuptools-scm.readthedocs.io/en/latest";
|
website = "https://setuptools-scm.readthedocs.io/en/latest";
|
||||||
anitya = 7874;
|
anitya = 7874;
|
||||||
|
|
||||||
version# = "10.1.2";
|
version# = "10.2.0";
|
||||||
source = remoteGitHub {
|
source = remoteGitHub {
|
||||||
suffix = "pypa/setuptools-scm";
|
suffix = "pypa/setuptools-scm";
|
||||||
tag = "setuptools-scm-v"+version;
|
tag = "setuptools-scm-v"+version;
|
||||||
checksum = "pu9_XHYONnvziRwJ-Q44yjmCI0inPSCs0SvyAudTrpcdUluo65Fy-tmJkLgNOIzs";
|
checksum = "vbZMqPbhScSE5gQXHIvG3pPNw7Iqsi9sEpI13wPdTNQQYOI2skfCvwSTXLq9Ncq8";
|
||||||
};
|
};
|
||||||
|
|
||||||
env = [
|
env = [
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ package qemu {
|
|||||||
website = "https://www.qemu.org";
|
website = "https://www.qemu.org";
|
||||||
anitya = 13607;
|
anitya = 13607;
|
||||||
|
|
||||||
version# = "11.0.1";
|
version# = "11.0.2";
|
||||||
source = remoteTar {
|
source = remoteTar {
|
||||||
url = "https://download.qemu.org/qemu-"+version+".tar.bz2";
|
url = "https://download.qemu.org/qemu-"+version+".tar.bz2";
|
||||||
checksum = "J3j3uNpiqxEoIEngBX2objV_1tzGfEgEphp5Ph86AJQvA_XMwYUakyvRH7YKEkwV";
|
checksum = "FcVvKLivqRuFg7bGJlgJxx6-MWLORgJcliHwBw_1WssI-R7epGT75JawvSYy8Ltq";
|
||||||
compress = bzip2;
|
compress = bzip2;
|
||||||
};
|
};
|
||||||
patches = [
|
patches = [
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package rename {
|
||||||
|
description = "rename renames the filenames supplied according to the rule specified as the first argument";
|
||||||
|
website = "https://search.cpan.org/dist/rename";
|
||||||
|
anitya = 14302;
|
||||||
|
|
||||||
|
version# = "1.16.2";
|
||||||
|
// CPAN missing files
|
||||||
|
source = remoteGitHub {
|
||||||
|
suffix = "pstray/rename";
|
||||||
|
tag = "v"+version;
|
||||||
|
checksum = "4VTeBcv1-oa_OlxpKS4h9ZxZMEq1wrk8hzaiBVZTMYCVQ0adDZ8ubPZ3VFf6qqeo";
|
||||||
|
};
|
||||||
|
|
||||||
|
exec = makeMaker {};
|
||||||
|
|
||||||
|
runtime = [ perl ];
|
||||||
|
}
|
||||||
@@ -2,10 +2,10 @@ package toybox-source {
|
|||||||
description = "toybox source tree";
|
description = "toybox source tree";
|
||||||
exclude = true;
|
exclude = true;
|
||||||
|
|
||||||
version# = "0.8.13";
|
version# = "0.8.14";
|
||||||
output = remoteTar {
|
output = remoteTar {
|
||||||
url = "https://landley.net/toybox/downloads/toybox-"+version+".tar.gz";
|
url = "https://landley.net/toybox/downloads/toybox-"+version+".tar.gz";
|
||||||
checksum = "rZ1V1ATDte2WeQZanxLVoiRGdfPXhMlEo5-exX-e-ml8cGn9qOv0ABEUVZpX3wTI";
|
checksum = "RZQp2CTsLt_y15vsZxwqUb2O1XfK7uvwn-2sTd38O4HAsFKPQpS1UP0brYJ3dRA-";
|
||||||
compress = gzip;
|
compress = gzip;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ package vim {
|
|||||||
description = "a greatly improved version of the good old UNIX editor Vi";
|
description = "a greatly improved version of the good old UNIX editor Vi";
|
||||||
website = "https://www.vim.org";
|
website = "https://www.vim.org";
|
||||||
anitya = 5092;
|
anitya = 5092;
|
||||||
|
exclude = true;
|
||||||
|
block = "not exposed to end users";
|
||||||
|
|
||||||
version# = "9.2.0707";
|
version# = "9.2.0707";
|
||||||
source = remoteGitHub {
|
source = remoteGitHub {
|
||||||
|
|||||||
+12
-10
@@ -476,9 +476,6 @@ func (t Toolchain) NewPackage(
|
|||||||
if name == "" || version == "" {
|
if name == "" || version == "" {
|
||||||
panic("name must be non-empty")
|
panic("name must be non-empty")
|
||||||
}
|
}
|
||||||
if source == nil {
|
|
||||||
panic("source must be non-nil")
|
|
||||||
}
|
|
||||||
rn := name
|
rn := name
|
||||||
if version != Unversioned {
|
if version != Unversioned {
|
||||||
rn = name + "-" + version
|
rn = name + "-" + version
|
||||||
@@ -536,6 +533,17 @@ cd '/usr/src/` + name + `/'
|
|||||||
panic("cannot remain in root")
|
panic("cannot remain in root")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
paths := attr.Paths
|
||||||
|
if source != nil {
|
||||||
|
paths = slices.Concat(attr.Paths, []pkg.ExecPath{
|
||||||
|
pkg.Path(AbsUsrSrc.Append(
|
||||||
|
name+sourceSuffix,
|
||||||
|
), attr.Writable || wantsWrite, t.NewPatchedSource(
|
||||||
|
rn, source, !attr.Chmod && !wantsChmod, attr.Patches...,
|
||||||
|
)),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
return t.New(
|
return t.New(
|
||||||
rn,
|
rn,
|
||||||
attr.Flag,
|
attr.Flag,
|
||||||
@@ -543,13 +551,7 @@ cd '/usr/src/` + name + `/'
|
|||||||
attr.KnownChecksum,
|
attr.KnownChecksum,
|
||||||
attr.Env,
|
attr.Env,
|
||||||
scriptEarly+helper.script(t, name),
|
scriptEarly+helper.script(t, name),
|
||||||
slices.Concat(attr.Paths, []pkg.ExecPath{
|
paths...,
|
||||||
pkg.Path(AbsUsrSrc.Append(
|
|
||||||
name+sourceSuffix,
|
|
||||||
), attr.Writable || wantsWrite, t.NewPatchedSource(
|
|
||||||
rn, source, !attr.Chmod && !wantsChmod, attr.Patches...,
|
|
||||||
)),
|
|
||||||
})...,
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1134,11 +1134,13 @@ func (ctx *evalContext) pf(
|
|||||||
}
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
if sourceA != nil {
|
||||||
panic(azalea.TypeError{
|
panic(azalea.TypeError{
|
||||||
Concrete: reflect.TypeOf(sourceA),
|
Concrete: reflect.TypeOf(sourceA),
|
||||||
Asserted: reflect.TypeFor[pkg.Artifact](),
|
Asserted: reflect.TypeFor[pkg.Artifact](),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
v = cachedArtifact{&meta, ctx.t.NewPackage(
|
v = cachedArtifact{&meta, ctx.t.NewPackage(
|
||||||
meta.Name,
|
meta.Name,
|
||||||
|
|||||||
Reference in New Issue
Block a user