karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source 
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2025-03-17 14:14:07 +00:00
parent 8973cde998
commit 6f639cbd8f
14 changed files with 136 additions and 8048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
flake.lock generated
View File

@@ -31,11 +31,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741396597, "lastModified": 1741863581,
"narHash": "sha256-RQYpdggQLWTynaT1ISqbACo8plSTBNunG8rv8+A82g0=", "narHash": "sha256-datQsagelizLX/7Mb7aSOic7X49GZUzZsWzBzDZOY4U=",
"owner": "aylur", "owner": "aylur",
"repo": "astal", "repo": "astal",
"rev": "f38433594051ee75957720d1c36de00896a67eb6", "rev": "69efb4c91e590adcb5a3d8938454f987982e3891",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -52,11 +52,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740485968, "lastModified": 1741786315,
"narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -115,11 +115,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741474715, "lastModified": 1742208883,
"narHash": "sha256-bdJ2D5rzpIsYM8RaN8ny7eAd2ItJ9DDmKFOpkksTSts=", "narHash": "sha256-mvx7tfLUVsxDHR0EgZxRN7i45eHOT4Zru8nGK96W74w=",
"owner": "karaolidis", "owner": "karaolidis",
"repo": "home-manager", "repo": "home-manager",
"rev": "f0683dbe14d2672bdc850ba1401b9a73505aff74", "rev": "b6fd8989ab8bfe29a9dddd22032279c797520a9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -131,11 +131,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1741474710, "lastModified": 1742209837,
"narHash": "sha256-x6BnHSNebSyFmMPGGIATvo88CGvDo5iVHrMyq078SyQ=", "narHash": "sha256-MpPI7quV8j1gGLeOPwMKpELaMXsZkfufDAcQwKv7W9Q=",
"owner": "karaolidis", "owner": "karaolidis",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e62f98f7dfc54185876ce82ced95f8afd321c39", "rev": "e19afdd5bae602b97d4a1e1fe142a81e2ef77911",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -156,11 +156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741473895, "lastModified": 1742209748,
"narHash": "sha256-mWiCOdvGkDVJO6C9OaXDpYuKUJocyeZhtWP7QNqS2Zs=", "narHash": "sha256-xqBqRBL3ofUG1oGgUhF/PTVfayxwr3+PgBxzrF2CuMc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "3c1d774501d2300c51ce37ea6d1405d5ea12e740", "rev": "4fc8378c5d5b08ae0166eaf5b97a1b3f381dfb3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -177,11 +177,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741454770, "lastModified": 1741877501,
"narHash": "sha256-XgUi3CA/8xLeZj41P0v1ZmbvYKNs7pzHVMyJ5Z5qakE=", "narHash": "sha256-jCNJS5zrG5fFNSmeAJi93g9AaDyirARmi0/NuO9YDs0=",
"owner": "SEIAROTg", "owner": "SEIAROTg",
"repo": "quadlet-nix", "repo": "quadlet-nix",
"rev": "d97b1af0e0165ee8e1668e6622d72c6beec4fd9f", "rev": "341bf1b0ce788fec84c2dd7fa8757127f8915179",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -214,11 +214,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741043164, "lastModified": 1742209060,
"narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "narHash": "sha256-47/1bOPBGhmAegF06nxLN15d/MClCAkk8s/+WOhJJAM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "rev": "b33837ae3cfa012b65810891bebbee71fa4c0658",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -238,11 +238,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741106441, "lastModified": 1742209093,
"narHash": "sha256-MGQjVr79RUYKv7lXJ1je06rSFagB5S8J7OrW0WXCPwM=", "narHash": "sha256-dK+DPubzCNJTHzwIHWYhZPNavqu099VE5609xRt6DGs=",
"owner": "karaolidis", "owner": "karaolidis",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "e490b7596ee9b0cd8d975a83ae92d4204be76e86", "rev": "1f74b924cff25d6b8777afed5d074cd53628a6e1",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/common/configs/user/gui/vscode/default.nix
View File

