Unverified Commit fe5c3731 authored by Mikael Voss's avatar Mikael Voss
Browse files

akkoma: 3.13.2 -> 3.14.1

parent fd9f1d99

pkgs/servers/akkoma/0001-fix-tzdata.patch

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
diff --git a/mix.lock b/mix.lock

index 810356345..99a5a92c3 100644

--- a/mix.lock

+++ b/mix.lock

@@ -75,7 +75,7 @@

   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},

   "mfm_parser": {:git, "https://akkoma.dev/AkkomaGang/mfm-parser.git", "b21ab7754024af096f2d14247574f55f0063295b", [ref: "b21ab7754024af096f2d14247574f55f0063295b"]},

   "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},

-  "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},

+  "mimerl": {:hex, :mimerl, "1.3.0", "d0cd9fc04b9061f82490f6581e0128379830e78535e017f7780f37fea7545726", [:rebar3], [], "hexpm", "a1e15a50d1887217de95f0b9b0793e32853f7c258a5cd227650889b38839fe9d"},

   "mint": {:hex, :mint, "1.5.2", "4805e059f96028948870d23d7783613b7e6b0e2fb4e98d720383852a760067fd", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "d77d9e9ce4eb35941907f1d3df38d8f750c357865353e21d335bdcdf6d892a02"},

   "mock": {:hex, :mock, "0.3.8", "7046a306b71db2488ef54395eeb74df0a7f335a7caca4a3d3875d1fc81c884dd", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"},

   "mogrify": {:hex, :mogrify, "0.9.3", "238c782f00271dace01369ad35ae2e9dd020feee3443b9299ea5ea6bed559841", [:mix], [], "hexpm", "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"},

@@ -123,7 +123,7 @@

   "tesla": {:hex, :tesla, "1.8.0", "d511a4f5c5e42538d97eef7c40ec4f3e44effdc5068206f42ed859e09e51d1fd", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, ">= 1.0.0", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"},

   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},

   "trailing_format_plug": {:hex, :trailing_format_plug, "0.0.7", "64b877f912cf7273bed03379936df39894149e35137ac9509117e59866e10e45", [:mix], [{:plug, "> 0.12.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "bd4fde4c15f3e993a999e019d64347489b91b7a9096af68b2bdadd192afa693f"},

-  "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},

+  "tzdata": {:hex, :tzdata, "1.1.2", "45e5f1fcf8729525ec27c65e163be5b3d247ab1702581a94674e008413eef50b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "cec7b286e608371602318c414f344941d5eb0375e14cfdab605cca2fe66cba8b"},

   "ueberauth": {:hex, :ueberauth, "0.10.5", "806adb703df87e55b5615cf365e809f84c20c68aa8c08ff8a416a5a6644c4b02", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"},

   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},

   "unsafe": {:hex, :unsafe, "1.0.2", "23c6be12f6c1605364801f4b47007c0c159497d0446ad378b5cf05f1855c0581", [:mix], [], "hexpm", "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"},

pkgs/servers/akkoma/default.nix

+14 −28
Original line number Diff line number Diff line
@@ -10,18 +10,16 @@ 
}:

beamPackages.mixRelease rec {

  pname = "akkoma";

  version = "3.13.2";

  version = "3.14.1";



  src = fetchFromGitea {

    domain = "akkoma.dev";

    owner = "AkkomaGang";

    repo = "akkoma";

    rev = "v${version}";

    hash = "sha256-WZAkpJIPzAbqXawNiM3JqE9tJzxrNs/2dGAWVMwLpN4=";

    hash = "sha256-Ygb51jQatdyX/DzJk84X1AEliBGD938f83UnI5OqBPM=";

  };



  patches = [ ./0001-fix-tzdata.patch ];



  postPatch = ''

    # Remove dependency on OS_Mon

    sed -E -i 's/(^|\s):os_mon,//' \
@@ -31,7 +29,7 @@ beamPackages.mixRelease rec { 
  postBuild = ''

    # Digest and compress static files

    rm -f priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE

    mix phx.digest --no-deps-check

    mix phx.digest --no-compile

  '';



  mixNixDeps = import ./mix.nix {
@@ -76,8 +74,8 @@ beamPackages.mixRelease rec { 
            group = "pleroma";

            owner = "elixir-libraries";

            repo = "elixir-captcha";

            rev = "90f6ce7672f70f56708792a98d98bd05176c9176";

            hash = "sha256-s7EuAhmCsQA/4p2NJHJSWB/DZ5hA+7EelPsUOvKr2Po=";

            rev = "6630c42aaaab124e697b4e513190c89d8b64e410";

            hash = "sha256-KLsKBfCt6bUylSTTqRQi6ic0MyimanvIZRhU4Iv5Fmw=";

          };



          # the binary is not getting installed by default
@@ -107,21 +105,9 @@ beamPackages.mixRelease rec { 
            hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0=";

          };

        };

        linkify = beamPackages.buildMix rec {

          name = "linkify";

          version = "0.5.2";



          src = fetchFromGitea {

            domain = "akkoma.dev";

            owner = "AkkomaGang";

            repo = "linkify";

            rev = "2567e2c1073fa371fd26fd66dfa5bc77b6919c16";

            hash = "sha256-e3wzlbRuyw/UB5Tb7IozX/WR1T+sIBf9C/o5Thki9vg=";

          };

        };

        mfm_parser = beamPackages.buildMix rec {

          name = "mfm_parser";

          version = "0.1.1";

          version = "0.1.0";



          src = fetchFromGitea {

            domain = "akkoma.dev";
@@ -171,14 +157,14 @@ beamPackages.mixRelease rec { 
        };

        http_signatures = beamPackages.buildMix rec {

          name = "http_signatures";

          version = "0.1.2";

          version = "0.1.3";



          src = fetchFromGitea {

            domain = "akkoma.dev";

            owner = "AkkomaGang";

            repo = "http_signatures";

            rev = "6640ce7d24c783ac2ef56e27d00d12e8dc85f396";

            hash = "sha256-Q/IoVbM/TBgGCmx8AxiBHF2hARb0FbPml8N1HjN3CsE=";

            rev = "d44c43d66758c6a73eaa4da9cffdbee0c5da44ae";

            hash = "sha256-o5xF++AIJLVMFuQwldNyWpYJGWFHZZTfGy1V80TZzR8=";

          };



          beamDeps = with final; [ credo ex_doc dialyxir temple ];
@@ -189,7 +175,7 @@ beamPackages.mixRelease rec { 
        };

        majic = beamPackages.buildMix {

          name = "majic";

          version = "0.1.2";

          version = "1.0.0";



          src = fetchFromGitea {

            domain = "akkoma.dev";
@@ -219,11 +205,11 @@ beamPackages.mixRelease rec { 
    elixirPackage = beamPackages.elixir;

  };



  meta = with lib; {

  meta = {

    description = "ActivityPub microblogging server";

    homepage = "https://akkoma.social";

    license = licenses.agpl3Only;

    maintainers = with maintainers; [ mvs ];

    platforms = platforms.unix;

    license = lib.licenses.agpl3Only;

    maintainers = with lib.maintainers; [ mvs ];

    platforms = lib.platforms.unix;

  };

}

pkgs/servers/akkoma/mix.nix

+145 −119

File changed.

Preview size limit exceeded, changes collapsed.