qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bins/sfetch: get ver from the item

Browse Source
This commit is contained in:
Aaron Bieber 2024-02-25 12:45:28 -07:00
parent 184681e0c8
commit 128646926d
No known key found for this signature in database
6 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
bins/default.nix
View File

@ -4,6 +4,16 @@
, ... , ...
}: }:
let let
mkPubs = ver: {
"signify/openbsd-${toString ver}-base.pub".text =
builtins.readFile ./pubs/openbsd-${toString ver}-base.pub;
"signify/openbsd-${toString ver}-fw.pub".text =
builtins.readFile ./pubs/openbsd-${toString ver}-fw.pub;
"signify/openbsd-${toString ver}-pkg.pub".text =
builtins.readFile ./pubs/openbsd-${toString ver}-pkg.pub;
"signify/openbsd-${toString ver}-syspatch.pub".text =
builtins.readFile ./pubs/openbsd-${toString ver}-syspatch.pub;
};
gosignify = pkgs.callPackage ../pkgs/gosignify.nix { inherit isUnstable; }; gosignify = pkgs.callPackage ../pkgs/gosignify.nix { inherit isUnstable; };
ix = pkgs.writeScriptBin "ix" (import ./ix.nix { inherit (pkgs) perl; }); ix = pkgs.writeScriptBin "ix" (import ./ix.nix { inherit (pkgs) perl; });
@ -34,50 +44,9 @@ in
] ++ (if config.services.postgresql.enable then ] ++ (if config.services.postgresql.enable then
[ upgrade-pg ] [ upgrade-pg ]
else [ ]); else [ ]);
environment.etc = { environment.etc =
"signify/openbsd-70-base.pub".text = (mkPubs 72) //
builtins.readFile ./pubs/openbsd-70-base.pub; (mkPubs 73) //
"signify/openbsd-70-fw.pub".text = (mkPubs 74) //
builtins.readFile ./pubs/openbsd-70-fw.pub; (mkPubs 75);
"signify/openbsd-70-pkg.pub".text =
builtins.readFile ./pubs/openbsd-70-pkg.pub;
"signify/openbsd-70-syspatch.pub".text =
builtins.readFile ./pubs/openbsd-70-syspatch.pub;
"signify/openbsd-71-base.pub".text =
builtins.readFile ./pubs/openbsd-71-base.pub;
"signify/openbsd-71-fw.pub".text =
builtins.readFile ./pubs/openbsd-71-fw.pub;
"signify/openbsd-71-pkg.pub".text =
builtins.readFile ./pubs/openbsd-71-pkg.pub;
"signify/openbsd-71-syspatch.pub".text =
builtins.readFile ./pubs/openbsd-71-syspatch.pub;
"signify/openbsd-72-base.pub".text =
builtins.readFile ./pubs/openbsd-72-base.pub;
"signify/openbsd-72-fw.pub".text =
builtins.readFile ./pubs/openbsd-72-fw.pub;
"signify/openbsd-72-pkg.pub".text =
builtins.readFile ./pubs/openbsd-72-pkg.pub;
"signify/openbsd-72-syspatch.pub".text =
builtins.readFile ./pubs/openbsd-72-syspatch.pub;
"signify/openbsd-73-base.pub".text =
builtins.readFile ./pubs/openbsd-73-base.pub;
"signify/openbsd-73-fw.pub".text =
builtins.readFile ./pubs/openbsd-73-fw.pub;
"signify/openbsd-73-pkg.pub".text =
builtins.readFile ./pubs/openbsd-73-pkg.pub;
"signify/openbsd-73-syspatch.pub".text =
builtins.readFile ./pubs/openbsd-73-syspatch.pub;
"signify/openbsd-74-base.pub".text =
builtins.readFile ./pubs/openbsd-74-base.pub;
"signify/openbsd-74-fw.pub".text =
builtins.readFile ./pubs/openbsd-74-fw.pub;
"signify/openbsd-74-pkg.pub".text =
builtins.readFile ./pubs/openbsd-74-pkg.pub;
"signify/openbsd-74-syspatch.pub".text =
builtins.readFile ./pubs/openbsd-74-syspatch.pub;
};
} }

2
bins/pubs/openbsd-75-base.pub Normal file
View File

@ -0,0 +1,2 @@
untrusted comment: openbsd 7.5 base public key
RWRGj1pRpprAfgeF/rgld4ubduChLvTkigA1Zj7WLDsVA4qfYSWOEI8q

2
bins/pubs/openbsd-75-fw.pub Normal file
View File

@ -0,0 +1,2 @@
untrusted comment: OpenBSD 7.5 firmware public key
RWQ6EsXr4NMYvyLICug3dLHfmbpXlVasF1jbt3GVNQsosgB5+PgaufBu

2
bins/pubs/openbsd-75-pkg.pub Normal file
View File

@ -0,0 +1,2 @@
untrusted comment: OpenBSD 7.5 packages public key
RWS/sEFDvf+rjUmS1WROzxH05pB1kB7JRRq76DUGUhCE0Ks8AdpjP5pD

2
bins/pubs/openbsd-75-syspatch.pub Normal file
View File

@ -0,0 +1,2 @@
untrusted comment: OpenBSD 7.5 syspatch public key
RWRAAZC5WcFgn+8b5msDR+yDVCx4ziLaSQI2sy7e4GFY42nFW9p7mP2t

2
bins/sfetch.nix
View File

@ -9,7 +9,7 @@
SERVER=cdn.openbsd.org SERVER=cdn.openbsd.org
ITEM=$1 ITEM=$1
MACHINE=''${2:-amd64} MACHINE=''${2:-amd64}
V="73" V="$(echo $ITEM | sed 's/[^0-9]*//g')"
[[ ! -z $2 ]] && MACHINE=$2 [[ ! -z $2 ]] && MACHINE=$2
${curl}/bin/curl -s -o "$PWD/$ITEM" "https://$SERVER/pub/OpenBSD/snapshots/$MACHINE/$ITEM" && \ ${curl}/bin/curl -s -o "$PWD/$ITEM" "https://$SERVER/pub/OpenBSD/snapshots/$MACHINE/$ITEM" && \
${curl}/bin/curl -s -o "$PWD/SHA256.sig" "https://$SERVER/pub/OpenBSD/snapshots/$MACHINE/SHA256.sig" ${curl}/bin/curl -s -o "$PWD/SHA256.sig" "https://$SERVER/pub/OpenBSD/snapshots/$MACHINE/SHA256.sig"