Unverified Commit 1e6348ff authored by rewine's avatar rewine Committed by GitHub
Browse files

Merge pull request #308075 from tcmal/akkoma-3.13 

 akkoma: 3.12.2 -> 3.13.1
parents 76037656 9d0ca694

pkgs/servers/akkoma/admin-fe/default.nix

+9 −11
Original line number Diff line number Diff line
@@ -2,26 +2,25 @@ 
, stdenv

, fetchFromGitea, fetchYarnDeps

, fixup-yarn-lock, yarn, nodejs

, git

, python3, pkg-config, libsass

}:



stdenv.mkDerivation rec {

  pname = "admin-fe";

  version = "unstable-2024-02-25";

  version = "unstable-2024-04-27";



  src = fetchFromGitea {

    domain = "akkoma.dev";

    owner = "AkkomaGang";

    repo = "admin-fe";

    rev = "2a1e175f7c2b02e66d728f808cb7e9449231a288";

    hash = "sha256-PLSJ+doZUZ2n4hWUahY299VoCvNq76Tm8qpdvOIHD9c=";

    rev = "7e16abcbaab10efa6c2c4589660cf99f820a718d";

    hash = "sha256-W/2Ay2dNeVQk88lgkyTzKwCNw0kLkfI6+Azlbp0oMm4=";

  };



  patches = [ ./deps.patch ];



  offlineCache = fetchYarnDeps {

    yarnLock = ./yarn.lock;

    hash = "sha256-h+QUBT2VwPWu2l05Zkcp+0vHN/x40uXxw2KYjq7l/Xk=";

    yarnLock = src + "/yarn.lock";

    hash = "sha256-acF+YuWXlMZMipD5+XJS+K9vVFRz3wB2fZqc3Hd0Bjc=";

  };



  nativeBuildInputs = [
@@ -30,13 +29,10 @@ stdenv.mkDerivation rec { 
    nodejs

    pkg-config

    python3

    git

    libsass

  ];



  postPatch = ''

    cp ${./yarn.lock} yarn.lock

  '';



  configurePhase = ''

    runHook preConfigure
@@ -44,6 +40,8 @@ stdenv.mkDerivation rec { 


    yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache}

    fixup-yarn-lock yarn.lock

    substituteInPlace yarn.lock \

      --replace-fail '"git://github.com/adobe-webplatform/eve.git#eef80ed"' '"https://github.com/adobe-webplatform/eve.git#eef80ed"'



    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive

    patchShebangs node_modules/cross-env

pkgs/servers/akkoma/admin-fe/deps.patch

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
diff --git a/package.json b/package.json

index f267be19..fb806527 100644

--- a/package.json

+++ b/package.json

@@ -31,14 +31,12 @@

     "type": "git",

     "url": "git+https://akkoma.dev/AkkomaGang/admin-fe.git"

   },

-  "resolutions": {

-    "prosemirror-model": "1.9.1"

-  },

   "bugs": {

     "url": "https://akkoma.dev/AkkomaGang/admin-fe/-/issues"

   },

   "dependencies": {

     "@babel/runtime": "^7.3.4",

+    "@toast-ui/editor": "^3.2.0",

     "axios": "0.18.0",

     "clipboard": "1.7.1",

     "codemirror": "5.39.2",

@@ -65,7 +63,6 @@

     "sortablejs": "1.7.0",

     "tiptap": "^1.29.6",

     "tiptap-extensions": "^1.32.7",

-    "tui-editor": "1.2.7",

     "vue": "^2.6.8",

     "vue-count-to": "1.0.13",

     "vue-i18n": "^8.9.0",

diff --git a/src/components/element-ui/MarkdownEditor/index.vue b/src/components/element-ui/MarkdownEditor/index.vue

index 7ae9fd40..18114701 100644

--- a/src/components/element-ui/MarkdownEditor/index.vue

+++ b/src/components/element-ui/MarkdownEditor/index.vue

@@ -5,10 +5,10 @@

 <script>

 // deps for editor

 import 'codemirror/lib/codemirror.css' // codemirror

-import 'tui-editor/dist/tui-editor.css' // editor ui

-import 'tui-editor/dist/tui-editor-contents.css' // editor content

+import '@toast-ui/editor/dist/tui-editor.css' // editor ui

+import '@toast-ui/editor/dist/tui-editor-contents.css' // editor content

 

-import Editor from 'tui-editor'

+import Editor from '@toast-ui/editor'

 import defaultOptions from './defaultOptions'

 

 export default {

pkgs/servers/akkoma/admin-fe/yarn.lock

deleted100644 → 0
+0 −12493

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/servers/akkoma/akkoma-fe/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec { 
    domain = "akkoma.dev";

    owner = "AkkomaGang";

    repo = "akkoma-fe";

    rev = "7cc6c3565466b330043e0a811a6e1e2db487ec8d";

    rev = "v${version}";

    hash = "sha256-Z7psmIyOo8Rvwcip90JgxLhZ5SkkGB94QInEgm8UOjQ=";

  };

pkgs/servers/akkoma/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ 
}:

beamPackages.mixRelease rec {

  pname = "akkoma";

  version = "3.12.2";

  version = "3.13.1";



  src = fetchFromGitea {

    domain = "akkoma.dev";

    owner = "AkkomaGang";

    repo = "akkoma";

    rev = "v${version}";

    hash = "sha256-eKvfuHTLmUU6Dom/GctPSbhrAAik1T/7bYY5j3YUkRo=";

    hash = "sha256-KRU7uEiwBimPz0HA+SClYt9/ubKNaRCArTGSiWvvVg8=";

  };



  postPatch = ''