diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-01 14:23:10 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-01 14:23:10 +0100 |
commit | ff90abd5dd36ebc248f66a293f5d4bb86f333238 (patch) | |
tree | 8325a265eac8590b01c7f0507935756d068e5cce /pkgs | |
parent | c3452dae0ed7d837c7888242cba3a84dbbfe3292 (diff) | |
parent | 0aa147911ce1410a82c7c6a332f93c765038df83 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
63 files changed, 870 insertions, 304 deletions
diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index bb29101b4c7f..96efc091ef2b 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { pname = "pqiv"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "06cwm28b7j1skwp21s5snmj1pqh3xh6y2i5v4w3pz0b8k3053h9i"; + sha256 = "18nvrqmlifh4m8nfs0d19sb9d1l3a95xc89qxqdr881jcxdsgflw"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 4f1d43911818..4e928ff34f06 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.2.5"; + version = "7.3.0"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-CRyAeizhaSDmVFGRhrYIW0Ofli9HnkgItiAGRJAETQM="; + sha256 = "sha256-JhEF2/97vo2FgzpCFkuc31aLl9qjKHV8RYXO5oBU1no="; }; installPhase = '' diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 7553b078ef61..46d463645e56 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "1vrj8ad004h6jgmcb56f3f19s4xk6gvcpwysj78bxzgpa1998r3r"; + sha256 = "04ks38s6d3nkdj0arhxw8f3sfw796l97fbqxsm7b9g5d2953a6cs"; }; - cargoSha256 = "0yifgcf2pfszzny523ax7pb9a5r3012nynbnhdqg0j1ia1pdymf3"; + cargoSha256 = "1zwar1l793809bsgqnwrgi50y76bd78qd4s8lw6d64f4z72dh80g"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index ac28694c45e4..5618a8df9101 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.15"; + version = "0.9.17"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "0cfzci2l1bbjc5mqs3hjyy3grz5jk3qbna57vfcvxz36kcd5djv5"; + sha256 = "0spa5zsipd456dcsp7ww24ab5vk4vmwyvrdmraw3hcsbnj9vcnwa"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 3cd9d5db0067..d0459cb426c6 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "0rqnbils0r98qglhm2jafw5d119fqdzszmk825yc0bma4icm7xzp"; + sha256 = "1vdlsfnqnyri0ny2g695lhivs9m25v9lsqf1valwbjv9l9vjxfqa"; }; - cargoSha256 = "1f3g5i0yh82qll1hyihrvv08pbd4h9vzs6jy6bf94bzabyjsgnzv"; + cargoSha256 = "0qziwb69qpbziz772np8dcb1dvxg6m506k5kl63m75z4zicgykcv"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index c7094e1c77e4..e1f1a0ef38a5 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,42 +1,94 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl jq +#! nix-shell -i bash -p coreutils curl jq moreutils # shellcheck shell=bash +# vim: ft=sh +# +# Update a terraform provider to the latest version advertised at the +# provider source address. # -# Update a terraform provider to the latest version advertised at -# the provider source address. set -euo pipefail -USAGE=$(cat<<DOC -Specify the terraform provider name to update. +show_usage() { + cat <<DOC +Usage: ./update-provider [--force] [--vendor] [<owner>/]<provider> + +Update a single provider in the providers.json inventory file. + +For example to update 'terraform-providers.aws' run: + + ./update-provider aws + +If the provider is not in the list already, use the form '<owner>/<provider>' +to add the provider to the list: -Example: -To update nixpkgs.terraform-providers.aws run: -./update-provider aws + ./update-provider hetznercloud/hcloud + +Options: + + * --force: Force the update even if the version matches. + * --vendor: Switch from go package to go modules with vendor. + * --vendor-sha256 <sha256>: Override the SHA256 or "null". DOC -) +} + +force= +provider= +vendor= +vendorSha256= + +while [[ $# -gt 0 ]]; do + case "$1" in + -h | --help) + show_usage + exit + ;; + --force) + force=1 + shift + ;; + --vendor) + force=1 + vendor=1 + shift + ;; + --vendor-sha256) + force=1 + vendorSha256=$2 + shift 2 + ;; + *) + if [[ -n "$provider" ]]; then + echo "ERROR: provider name was passed two times: '$provider' and '$1'" + echo "Use --help for more info" + exit 1 + fi + provider=$1 + shift + esac +done -provider_name="${1:-}" -if [ -z "$provider_name" ]; then - echo "No providers specified!" +if [[ -z "$provider" ]]; then + echo "ERROR: No providers specified!" echo - echo "$USAGE" + show_usage exit 1 fi -provider_source_address="$(jq -r ".$provider_name.\"provider-source-address\"" providers.json)" +provider_name=$(basename "$provider") -if [ "$provider_source_address" == "null" ]; then - echo "No provider source address specified with provider: $provider_name" - exit 1 -fi +# Usage: read_attr <key> +read_attr() { + jq -r ".\"$provider_name\".\"$1\"" providers.json +} -# The provider source address (used inside Terraform `required_providers` block) is -# used to compute the registry API endpoint -# -# registry.terraform.io/hashicorp/aws (provider source address) -# registry.terraform.io/providers/hashicorp/aws (provider URL for the website) -# registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API) -registry_response=$(curl -s https://"${provider_source_address/\///v1/providers/}") +# Usage: update_attr <key> <value> +update_attr() { + if [[ "$2" == "null" ]]; then + jq -S ".\"$provider_name\".\"$1\" = null" providers.json | sponge providers.json + else + jq -S ".\"$provider_name\".\"$1\" = \"$2\"" providers.json | sponge providers.json + fi +} prefetch_github() { # of a given owner, repo and rev, fetch the tarball and return the output of @@ -47,31 +99,80 @@ prefetch_github() { nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz" } +old_source_address="$(read_attr provider-source-address)" +old_vendor_sha256=$(read_attr vendorSha256) +old_version=$(read_attr version) + +if [[ $provider =~ ^[^/]+/[^/]+$ ]]; then + source_address=registry.terraform.io/$provider +else + source_address=$old_source_address +fi +if [[ "$source_address" == "null" ]]; then + echo "Could not find the source address for provider: $provider" + exit 1 +fi +update_attr "provider-source-address" "$source_address" + +# The provider source address (used inside Terraform `required_providers` block) is +# used to compute the registry API endpoint +# +# registry.terraform.io/hashicorp/aws (provider source address) +# registry.terraform.io/providers/hashicorp/aws (provider URL for the website) +# registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API) +registry_response=$(curl -s https://"${source_address/\///v1/providers/}") + +version="$(jq -r '.version' <<< "$registry_response")" +if [[ "$old_version" = "$version" && "$force" != 1 && -z "$vendorSha256" && "$old_vendor_sha256" != "$vendorSha256" ]]; then + echo "$provider_name is already at version $version" + exit +fi +update_attr version "$version" + provider_source_url="$(jq -r '.source' <<< "$registry_response")" org="$(echo "$provider_source_url" | cut -d '/' -f 4)" +update_attr owner "$org" repo="$(echo "$provider_source_url" | cut -d '/' -f 5)" +update_attr repo "$repo" rev="$(jq -r '.tag' <<< "$registry_response")" - +update_attr rev "$rev" sha256=$(prefetch_github "$org" "$repo" "$rev") +update_attr sha256 "$sha256" -version="$(jq -r '.version' <<< "$registry_response")" +repo_root=$(git rev-parse --show-toplevel) -updated_provider="$(mktemp)" -cat <<EOF >> "$updated_provider" -{ - "$provider_name": { - "owner": "$org", - "repo": "$repo", - "rev": "$rev", - "sha256": "$sha256", - "version": "$version", - "provider-source-address": "$provider_source_address" - } -} -EOF +if [[ -z "$vendorSha256" ]]; then + if [[ "$old_vendor_sha256" == null ]]; then + vendorSha256=null + elif [[ -n "$old_vendor_sha256" || "$vendor" = 1 ]]; then + echo "=== Calculating vendorSha256 ===" + update_attr vendorSha256 "0000000000000000000000000000000000000000000000000000000000000000" + # Hackish way to find out the desired sha256. First build, then extract the + # error message from the logs. + set +e + nix-build --no-out-link "$repo_root" -A "terraform-providers.$provider_name.go-modules" 2>vendor_log.txt + set -e + logs=$(< vendor_log.txt) + if ! [[ $logs =~ got:\ +([^\ ]+) ]]; then + echo "ERROR: could not find new hash in output:" + cat vendor_log.txt + rm -f vendor_log.txt + exit 1 + fi + rm -f vendor_log.txt + vendorSha256=${BASH_REMATCH[1]} + # Deal with nix unstable + if [[ $vendorSha256 = sha256-* ]]; then + vendorSha256=$(nix to-base32 "$vendorSha256") + fi + fi +fi -original_provider_list="$(mktemp)" -cat providers.json > "$original_provider_list" +if [[ -n "$vendorSha256" ]]; then + update_attr vendorSha256 "$vendorSha256" +fi -jq --sort-keys --slurp '.[0] * .[1]' "$original_provider_list" "$updated_provider" > providers.json +# Check that the provider builds +echo "=== Building terraform-providers.$provider_name ===" +nix-build "$repo_root" -A "terraform-providers.$provider_name" diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index f9abd3fef3c0..13dc38aaba93 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.8.2"; + version = "3.8.3"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "0vy89ih586s89s29dzzggk7bkaz70mzrc9islirk01s1jal1jn0v"; + sha256 = "1704nj77h6s88l4by3wxl5l770gaig90mv3ix80r00nh8mhzq44q"; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index c9dd22f18317..6b511d1a1a9c 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1y0k9vfb4818b3s313jlxbpjwdxd62cc4kc1vpxdjvs8mx543vrv"; + sha256 = "1j0yd33sm824dy4mhwfxqkywa46yhqy5hd5wq4lp7lgl6m6mypar"; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 3fe3b6650755..d0a396d6a907 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "08jv8dbvdygcm6wzvncx89p8cn9mbjn4lj8rf5svq8lr7zk1rvpw"; + sha256 = "0w41p2fm26ml5dvdg2cnxcw0xzsbjq26chpa3bkn1adpazlpivp4"; }; vendorSha256 = "0g344dj325d35i0myrzhg5chspqnly40qp910ml6zrmp7iszc1mw"; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index e90f47e51f31..bb720df3f27a 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.8"; + version = "1.0.0-alpha.11"; src = fetchCrate { inherit version pname; - sha256 = "01wag3ckqsa7r6zc7cla428w8hr49n2ybp31s42dqmsbak3xbc14"; + sha256 = "1y2xgbzclmk0i98iydmqgvf6acx0v326dmj9j2hiwrld193fc4dx"; }; - cargoSha256 = "1hh4xmkhbbbkag3v25vh6zpn0r4fmipxmkcr8ahgrxf71dvyxj8x"; + cargoSha256 = "0i1rr8jg34g4b8i2lvh9gy2rpfa01ma9jpcpyp5zklrzk5f1ksvf"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; LIBCLANG_PATH = "${libclang}/lib"; diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index 8f77fdbe54c8..6f639ecd77fa 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "sparkleshare"; - version = "3.28"; + version = "3.38"; src = fetchFromGitHub { owner = "hbons"; repo = "SparkleShare"; rev = version; - sha256 = "sha256:1x5nv2f3mrsr4a336bz5kc2lzkzilfh43bxy2yqhhjp2dgb20497"; + sha256 |