From bebf5ca63b148236dae08f9a333d4edc49c3b404 Mon Sep 17 00:00:00 2001 From: tinect Date: Mon, 15 Jan 2024 10:02:15 +0100 Subject: [PATCH 1/4] feat: use new dedicated repo for shopware-cli --- devenv.lock | 21 +++++++++++++++++++++ devenv.nix | 2 +- devenv.yaml | 5 +++++ examples/sw5/devenv.yaml | 5 +++++ examples/sw6/devenv.yaml | 5 +++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/devenv.lock b/devenv.lock index 304b033..851d118 100644 --- a/devenv.lock +++ b/devenv.lock @@ -67,6 +67,26 @@ "type": "github" } }, + "froshpkgs": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705307227, + "narHash": "sha256-Pl3hb7Ez+37jEF0jpU8XcBy7fdkrRLux1x34MCajn1k=", + "owner": "FriendsOfShopware", + "repo": "nur-packages", + "rev": "aec312a79438652bda0894e32b424773bbbcd11b", + "type": "github" + }, + "original": { + "owner": "FriendsOfShopware", + "repo": "nur-packages", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -169,6 +189,7 @@ "root": { "inputs": { "devenv": "devenv", + "froshpkgs": "froshpkgs", "nixpkgs": "nixpkgs", "phps": "phps", "pre-commit-hooks": "pre-commit-hooks" diff --git a/devenv.nix b/devenv.nix index 8905c5c..c2073f8 100644 --- a/devenv.nix +++ b/devenv.nix @@ -157,7 +157,7 @@ in { packages = [ pkgs.jq pkgs.gnupatch - pkgs.shopware-cli + inputs.froshpkgs.packages.${pkgs.system}.shopware-cli ] ++ cfg.additionalPackages; languages.javascript = { diff --git a/devenv.yaml b/devenv.yaml index 672f3be..3913ce2 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -3,6 +3,11 @@ allowUnfree: true inputs: nixpkgs: url: github:NixOS/nixpkgs/nixos-unstable + froshpkgs: + url: github:FriendsOfShopware/nur-packages + inputs: + nixpkgs: + follows: "nixpkgs" phps: url: github:fossar/nix-phps inputs: diff --git a/examples/sw5/devenv.yaml b/examples/sw5/devenv.yaml index 192ef96..8dda603 100644 --- a/examples/sw5/devenv.yaml +++ b/examples/sw5/devenv.yaml @@ -7,6 +7,11 @@ inputs: kellerkinder: url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0 flake: false + froshpkgs: + url: github:FriendsOfShopware/nur-packages + inputs: + nixpkgs: + follows: "nixpkgs" phps: url: github:fossar/nix-phps inputs: diff --git a/examples/sw6/devenv.yaml b/examples/sw6/devenv.yaml index 192ef96..8dda603 100644 --- a/examples/sw6/devenv.yaml +++ b/examples/sw6/devenv.yaml @@ -7,6 +7,11 @@ inputs: kellerkinder: url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0 flake: false + froshpkgs: + url: github:FriendsOfShopware/nur-packages + inputs: + nixpkgs: + follows: "nixpkgs" phps: url: github:fossar/nix-phps inputs: From f5c3291a0dee0af3a412736c31c53e4fd90099d2 Mon Sep 17 00:00:00 2001 From: tinect Date: Mon, 15 Jan 2024 11:49:05 +0100 Subject: [PATCH 2/4] feat: pin stable nixpkgs 23.11 --- devenv.lock | 64 ++++++++++++++++++++-------------------- devenv.yaml | 2 +- examples/sw5/devenv.yaml | 2 +- examples/sw6/devenv.yaml | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/devenv.lock b/devenv.lock index 851d118..efe435b 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,11 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1689338394, - "narHash": "sha256-9OW12HXYO0cdZVRHM+kurzsGXlEb6iBDBqd3ALO25vY=", + "lastModified": 1705094340, + "narHash": "sha256-T7d1d5PQXqDbZUnKjRTBf26yTCMSttDQULM8jU4jiro=", "owner": "cachix", "repo": "devenv", - "rev": "78e6c9f49d224c50f7e5c19b953be995cc94495c", + "rev": "96b49eb381779bdd4f41ca176a762867c31db5da", "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": { @@ -95,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": { @@ -110,32 +110,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689192006, - "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", + "lastModified": 1701282334, + "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", + "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "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" } @@ -149,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": { @@ -173,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": { @@ -230,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.yaml b/devenv.yaml index 3913ce2..68ca58e 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -2,7 +2,7 @@ allowUnfree: true inputs: nixpkgs: - url: github:NixOS/nixpkgs/nixos-unstable + url: github:NixOS/nixpkgs?ref=23.11 froshpkgs: url: github:FriendsOfShopware/nur-packages inputs: diff --git a/examples/sw5/devenv.yaml b/examples/sw5/devenv.yaml index 8dda603..3a3a5be 100644 --- a/examples/sw5/devenv.yaml +++ b/examples/sw5/devenv.yaml @@ -3,7 +3,7 @@ imports: - kellerkinder inputs: nixpkgs: - url: github:NixOS/nixpkgs/nixos-unstable + url: github:NixOS/nixpkgs?ref=23.11 kellerkinder: url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0 flake: false diff --git a/examples/sw6/devenv.yaml b/examples/sw6/devenv.yaml index 8dda603..3a3a5be 100644 --- a/examples/sw6/devenv.yaml +++ b/examples/sw6/devenv.yaml @@ -3,7 +3,7 @@ imports: - kellerkinder inputs: nixpkgs: - url: github:NixOS/nixpkgs/nixos-unstable + url: github:NixOS/nixpkgs?ref=23.11 kellerkinder: url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0 flake: false From b12de0663c32bb7c792024d6bc2f516bf50ec2a0 Mon Sep 17 00:00:00 2001 From: "a.wink" Date: Mon, 15 Jan 2024 13:55:18 +0100 Subject: [PATCH 3/4] feat: [noticket] Adjust shopware-cli usage - Add fallback for shopware-cli - Increase version --- .github/workflows/test_examples.yml | 2 +- devenv.nix | 8 ++++++-- docs/Update.md | 16 +++++++++++++++- examples/sw5/devenv.yaml | 7 +------ examples/sw6/devenv.yaml | 2 +- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml index 9bf0176..c93bc6d 100644 --- 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.0.1,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.nix b/devenv.nix index c2073f8..306853d 100644 --- a/devenv.nix +++ b/devenv.nix @@ -2,10 +2,14 @@ let cfg = config.kellerkinder; - currentVersion = "v2.0.0"; + currentVersion = "v2.0.1"; 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" ]) @@ -157,7 +161,7 @@ in { packages = [ pkgs.jq pkgs.gnupatch - inputs.froshpkgs.packages.${pkgs.system}.shopware-cli + shopwareCliPackage ] ++ cfg.additionalPackages; languages.javascript = { diff --git a/docs/Update.md b/docs/Update.md index 12bbbad..e66b4a4 100644 --- a/docs/Update.md +++ b/docs/Update.md @@ -1,6 +1,20 @@ # Updates - +## v2.0.1 +* 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.0.1 + 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 index 3a3a5be..95e4741 100644 --- a/examples/sw5/devenv.yaml +++ b/examples/sw5/devenv.yaml @@ -5,13 +5,8 @@ inputs: nixpkgs: url: github:NixOS/nixpkgs?ref=23.11 kellerkinder: - url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0 + url: github:kellerkinderDE/devenv-shopware?ref=v2.0.1 flake: false - froshpkgs: - url: github:FriendsOfShopware/nur-packages - inputs: - nixpkgs: - follows: "nixpkgs" phps: url: github:fossar/nix-phps inputs: diff --git a/examples/sw6/devenv.yaml b/examples/sw6/devenv.yaml index 3a3a5be..be28e18 100644 --- a/examples/sw6/devenv.yaml +++ b/examples/sw6/devenv.yaml @@ -5,7 +5,7 @@ inputs: nixpkgs: url: github:NixOS/nixpkgs?ref=23.11 kellerkinder: - url: github:kellerkinderDE/devenv-shopware?ref=v2.0.0 + url: github:kellerkinderDE/devenv-shopware?ref=v2.0.1 flake: false froshpkgs: url: github:FriendsOfShopware/nur-packages From a80a14e92f98ea30c9ef9c4d44b0b21929c427a4 Mon Sep 17 00:00:00 2001 From: tinect Date: Thu, 18 Jan 2024 18:34:05 +0100 Subject: [PATCH 4/4] feat: use nixos-23.11 branch instead of tag, update version to 2.1.0 --- .github/workflows/test_examples.yml | 2 +- devenv.lock | 20 ++++++++++---------- devenv.nix | 2 +- devenv.yaml | 2 +- docs/Update.md | 4 ++-- examples/sw5/devenv.yaml | 4 ++-- examples/sw6/devenv.yaml | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml index c93bc6d..63f4bd2 100644 --- 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.1,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 index efe435b..e09cc32 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,11 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1705094340, - "narHash": "sha256-T7d1d5PQXqDbZUnKjRTBf26yTCMSttDQULM8jU4jiro=", + "lastModified": 1705399223, + "narHash": "sha256-2nhAJ/9LMlwaEZDnoDIhnhQ0pEC/YIIt09WD7FmTp6g=", "owner": "cachix", "repo": "devenv", - "rev": "96b49eb381779bdd4f41ca176a762867c31db5da", + "rev": "ff37923d4ba9e220b9826594e83fc29e1a4f4338", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1705307227, - "narHash": "sha256-Pl3hb7Ez+37jEF0jpU8XcBy7fdkrRLux1x34MCajn1k=", + "lastModified": 1705521055, + "narHash": "sha256-SK2a4naKyXVmkDzwxUV7GnMJd7V0vBVJj6tokvny+fs=", "owner": "FriendsOfShopware", "repo": "nur-packages", - "rev": "aec312a79438652bda0894e32b424773bbbcd11b", + "rev": "a055722cf9123a0ac0e95bfa69c092c25ff26755", "type": "github" }, "original": { @@ -110,16 +110,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701282334, - "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", + "lastModified": 1705331948, + "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", + "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "23.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/devenv.nix b/devenv.nix index 306853d..ede1cc2 100644 --- a/devenv.nix +++ b/devenv.nix @@ -2,7 +2,7 @@ let cfg = config.kellerkinder; - currentVersion = "v2.0.1"; + currentVersion = "v2.1.0"; listEntries = path: map (name: path + "/${name}") (builtins.attrNames (builtins.readDir path)); diff --git a/devenv.yaml b/devenv.yaml index 68ca58e..1050180 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -2,7 +2,7 @@ allowUnfree: true inputs: nixpkgs: - url: github:NixOS/nixpkgs?ref=23.11 + url: github:NixOS/nixpkgs/nixos-23.11 froshpkgs: url: github:FriendsOfShopware/nur-packages inputs: diff --git a/docs/Update.md b/docs/Update.md index e66b4a4..91ec65d 100644 --- a/docs/Update.md +++ b/docs/Update.md @@ -1,11 +1,11 @@ # Updates -## v2.0.1 +## 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.0.1 + url: github:kellerkinderDE/devenv-shopware?ref=v2.1.0 flake: false ... froshpkgs: diff --git a/examples/sw5/devenv.yaml b/examples/sw5/devenv.yaml index 95e4741..590a507 100644 --- a/examples/sw5/devenv.yaml +++ b/examples/sw5/devenv.yaml @@ -3,9 +3,9 @@ imports: - kellerkinder inputs: nixpkgs: - url: github:NixOS/nixpkgs?ref=23.11 + url: github:NixOS/nixpkgs/nixos-23.11 kellerkinder: - url: github:kellerkinderDE/devenv-shopware?ref=v2.0.1 + 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 index be28e18..bd01046 100644 --- a/examples/sw6/devenv.yaml +++ b/examples/sw6/devenv.yaml @@ -3,9 +3,9 @@ imports: - kellerkinder inputs: nixpkgs: - url: github:NixOS/nixpkgs?ref=23.11 + url: github:NixOS/nixpkgs/nixos-23.11 kellerkinder: - url: github:kellerkinderDE/devenv-shopware?ref=v2.0.1 + url: github:kellerkinderDE/devenv-shopware?ref=v2.1.0 flake: false froshpkgs: url: github:FriendsOfShopware/nur-packages