From 178ca37662990b91e70457a45c16df0eb4c314ca Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sat, 16 Dec 2023 18:10:55 +0100
Subject: [PATCH] chore: update libs and nix #4
---
devenv.lock | 34 +++++++++++++++++-----------------
devenv.nix | 6 +++---
devenv.yaml | 2 +-
go.mod | 4 ++--
go.sum | 2 ++
5 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/devenv.lock b/devenv.lock
index a9b3b22..5a1545e 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -3,11 +3,11 @@
"devenv": {
"locked": {
"dir": "src/modules",
- "lastModified": 1698243190,
- "narHash": "sha256-n+SbyNQRhUcaZoU00d+7wi17HJpw/kAUrXOL4zRcqE8=",
+ "lastModified": 1702549996,
+ "narHash": "sha256-mEN+8gjWUXRxBCcixeth+jlDNuzxbpFwZNOEc4K22vw=",
"owner": "cachix",
"repo": "devenv",
- "rev": "86f476f7edb86159fd20764489ab4e4df6edb4b6",
+ "rev": "e681a99ffe2d2882f413a5d771129223c838ddce",
"type": "github"
},
"original": {
@@ -74,16 +74,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1698288402,
- "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=",
+ "lastModified": 1702346276,
+ "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344",
+ "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-23.05",
+ "ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -106,11 +106,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1698288402,
- "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=",
+ "lastModified": 1702350026,
+ "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344",
+ "rev": "9463103069725474698139ab10f17a9d125da859",
"type": "github"
},
"original": {
@@ -130,11 +130,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1698227354,
- "narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=",
+ "lastModified": 1702456155,
+ "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf",
+ "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc",
"type": "github"
},
"original": {
@@ -171,11 +171,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1690668568,
- "narHash": "sha256-jzixQKFFW4oxO0S4GYqbkFCXzhBd6com6Z9+MtVKakU=",
+ "lastModified": 1700695799,
+ "narHash": "sha256-nXRhRE69kULaNxijX7ZF14pGSu6Ar/FIvfKCIut7OXc=",
"ref": "refs/heads/master",
- "rev": "3838f03165b726e47d586c04a1821749375e1001",
- "revCount": 37,
+ "rev": "fdcc60bfd3642207e50e8e6c89c0a9a7b27a40a9",
+ "revCount": 41,
"type": "git",
"url": "https://gitlab.schukai.com/oss/utilities/version.git"
},
diff --git a/devenv.nix b/devenv.nix
index 5fdd16f..a32c8d7 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -13,7 +13,7 @@
delve
dialog
drill
- exa
+ eza
fd
fd
feh
@@ -76,7 +76,7 @@
PATH="''${PATH}":${pkgs.gnutar}/bin
PATH="''${PATH}":${pkgs.gzip}/bin/
PATH="''${PATH}":${pkgs.procps}/bin/
- PATH="''${PATH}":${pkgs.exa}/bin/
+ PATH="''${PATH}":${pkgs.eza}/bin/
PATH="''${PATH}":${pkgs.git}/bin/
PATH="''${PATH}":${pkgs.gnugrep}/bin/
PATH="''${PATH}":${
@@ -101,7 +101,7 @@
PATH="''${PATH}":${pkgs.moreutils}/bin/
PATH="''${PATH}":${pkgs.gnutar}/bin
PATH="''${PATH}":${pkgs.gzip}/bin/
- PATH="''${PATH}":${pkgs.exa}/bin/
+ PATH="''${PATH}":${pkgs.eza}/bin/
PATH="''${PATH}":${pkgs.git}/bin/
PATH="''${PATH}":${
inputs.version.defaultPackage."${builtins.currentSystem}"
diff --git a/devenv.yaml b/devenv.yaml
index 525a6f0..1fd1de9 100644
--- a/devenv.yaml
+++ b/devenv.yaml
@@ -1,6 +1,6 @@
inputs:
nixpkgs:
- url: github:nixos/nixpkgs/nixos-23.05
+ url: github:nixos/nixpkgs/nixos-23.11
version:
url: git+https://gitlab.schukai.com/oss/utilities/version.git
diff --git a/go.mod b/go.mod
index 942cbf1..889bade 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,7 @@
module gitlab.schukai.com/oss/libraries/go/utilities/data.git
-go 1.20
+go 1.21
require github.com/volker-schukai/tokenizer v1.0.0
-require gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.1
+require gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.2
diff --git a/go.sum b/go.sum
index ad22fcb..e222d26 100644
--- a/go.sum
+++ b/go.sum
@@ -10,6 +10,8 @@ github.com/volker-schukai/tokenizer v1.0.0 h1:wF4haFoCodq7lgAk8c+th/DZmpFpL2WVD8
github.com/volker-schukai/tokenizer v1.0.0/go.mod h1:LPw7lLIxUnZgeg96818N7IvwLE1x8ya31J/Aa0aCq9M=
gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.1 h1:WpM6PcFqQZWPBGDEuMILWHq98dPVBLAxi8ae9QMWWbM=
gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.1/go.mod h1:MqCBFv7DXKoBE2rZDc51LGvl2QI7Kz0D+XkQ0izj+ws=
+gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.2 h1:cbrnohA6SyqH6NGvYDyIFcrh3lH4DcwLcGUbmaSKWlY=
+gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.9.2/go.mod h1:MqCBFv7DXKoBE2rZDc51LGvl2QI7Kz0D+XkQ0izj+ws=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
--
GitLab