@@ -60,6 +60,7 @@ in
"extensions.autoUpdate" = false; "extensions.autoUpdate" = false;
"extensions.ignoreRecommendations" = true; "extensions.ignoreRecommendations" = true;
"files.autoSave" = "afterDelay"; "files.autoSave" = "afterDelay";
"files.enableTrash" = false;
"files.eol" = "\n"; "files.eol" = "\n";
"files.insertFinalNewline" = true; "files.insertFinalNewline" = true;
"files.trimFinalNewlines" = true; "files.trimFinalNewlines" = true;
@@ -70,6 +71,7 @@ in
"git.closeDiffOnOperation" = true; "git.closeDiffOnOperation" = true;
"git.confirmForcePush" = false; "git.confirmForcePush" = false;
"git.confirmSync" = false; "git.confirmSync" = false;
"git.discardUntrackedChangesToTrash" = false;
"git.enableCommitSigning" = true; "git.enableCommitSigning" = true;
"git.enableSmartCommit" = true; "git.enableSmartCommit" = true;
"git.ignoreRebaseWarning" = true; "git.ignoreRebaseWarning" = true;

6
packages/darktable/lua-scripts/default.nix
View File

@@ -2,13 +2,13 @@
# AUTO-UPDATE: nix-update --flake --version=branch=master darktable-lua-scripts # AUTO-UPDATE: nix-update --flake --version=branch=master darktable-lua-scripts
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
pname = "darktable-lua-scripts"; pname = "darktable-lua-scripts";
version = "release-2.0.0-unstable-2025-03-02"; version = "release-2.0.0-unstable-2025-03-08";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "darktable-org"; owner = "darktable-org";
repo = "lua-scripts"; repo = "lua-scripts";
rev = "e070a1462c9f41e172dc75b42d5ff25af5db84d6"; rev = "a9191cf084ea7c223d0c18504f17043ad973eff3";
hash = "sha256-0QTi0jhanzqftBexAyfCPtULAGsOpgBDK+9MlZCfyDc="; hash = "sha256-JF/+UuoZmK9CSbBs7XZQpTHqrsBNbzoMyLShZ086Fr4=";
}; };
installPhase = '' installPhase = ''

2
packages/obsidian/plugins/better-word-count/default.nix
View File

@@ -8,7 +8,7 @@ pkgs.buildNpmPackage rec {
owner = "lukeleppan"; owner = "lukeleppan";
repo = "better-word-count"; repo = "better-word-count";
rev = version; rev = version;
hash = "sha256-qyuZIcZHsUfyUMboE8GP26dIeo37fzhYuGccfQYffL4="; hash = "sha256-+z31nYnCrHjuV4ICVO+cKBM5q/zYA7Ju+J+6eU7t9Bo=";
}; };
patches = [ ./package-lock.patch ]; patches = [ ./package-lock.patch ];

6
packages/obsidian/plugins/dataview/default.nix
View File

@@ -2,19 +2,19 @@
# AUTO-UPDATE: nix-update --flake obsidian-plugin-dataview # AUTO-UPDATE: nix-update --flake obsidian-plugin-dataview
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian-plugin-dataview"; pname = "obsidian-plugin-dataview";
version = "0.5.67"; version = "0.5.68";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "blacksmithgu"; owner = "blacksmithgu";
repo = "obsidian-dataview"; repo = "obsidian-dataview";
rev = version; rev = version;
hash = "sha256-AbK1J1a8bqkPCe9dqADAfR/q/j/kRGa8qouj9GJQErc="; hash = "sha256-vmf96wjDrGeGVjZJGKUC8dUTu+lCxy0EIF5DkybAdko=";
}; };
patches = [ ./package-lock.patch ]; patches = [ ./package-lock.patch ];
makeCacheWritable = true; makeCacheWritable = true;
npmDepsHash = "sha256-FsPLpWcS27VWrDm5G1ZT6zvfOfYmKNLHzmjiXEmpGKE="; npmDepsHash = "sha256-9RZCDzY9ETs7DPQfBxig92rhA2iCOOKVqwbUJeTGqrY=";
npmPackFlags = [ "--ignore-scripts" ]; npmPackFlags = [ "--ignore-scripts" ];
installPhase = '' installPhase = ''

63
packages/obsidian/plugins/dataview/package-lock.patch
View File

