diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-06-20 17:33:34 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-06-20 17:33:44 +0200 |
| commit | 0981c59053a45e2bce7720fa2542770a8ed9608a (patch) | |
| tree | 2c53b66d2830115e5c77cfef833271ac4d367f3c /manifests | |
| parent | Remove xmonad hook. (diff) | |
| download | pacman-0981c59053a45e2bce7720fa2542770a8ed9608a.tar.gz pacman-0981c59053a45e2bce7720fa2542770a8ed9608a.tar.xz | |
Move pacman types into types subdir.
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/hook.pp | 10 | ||||
| -rw-r--r-- | manifests/makepkg.pp | 28 |
2 files changed, 3 insertions, 35 deletions
diff --git a/manifests/hook.pp b/manifests/hook.pp index a9b57ec..c71b6c5 100644 --- a/manifests/hook.pp +++ b/manifests/hook.pp @@ -1,13 +1,3 @@ - -type Pacman::Operation = Enum['Install', 'Upgrade', 'Remove'] -# type Variant[Type, Array[Type, 1]] = Variant[Type, Array[Type, 1]] - -type Pacman::Trigger = Struct[{ - type => Enum['Path', 'Package'], - operation => Variant[Pacman::Operation, Array[Pacman::Operation, 1]], - target => Variant[String, Array[String, 1]], -}] - define pacman::hook ( Enum['present', 'absent'] $ensure = 'present', Integer $priority = 50, diff --git a/manifests/makepkg.pp b/manifests/makepkg.pp index cf020d2..789298a 100644 --- a/manifests/makepkg.pp +++ b/manifests/makepkg.pp @@ -1,25 +1,3 @@ -type Buildenv = Struct[{ - distcc => Boolean, - color => Boolean, - ccache => Boolean, - check => Boolean, - sign => Boolean, -}] - -type PackageOptions = Struct[{ - string => Boolean, - docs => Boolean, - libtool => Boolean, - staticlibs => Boolean, - emptydirs => Boolean, - zipman => Boolean, - purge => Boolean, - debug => Boolean, - lto => Boolean, -}] - -type ChecksumTypes = Enum['md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'b2'] - class pacman::makepkg ( # protocol: agent Hash[String, String] $dlagents = { @@ -51,7 +29,7 @@ class pacman::makepkg ( String $debug_cflags = '-g -fvar-tracking-assignments', String $debug_cxxflags = '-g -fvar-tracking-assignments', Optional[String] $debug_rustflags = undef, # '-C debuginfo=2' - Buildenv $buildenv = { + Pacman::Buildenv $buildenv = { distcc => false, color => true, ccache => false, @@ -60,7 +38,7 @@ class pacman::makepkg ( }, Optional[String] $distcc_hosts = undef, # '' Optional[String] $builddir = undef, # '/tmp/makepkg' - PackageOptions $options = { + Pacman::PackageOptions $options = { string => true, docs => true, libtool => false, @@ -71,7 +49,7 @@ class pacman::makepkg ( debug => false, lto => false, # This is fairly new... }, - Array[ChecksumTypes] $integrity_check = [ 'sha256' ], + Array[Pacman::ChecksumTypes] $integrity_check = [ 'sha256' ], String $strip_binaries = '--strip-all', String $strip_shared = '--strip-unneeded', String $strip_static = '--strip-debug', |