diff options
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 20 | ||||
-rwxr-xr-x | maintainers/scripts/bootstrap-files/refresh-tarballs.bash | 44 | ||||
-rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 1 |
3 files changed, 51 insertions, 14 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4889d6a4b2262..443c41dbb98fb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -761,6 +761,11 @@ githubId = 786394; name = "Alexander Krupenkin "; }; + akshayka = { + github = "akshayka"; + githubId = 1994308; + name = "Akshay Agrawal"; + }; akshgpt7 = { email = "akshgpt7@gmail.com"; github = "akshgpt7"; @@ -5005,6 +5010,12 @@ githubId = 283316; name = "Dane Lipscombe"; }; + dmadisetti = { + email = "nix@madisetti.me"; + github = "dmadisetti"; + githubId = 2689338; + name = "Dylan Madisetti"; + }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; @@ -9956,6 +9967,15 @@ githubId = 1621930; name = "Kamil Chmielewski"; }; + kamillaova = { + name = "Kamilla Ova"; + email = "me@kamillaova.dev"; + github = "Kamillaova"; + githubId = 54859825; + keys = [{ + fingerprint = "B2D0 AA53 8DBE 60B0 0811 3FC0 2D52 5F67 791E 5834"; + }]; + }; kampfschlaefer = { email = "arnold@arnoldarts.de"; github = "kampfschlaefer"; diff --git a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash index 775d7ef1379df..4b0380f09745a 100755 --- a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash +++ b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash @@ -67,14 +67,8 @@ NATIVE_TARGETS=( i686-unknown-linux-gnu x86_64-unknown-linux-gnu x86_64-unknown-linux-musl - - # TODO: add darwin here once a few prerequisites are satisfied: - # - bootstrap-files are factored out into a separate file - # - the build artifacts are factored out into an `on-server` - # directory. Right onw if does not match `linux` layout. - # - #aarch64-apple-darwin - #x86_64-apple-darwin + aarch64-apple-darwin + x86_64-apple-darwin ) is_native() { @@ -106,6 +100,18 @@ is_cross() { return 1 } +nar_sri_get() { + local ouput sri + output=$(nix-build --expr \ + 'import <nix/fetchurl.nix> { + url = "'"$1"'"; + unpack = true; + }' 2>&1 || true) + sri=$(echo "$output" | awk '/^\s+got:\s+/{ print $2 }') + [[ -z "$sri" ]] && die "$output" + echo "$sri" +} + # collect passed options targets=() @@ -222,6 +228,7 @@ EOF case "$fname" in bootstrap-tools.tar.xz) attr=bootstrapTools ;; busybox) attr=$fname ;; + unpack.nar.xz) attr=unpack ;; *) die "Don't know how to map '$fname' to attribute name. Please update me." esac @@ -229,18 +236,27 @@ EOF executable_nix= if [[ -x "$p" ]]; then executable_arg="--executable" - executable_nix=" executable = true;" + executable_nix="executable = true;" + fi + unpack_nix= + if [[ $fname = *.nar.* ]]; then + unpack_nix="unpack = true;" + sri=$(nar_sri_get "file://$p") + else + sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p") + [[ $? -ne 0 ]] && die "Failed to get the hash for '$p'" + sri=$(nix-hash --to-sri "sha256:$sha256") + [[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form" fi - sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p") - [[ $? -ne 0 ]] && die "Failed to get the hash for '$p'" - sri=$(nix-hash --to-sri "sha256:$sha256") - [[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form" # individual file entries cat <<EOF $attr = import <nix/fetchurl.nix> { url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname"; - hash = "${sri}";$(printf "\n%s" "${executable_nix}") + hash = "${sri}";$( + [[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}" + [[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}" +) }; EOF done diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 325b2f30f0473..fd6c59c0b46fc 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -95,6 +95,7 @@ magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, middleclass,,,,,, +mimetypes,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn nlua,,,,,,teto |