@@ -1,35 +1,35 @@
diff --git a/package-lock.json b/package-lock.json diff --git a/package-lock.json b/package-lock.json
index 0c1b0bd..df26135 100644 index 252d39f..8115632 100644
--- a/package-lock.json --- a/package-lock.json
+++ b/package-lock.json +++ b/package-lock.json
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
{ {
"name": "obsidian-dataview", "name": "obsidian-dataview",
- "version": "0.5.66", - "version": "0.5.67",
+ "version": "0.5.67", + "version": "0.5.68",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "obsidian-dataview", "name": "obsidian-dataview",
- "version": "0.5.66", - "version": "0.5.67",
+ "version": "0.5.67", + "version": "0.5.68",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
- "@codemirror/language": "https://github.com/lishid/cm-language", - "@codemirror/language": "https://github.com/lishid/cm-language",
+ "@codemirror/language": "https://github.com/karaolidis/cm-language#package-lock", + "@codemirror/language": "github:karaolidis/cm-language#package-lock",
"@codemirror/state": "^6.0.1", "@codemirror/state": "^6.0.1",
"@codemirror/view": "^6.0.1", "@codemirror/view": "^6.0.1",
"emoji-regex": "^10.0.0", "emoji-regex": "^10.0.0",
@@ -687,29 +687,28 @@ @@ -688,29 +688,34 @@
"dev": true "dev": true
}, },
"node_modules/@codemirror/language": { "node_modules/@codemirror/language": {
- "version": "6.6.0", - "version": "6.6.0",
- "resolved": "git+ssh://git@github.com/lishid/cm-language.git#1aadcc247f20ccfda76424a9f853dbb4ee203fdc", - "resolved": "git+ssh://git@github.com/lishid/cm-language.git#1aadcc247f20ccfda76424a9f853dbb4ee203fdc",
- "license": "MIT",
+ "version": "6.10.1", + "version": "6.10.1",
+ "resolved": "git+ssh://git@github.com/karaolidis/cm-language.git#d6238f0a9e17e20d604cee67a47d3a93b00dd41c", + "resolved": "git+ssh://git@github.com/karaolidis/cm-language.git#d6238f0a9e17e20d604cee67a47d3a93b00dd41c",
"license": "MIT",
"dependencies": { "dependencies": {
"@codemirror/state": "^6.0.0", "@codemirror/state": "^6.0.0",
- "@codemirror/view": "^6.0.0", - "@codemirror/view": "^6.0.0",
@@ -45,46 +45,65 @@ index 0c1b0bd..df26135 100644
- "version": "6.2.1", - "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz",
- "integrity": "sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw==" - "integrity": "sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw=="
+ "version": "6.4.1", + "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
+ "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==" + "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
+ "license": "MIT",
+ "dependencies": {
+ "@marijn/find-cluster-break": "^1.0.0"
+ }
}, },
"node_modules/@codemirror/view": { "node_modules/@codemirror/view": {
- "version": "6.19.0", - "version": "6.19.0",
- "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.19.0.tgz", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.19.0.tgz",
- "integrity": "sha512-XqNIfW/3GaaF+T7Q1jBcRLCPm1NbrR2DBxrXacSt1FG+rNsdsNn3/azAfgpUoJ7yy4xgd8xTPa3AlL+y0lMizQ==", - "integrity": "sha512-XqNIfW/3GaaF+T7Q1jBcRLCPm1NbrR2DBxrXacSt1FG+rNsdsNn3/azAfgpUoJ7yy4xgd8xTPa3AlL+y0lMizQ==",
+ "version": "6.28.4", + "version": "6.36.4",
+ "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.28.4.tgz", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.4.tgz",
+ "integrity": "sha512-QScv95fiviSQ/CaVGflxAvvvDy/9wi0RFyDl4LkHHWiMr/UPebyuTspmYSeN5Nx6eujcPYwsQzA6ZIZucKZVHQ==", + "integrity": "sha512-ZQ0V5ovw/miKEXTvjgzRyjnrk9TwriUB1k4R5p7uNnHR9Hus+D1SXHGdJshijEzPFjU25xea/7nhIeSqYFKdbA==",
+ "license": "MIT",
"dependencies": { "dependencies": {
- "@codemirror/state": "^6.1.4", - "@codemirror/state": "^6.1.4",
+ "@codemirror/state": "^6.4.0", + "@codemirror/state": "^6.5.0",
"style-mod": "^4.1.0", "style-mod": "^4.1.0",
"w3c-keyname": "^2.2.4" "w3c-keyname": "^2.2.4"
} }
@@ -1133,9 +1132,9 @@ @@ -1134,9 +1139,10 @@
} }
}, },
"node_modules/@lezer/common": { "node_modules/@lezer/common": {
- "version": "1.0.4", - "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.4.tgz", - "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.4.tgz",
- "integrity": "sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg==" - "integrity": "sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg=="
+ "version": "1.2.1", + "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
+ "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==" + "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
+ "license": "MIT"
}, },
"node_modules/@lezer/highlight": { "node_modules/@lezer/highlight": {
"version": "1.1.6", "version": "1.1.6",
@@ -1154,6 +1160,12 @@
"@lezer/common": "^1.0.0"
}
},
+ "node_modules/@marijn/find-cluster-break": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
+ "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+ "license": "MIT"
+ },
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
diff --git a/package.json b/package.json diff --git a/package.json b/package.json
index db15b53..d3605a0 100644 index 4b5bdd1..6776b6c 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
"rollup-plugin-web-worker-loader": "^1.6.1" "typescript": "^5.2.2"
}, },
"dependencies": { "dependencies": {
- "@codemirror/language": "https://github.com/lishid/cm-language", - "@codemirror/language": "https://github.com/lishid/cm-language",
+ "@codemirror/language": "https://github.com/karaolidis/cm-language#package-lock", + "@codemirror/language": "github:karaolidis/cm-language#package-lock",
"@codemirror/state": "^6.0.1", "@codemirror/state": "^6.0.1",
"@codemirror/view": "^6.0.1", "@codemirror/view": "^6.0.1",
"emoji-regex": "^10.0.0", "emoji-regex": "^10.0.0",

6
packages/obsidian/plugins/excalidraw/default.nix
View File

@@ -2,13 +2,13 @@
# AUTO-UPDATE: nix-update --flake obsidian-plugin-excalidraw --subpackage mathjaxToSVG # AUTO-UPDATE: nix-update --flake obsidian-plugin-excalidraw --subpackage mathjaxToSVG
pkgs.buildNpmPackage rec { pkgs.buildNpmPackage rec {
pname = "obsidian.plugins.excalidraw"; pname = "obsidian.plugins.excalidraw";
version = "2.8.3"; version = "2.9.2";
pkg = pkgs.fetchFromGitHub { pkg = pkgs.fetchFromGitHub {
owner = "zsviczian"; owner = "zsviczian";
repo = "obsidian-excalidraw-plugin"; repo = "obsidian-excalidraw-plugin";
rev = version; rev = version;
hash = "sha256-vfswTT+FzzcddUQSoy6xseE+PzsWtRx8RkYzqGn6wFQ="; hash = "sha256-w6+8/VGQyvn1Oh4eSW2vrC8XPOmDU7+0xa6eMhngWHQ=";
}; };
mathjaxToSVG = pkgs.buildNpmPackage { mathjaxToSVG = pkgs.buildNpmPackage {
@@ -31,7 +31,7 @@ pkgs.buildNpmPackage rec {
src = pkg; src = pkg;
patches = [ ./package-lock.patch ]; patches = [ ./package-lock.patch ];
npmDepsHash = "sha256-6Y22TD6BMljRGrL/qT54F7bFXcQbY1bQ5GuKEqAXIwY="; npmDepsHash = "sha256-l4wEBtUt36xtnNI6LHI1kY95wRVuQrX4ImdQXLU3gO4=";
npmPackFlags = [ "--ignore-scripts" ]; npmPackFlags = [ "--ignore-scripts" ];
configurePhase = '' configurePhase = ''

7987
packages/obsidian/plugins/excalidraw/package-lock.patch
View File

File diff suppressed because it is too large Load Diff

4
packages/obsidian/plugins/tasks/default.nix
View File

@@ -2,13 +2,13 @@
# AUTO-UPDATE: nix-update --flake obsidian-plugin-tasks # AUTO-UPDATE: nix-update --flake obsidian-plugin-tasks
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
pname = "obsidian-plugin-tasks"; pname = "obsidian-plugin-tasks";
version = "7.18.1"; version = "7.18.3";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "obsidian-tasks-group"; owner = "obsidian-tasks-group";
repo = "obsidian-tasks"; repo = "obsidian-tasks";
rev = version; rev = version;
hash = "sha256-Vgw+uCaNZD9uGrDLaNHNDZeyYG0avSSMC7qkvTsy5zg="; hash = "sha256-8wWUvpMmOytX8uOvoopOK6wSS+ZvM7EmVX0R4dP0+uw=";
}; };
offlineCache = pkgs.fetchYarnDeps { offlineCache = pkgs.fetchYarnDeps {

50
packages/sas/viya4-orders-cli/better-config.patch
View File

@@ -1,8 +1,8 @@
diff --git a/README.md b/README.md diff --git a/README.md b/README.md
index db2292b..400fbc2 100644 index 4740e58..5fd44fe 100644
--- a/README.md --- a/README.md
+++ b/README.md +++ b/README.md
@@ -24,7 +24,7 @@ Available Commands: @@ -25,7 +25,7 @@ Available Commands:
license Download a license for the given order number at the given cadence name and version license Download a license for the given order number at the given cadence name and version
Flags: Flags:
@@ -10,17 +10,21 @@ index db2292b..400fbc2 100644
+ -c, --config string config file (default is $XDG_CONFIG_HOME/viya4-orders-cli/config.yaml) + -c, --config string config file (default is $XDG_CONFIG_HOME/viya4-orders-cli/config.yaml)
-n, --file-name string name of the file where you want the downloaded order asset to be stored -n, --file-name string name of the file where you want the downloaded order asset to be stored
(defaults: (defaults:
certs - SASViyaV4_<order number>_certs.zip assetHistory - assetHistory_<order number>.json
@@ -144,7 +144,7 @@ Take the following steps to start using SAS Viya Orders CLI: @@ -146,9 +146,9 @@ Take the following steps to start using SAS Viya Orders CLI:
1. If you want to use a configuration file, create it. 1. If you want to use a configuration file, create it.
- The default location for the configuration file is `$HOME/.viya4-orders-cli`. - The default location for the configuration file is `$HOME/.viya4-orders-cli` and the default format is [YAML](https://yaml.org/).
+ The default location for the configuration file is `$XDG_CONFIG_HOME/viya4-orders-cli/config.yaml`. - You can save the file anywhere you want and use any supported format, as long as you use the `--config` /
You can save the file anywhere you want as long as you use the `--config` / - `-c` option to specify its path and name to the CLI.
`-c` option to inform the CLI of any non-default location. + The default location for the configuration file is `$XDG_CONFIG_HOME/viya4-orders-cli/config.yaml` and the default format is [YAML](https://yaml.org/).
+ You can save the file anywhere you want as long as you use the `--config` /
+ `-c` option to inform the CLI of any non-default location.
@@ -195,7 +195,7 @@ You have the following options for launching SAS Viya Orders CLI: When using the `-c` option to specify a config file, that file must have a valid extension denoting its format. Supported
formats are [JSON](https://www.json.org/),
@@ -196,7 +196,7 @@ You have the following options for launching SAS Viya Orders CLI:
The examples in this section correspond to typical tasks that you might perform The examples in this section correspond to typical tasks that you might perform
using SAS Viya Orders CLI: using SAS Viya Orders CLI:
@@ -29,7 +33,7 @@ index db2292b..400fbc2 100644
convey your API credentials, get deployment assets for SAS Viya order `923456` convey your API credentials, get deployment assets for SAS Viya order `923456`
at the latest version of the Long Term Support (`lts`) cadence. Send the at the latest version of the Long Term Support (`lts`) cadence. Send the
contents to file `/c/Users/auser/vocli/sasfiles/923456_lts_depassets.tgz`: contents to file `/c/Users/auser/vocli/sasfiles/923456_lts_depassets.tgz`:
@@ -203,13 +203,13 @@ using SAS Viya Orders CLI: @@ -204,13 +204,13 @@ using SAS Viya Orders CLI:
```docker ```docker
docker run -v /c/Users/auser/vocli:/sasstuff viya4-orders-cli deploymentAssets 923456 lts \ docker run -v /c/Users/auser/vocli:/sasstuff viya4-orders-cli deploymentAssets 923456 lts \
@@ -46,7 +50,7 @@ index db2292b..400fbc2 100644
AssetName: deploymentAssets AssetName: deploymentAssets
AssetReqURL: https://api.sas.com/mysas/orders/923456/cadenceNames/lts/deploymentAssets AssetReqURL: https://api.sas.com/mysas/orders/923456/cadenceNames/lts/deploymentAssets
diff --git a/cmd/root.go b/cmd/root.go diff --git a/cmd/root.go b/cmd/root.go
index ad221c9..9707ed7 100644 index f8870da..9b0816a 100644
--- a/cmd/root.go --- a/cmd/root.go
+++ b/cmd/root.go +++ b/cmd/root.go
@@ -8,7 +8,6 @@ import ( @@ -8,7 +8,6 @@ import (
@@ -64,8 +68,8 @@ index ad221c9..9707ed7 100644
- "config file (default is $HOME/.viya4-orders-cli)") - "config file (default is $HOME/.viya4-orders-cli)")
+ "config file (default is $XDG_CONFIG_HOME/viya4-orders-cli/config.yaml)") + "config file (default is $XDG_CONFIG_HOME/viya4-orders-cli/config.yaml)")
rootCmd.PersistentFlags().StringVarP(&assetFileName, "file-name", "n", "", rootCmd.PersistentFlags().StringVarP(&assetFileName, "file-name", "n", "",
"name of the file where you want the downloaded order asset stored\n"+ "name of the file where you want the downloaded order asset to be stored\n"+
"(defaults:\n\tcerts - SASViyaV4_<order number>_certs.zip\n\tlicense and depassets - SASViyaV4_<order number>_<renewal sequence>_<cadence information>_<asset name>_<date time stamp>."+ "(defaults:\n\tassetHistory - assetHistory_<order number>.json\n\tcerts - SASViyaV4_<order number>_certs.zip\n\tlicense and depassets - SASViyaV4_<order number>_<renewal sequence>_<cadence information>_<asset name>_<date time stamp>."+
@@ -74,16 +73,9 @@ func initConfig() { @@ -74,16 +73,9 @@ func initConfig() {
// Use config file from the flag. // Use config file from the flag.
viper.SetConfigFile(cfgFile) viper.SetConfigFile(cfgFile)
@@ -87,30 +91,30 @@ index ad221c9..9707ed7 100644
} }
diff --git a/go.mod b/go.mod diff --git a/go.mod b/go.mod
index fbb9bb4..5008b3b 100644 index 9fc71bd..0354b7c 100644
--- a/go.mod --- a/go.mod
+++ b/go.mod +++ b/go.mod
@@ -3,7 +3,6 @@ module github.com/sassoftware/viya4-orders-cli @@ -3,7 +3,6 @@ module github.com/sassoftware/viya4-orders-cli
go 1.19 go 1.22
require ( require (
- github.com/mitchellh/go-homedir v1.1.0 - github.com/mitchellh/go-homedir v1.1.0
github.com/spf13/cobra v1.6.1 github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.15.0 github.com/spf13/viper v1.19.0
golang.org/x/oauth2 v0.5.0 golang.org/x/oauth2 v0.26.0
diff --git a/go.sum b/go.sum diff --git a/go.sum b/go.sum
index 2f4164a..507c254 100644 index b687b77..0e1433c 100644
--- a/go.sum --- a/go.sum
+++ b/go.sum +++ b/go.sum
@@ -140,8 +140,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -23,8 +23,6 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
diff --git a/lib/authn/authn.go b/lib/authn/authn.go diff --git a/lib/authn/authn.go b/lib/authn/authn.go
index a35c405..6345b6f 100644 index a35c405..6345b6f 100644
--- a/lib/authn/authn.go --- a/lib/authn/authn.go

4
packages/sas/viya4-orders-cli/default.nix
View File

@@ -8,10 +8,10 @@ pkgs.buildGoModule rec {
owner = "sassoftware"; owner = "sassoftware";
repo = "viya4-orders-cli"; repo = "viya4-orders-cli";
rev = version; rev = version;
hash = "sha256-ccYQHIHT+zR94KL2B51G4J33L7obYUxh+ilDvatW7dI="; hash = "sha256-0AZBKxQC3NDgwtdnso0zEd4h9PBexFzqig4tWoHJTFM=";
}; };
vendorHash = "sha256-iDNSV+oYNela4kFtkLppUIL5/hR1dEbPPuOlN5a5MfE="; vendorHash = "sha256-EsDdrmcFnsU0woXe562lb5Hx/7yZvYYR6GmNxPJEsxM=";
patches = [ ./better-config.patch ]; patches = [ ./better-config.patch ];

2
submodules/home-manager

Submodule submodules/home-manager updated: f0683dbe14...b6fd8989ab

2
submodules/nixpkgs

Submodule submodules/nixpkgs updated: 5e62f98f7d...e19afdd5ba

2
submodules/spicetify-nix

Submodule submodules/spicetify-nix updated: e490b7596e...1f74b924cf