diff --git a/Taskfile.yaml b/Taskfile.yaml index be388a9b6f3cb9f81816a8a556c5329e9b472e3c..120e7c0707d6fa558fe5ecbc3db7a9739fd0ccb8 120000 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -1 +1 @@ -/nix/store/iyrsyrz5b4g0sqcinrck6sk1diy868x0-Taskfile.yaml \ No newline at end of file +/nix/store/pglnb1wn54s3y2c2p56av41rq8q9zhz8-Taskfile.yaml \ No newline at end of file diff --git a/devenv.lock b/devenv.lock index b68b6556cd1c43b9b029990019eddf5b807ca6dd..a315bfee054ff714ffffd99f5797b1599e301160 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,11 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1700140236, - "narHash": "sha256-OpukFO0rRG2hJzD+pCQq+nSWuT9dBL6DSvADQaUlmFg=", + "lastModified": 1703939110, + "narHash": "sha256-GgjYWkkHQ8pUBwXX++ah+4d07DqOeCDaaQL6Ab86C50=", "owner": "cachix", "repo": "devenv", - "rev": "525d60c44de848a6b2dd468f6efddff078eb2af2", + "rev": "7354096fc026f79645fdac73e9aeea71a09412c3", "type": "github" }, "original": { @@ -74,16 +74,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700403855, - "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", + "lastModified": 1703992652, + "narHash": "sha256-C0o8AUyu8xYgJ36kOxJfXIroy9if/G6aJbNOpA5W0+M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", + "rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e", "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": 1700403855, - "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", + "lastModified": 1704018918, + "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", + "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700064067, - "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=", + "lastModified": 1703939133, + "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8", + "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", "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 b919e059e404255fbcd751b729dac7c120d2470c..304e259c920cae5c90cd4672f89cf663154a8af6 100644 --- a/devenv.nix +++ b/devenv.nix @@ -65,7 +65,7 @@ tasks: docker-client docker-compose drill - exa + eza fd gawk gcc12 @@ -172,7 +172,7 @@ PATH="''${PATH}":${pkgs.moreutils}/bin/ 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}":${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/ @@ -211,7 +211,7 @@ PATH="''${PATH}":${pkgs.curl}/bin/ 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}"}/bin/ @@ -278,7 +278,7 @@ git --no-pager log --decorate=short --pretty=oneline gitVersion=$(version print --git) -for file in $(exa "''${project_root}"dist/*); do +for file in $(eza "''${project_root}"dist/*); do filname=$(basename ''${file}) curl -v --insecure -H "JOB-TOKEN: ''${CI_JOB_TOKEN}" --upload-file \ ''${file} \ diff --git a/devenv.yaml b/devenv.yaml index 525a6f02f172bb9108a23c335a4ced3e80f78502..1fd1de965babf46e2b567fbc260a81006a4c01d1 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