Unverified Commit f143c160 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

mastodon: 4.3.2 -> 4.3.3 (#374348)

parents 8767eb7a 0829e5c7

pkgs/servers/mastodon/gemset.nix

+65 −30
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "1mfb5x6kwxwprprhzj2a1hff7vw37v1wd9hl70nqq23xr82w20wx";

      sha256 = "03dai8z2dxb2cf29hp6md7bhysyipxvw2qnm2bj98yyrnaskfikn";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  actionmailbox = {

    dependencies = [
@@ -32,10 +32,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "1z95jcq4cmk7zzy4jjgxjbigk0zaxm2gpf8p0s0jn3b5px0k3ljk";

      sha256 = "02inlpsmjz8rz159ljhzac1dvzq5k1pnmmx2pf4gmrj3zs4hbhn3";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  actionmailer = {

    dependencies = [
@@ -56,10 +56,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "1h39ffp0zs0r46bfm8bbgvc8icwamq4icsf1qn32xskdssnb8xyr";

      sha256 = "0ncplhcrxldj6jvbaw9g8ik4cznjlf3lyfzgrwy0jfxjh3cdc4xj";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  actionpack = {

    dependencies = [
@@ -83,10 +83,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "1mrdaql56iqnqcg7n3frc0r48bca8b4g9f2ifc69f15dpps2wfsx";

      sha256 = "066p70mngqk8m7qp3wq2frbl1w8imdcrdxb06cxwq5izykcn7hib";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  actiontext = {

    dependencies = [
@@ -101,10 +101,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "06az0qalnvz0hv1wq8nn5q70gak9r50b6b95avmkz860lhbpx70d";

      sha256 = "1v7psa946frm79x04vywnd0h069jgxy5xghm7y5sgijvmp7n3qmq";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  actionview = {

    dependencies = [
@@ -124,10 +124,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "02zrp7x6k6sgd4rrpsh2b9k2h0qhx538fsb1grsw25ss8d9k2b2j";

      sha256 = "1apnqjfwbvyhf7svlamal1pvy2x78fk42lqbnllqwy816lhrlmcc";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  active_model_serializers = {

    dependencies = [
@@ -157,10 +157,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "1r0i34jrsibwkbg61kjm1xjbc8ppy8r91bnach8rv7jgjrid4dyl";

      sha256 = "0rspwfvhxs5by6im90rrjp2sy1wzdpcgb9xm0qfljk3zhmn3fcvn";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  activemodel = {

    dependencies = [ "activesupport" ];
@@ -172,10 +172,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "1dpdfa132zsfw5l754p2iwialbscvhp9dblq9fg65ww306s3g0pl";

      sha256 = "1wci45aas8g909zby9j91m87ff5j28qwl0i7izzbszsahmk78wkl";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  activerecord = {

    dependencies = [
@@ -191,10 +191,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "1cwx0a7pbl2shm0jc0m7aylacb84j2p4f3h0v7f6aas2b8s6lkf1";

      sha256 = "1qzij5xmsqqxsc9v9kil68aif5bvly06vqf4pnjrnfzkkdhd22pl";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  activestorage = {

    dependencies = [
@@ -208,21 +208,24 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "07zw4r8n3ag3d8jfynngpk0cxjwwlh7pxg3hrz1fdww2fnl6nan8";

      sha256 = "0qzz8dxwj70zys1lmqk1x0sl4rb7ddw6v2bgmpm6dijqd03qnsxf";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  activesupport = {

    dependencies = [

      "base64"

      "benchmark"

      "bigdecimal"

      "concurrent-ruby"

      "connection_pool"

      "drb"

      "i18n"

      "logger"

      "minitest"

      "mutex_m"

      "securerandom"

      "tzinfo"

    ];

    groups = [
@@ -235,10 +238,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "0p3167vw7csidyfl731hbp27xaz90w0v31l3fqzrsipci69p7qw0";

      sha256 = "1f6gqyl49hdabid5jkrfq0127gd396srsgpy7p5ni61v8wp4h34z";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  addressable = {

    dependencies = [ "public_suffix" ];
@@ -467,6 +470,22 @@ 
    };

    version = "3.1.20";

  };

  benchmark = {

    groups = [

      "default"

      "development"

      "pam_authentication"

      "production"

      "test"

    ];

    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";

      type = "gem";

    };

    version = "0.4.0";

  };

  better_errors = {

    dependencies = [

      "erubi"
@@ -2400,10 +2419,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";

      sha256 = "18ajyy4d16q4ahnrfmj6d6z9ak21mnbn4wblx2vddck3lvwlpkny";

      type = "gem";

    };

    version = "1.16.7";

    version = "1.16.8";

  };

  oj = {

    dependencies = [
@@ -3315,10 +3334,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "0fa7maxd1ydbnws0fym43pv8j2c6k5dkg0z0fkq31j8jr1aqk7ja";

      sha256 = "0148c00v3hks98rymdiilhjm0i8qw5fla4gww0fb94k3ggns5bh5";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  rails-controller-testing = {

    dependencies = [
@@ -3371,10 +3390,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6";

      sha256 = "0q55i6mpad20m2x1lg5pkqfpbmmapk0sjsrvr1sqgnj2hb5f5z1m";

      type = "gem";

    };

    version = "1.6.0";

    version = "1.6.2";

  };

  rails-i18n = {

    dependencies = [
@@ -3413,10 +3432,10 @@ 
    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "0ypihpilhxdz5p3sb5g37jn2sbfjhf2ydkxj097kkn7ri7a7702x";

      sha256 = "1yz28fq55drl4c2dwgap96xcjf6qns2ghc3c3gffzm6yw9i5bq8b";

      type = "gem";

    };

    version = "7.1.4.1";

    version = "7.1.5.1";

  };

  rainbow = {

    groups = [
@@ -4032,6 +4051,22 @@ 
    };

    version = "1.8.0";

  };

  securerandom = {

    groups = [

      "default"

      "development"

      "pam_authentication"

      "production"

      "test"

    ];

    platforms = [ ];

    source = {

      remotes = [ "https://rubygems.org" ];

      sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";

      type = "gem";

    };

    version = "0.4.1";

  };

  selenium-webdriver = {

    dependencies = [

      "base64"

pkgs/servers/mastodon/source.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,14 +5,14 @@ 
  patches ? [ ],

}:

let

  version = "4.3.2";

  version = "4.3.3";

in

(applyPatches {

  src = fetchFromGitHub {

    owner = "mastodon";

    repo = "mastodon";

    rev = "v${version}";

    hash = "sha256-A1sSUBtlztKFsZ3TY/c9CXFV8LhttRW2JmSU0QSVOIg=";

    hash = "sha256-6FyLhRy+/uW+RYt+IRHpkTABjKGTQYjR/4GSPN+GlGY=";

  };

  patches = patches ++ [ ];

})

pkgs/servers/mastodon/update.sh

+15 −11
Original line number Diff line number Diff line
@@ -82,12 +82,15 @@ HASH=$(echo "$JSON" | jq -r .hash) 


cat > source.nix << EOF

# This file was generated by pkgs.mastodon.updateScript.

{ fetchFromGitHub, applyPatches, patches ? [] }:

{

  fetchFromGitHub,

  applyPatches,

  patches ? [ ],

}:

let

  version = "$VERSION";

in

(

  applyPatches {

(applyPatches {

  src = fetchFromGitHub {

    owner = "$OWNER";

    repo = "$REPO";
@@ -95,7 +98,8 @@ in 
    hash = "$HASH";

  };

  patches = patches ++ [$PATCHES];

  }) // {

})

// {

  inherit version;

  yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";

}