feat: use nixos-23.11 branch instead of tag, update version to 2.1.0

kellerkinderDE · Jan 18, 2024 · a80a14e · a80a14e
1 parent b12de06
commit a80a14e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 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.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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