Merge pull request #82 from kellerkinderDE/feat/update-shopware-cli-repo

feat: use new dedicated repo for shopware-cli
kellerkinderDE · Jan 19, 2024 · c0945f7 · c0945f7
2 parents e3b722f + a80a14e
commit c0945f7
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 41 deletions.
diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Test ${{ matrix.manifest }} example
         run: |
           cd ${GITHUB_WORKSPACE}/examples/${{ matrix.manifest }}
-          sed -i "s,url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0,url: path:${GITHUB_WORKSPACE}," devenv.yaml
+          sed -i "s,url: github:kellerkinderDE/devenv-shopware?ref=v2.1.0,url: path:${GITHUB_WORKSPACE}," devenv.yaml
           echo running on ${GITHUB_REPOSITORY} with ref ${GITHUB_REF_NAME}
           direnv allow && direnv reload
           devenv ci -vvv

diff --git a/devenv.lock b/devenv.lock
@@ -3,11 +3,11 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1689338394,
-        "narHash": "sha256-9OW12HXYO0cdZVRHM+kurzsGXlEb6iBDBqd3ALO25vY=",
+        "lastModified": 1705399223,
+        "narHash": "sha256-2nhAJ/9LMlwaEZDnoDIhnhQ0pEC/YIIt09WD7FmTp6g=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "78e6c9f49d224c50f7e5c19b953be995cc94495c",
+        "rev": "ff37923d4ba9e220b9826594e83fc29e1a4f4338",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -67,6 +67,26 @@
         "type": "github"
       }
     },
+    "froshpkgs": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1705521055,
+        "narHash": "sha256-SK2a4naKyXVmkDzwxUV7GnMJd7V0vBVJj6tokvny+fs=",
+        "owner": "FriendsOfShopware",
+        "repo": "nur-packages",
+        "rev": "a055722cf9123a0ac0e95bfa69c092c25ff26755",
+        "type": "github"
+      },
+      "original": {
+        "owner": "FriendsOfShopware",
+        "repo": "nur-packages",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -75,11 +95,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "lastModified": 1703887061,
+        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
         "type": "github"
       },
       "original": {
@@ -90,32 +110,32 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689192006,
-        "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=",
+        "lastModified": 1705331948,
+        "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841",
+        "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1685801374,
-        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+        "lastModified": 1704874635,
+        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -129,11 +149,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1689272634,
-        "narHash": "sha256-y9zwCcb2u8v3VwFdrDHlTcQo9RS8tcAZG2cc2KWkdI4=",
+        "lastModified": 1705305375,
+        "narHash": "sha256-38lwpYnBVX8D+oZSDTjVLyyPb3xjcOcuPHU6Ksy1INo=",
         "owner": "fossar",
         "repo": "nix-phps",
-        "rev": "3499510c674f2b7182c5e444f0cefed304b4f75a",
+        "rev": "4da4501d5e7404accb0fc8cd02d0de995e92fee4",
         "type": "github"
       },
       "original": {
@@ -153,11 +173,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1689328505,
-        "narHash": "sha256-9B3+OeUn1a/CvzE3GW6nWNwS5J7PDHTyHGlpL3wV5oA=",
+        "lastModified": 1705229514,
+        "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "5e28316db471d1ac234beb70031b635437421dd6",
+        "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05",
         "type": "github"
       },
       "original": {
@@ -169,6 +189,7 @@
     "root": {
       "inputs": {
         "devenv": "devenv",
+        "froshpkgs": "froshpkgs",
         "nixpkgs": "nixpkgs",
         "phps": "phps",
         "pre-commit-hooks": "pre-commit-hooks"
@@ -209,11 +230,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {

diff --git a/devenv.nix b/devenv.nix
@@ -2,10 +2,14 @@
 let
   cfg = config.kellerkinder;
 
-  currentVersion = "v2.0.0";
+  currentVersion = "v2.1.0";
 
   listEntries = path:
     map (name: path + "/${name}") (builtins.attrNames (builtins.readDir path));
+
+  shopwareCliPackage = if builtins.hasAttr "froshpkgs" inputs
+      then inputs.froshpkgs.packages.${pkgs.system}.shopware-cli
+      else pkgs.shopware-cli;
 in {
   imports = [
     (lib.mkRenamedOptionModule [ "kellerkinder" "fallbackRedirectMediaUrl" ] [ "kellerkinder" "fallbackMediaUrl" ])
@@ -217,7 +221,7 @@ in {
     packages = [
       pkgs.jq
       pkgs.gnupatch
-      pkgs.shopware-cli
+      shopwareCliPackage
     ] ++ cfg.additionalPackages;
 
     languages.javascript = {

diff --git a/devenv.yaml b/devenv.yaml
@@ -2,7 +2,12 @@ allowUnfree: true
 
 inputs:
   nixpkgs:
-    url: github:NixOS/nixpkgs/nixos-unstable
+    url: github:NixOS/nixpkgs/nixos-23.11
+  froshpkgs:
+    url: github:FriendsOfShopware/nur-packages
+    inputs:
+      nixpkgs:
+        follows: "nixpkgs"
   phps:
     url: github:fossar/nix-phps
     inputs:

diff --git a/docs/Update.md b/docs/Update.md
@@ -1,6 +1,20 @@
 # Updates
 
-
+## v2.1.0
+* We support now the newest version of [shopware-cli](https://github.com/FriendsOfShopware/shopware-cli/releases), which be installed directly. To do this, you just need to adjust the following in your `devenv.yaml`
+  ```yml
+    ...
+    kellerkinder:
+      url: github:kellerkinderDE/devenv-shopware?ref=v2.1.0
+      flake: false
+    ...
+    froshpkgs:
+      url: github:FriendsOfShopware/nur-packages
+      inputs:
+        nixpkgs:
+          follows: "nixpkgs"
+    ...
+  ```
 ## v2.0.0
 * If you still want to use custom ports, take a look at the [options](Options.md#kellerkinder-httpPort).
 * You have to adjust your `devenv.yaml` to

diff --git a/examples/sw5/devenv.yaml b/examples/sw5/devenv.yaml
@@ -3,9 +3,9 @@ imports:
   - kellerkinder
 inputs:
   nixpkgs:
-    url: github:NixOS/nixpkgs/nixos-unstable
+    url: github:NixOS/nixpkgs/nixos-23.11
   kellerkinder:
-    url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0
+    url: github:kellerkinderDE/devenv-shopware?ref=v2.1.0
     flake: false
   phps:
     url: github:fossar/nix-phps

diff --git a/examples/sw6/devenv.yaml b/examples/sw6/devenv.yaml
@@ -3,10 +3,15 @@ imports:
   - kellerkinder
 inputs:
   nixpkgs:
-    url: github:NixOS/nixpkgs/nixos-unstable
+    url: github:NixOS/nixpkgs/nixos-23.11
   kellerkinder:
-    url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0
+    url: github:kellerkinderDE/devenv-shopware?ref=v2.1.0
     flake: false
+  froshpkgs:
+    url: github:FriendsOfShopware/nur-packages
+    inputs:
+      nixpkgs:
+        follows: "nixpkgs"
   phps:
     url: github:fossar/nix-phps
     inputs: