diff --git a/flake.lock b/flake.lock
index be3a0e2..dce5748 100644
--- a/flake.lock
+++ b/flake.lock
@@ -27,11 +27,11 @@
]
},
"locked": {
- "lastModified": 1712356478,
- "narHash": "sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA=",
+ "lastModified": 1714103775,
+ "narHash": "sha256-kcBiIrmqzt3bNTr2GMBfAyA+on8BEKO1iKzzDFQZkjI=",
"owner": "nix-community",
"repo": "disko",
- "rev": "0a17298c0d96190ef3be729d594ba202b9c53beb",
+ "rev": "285e26465a0bae510897ca04da26ce6307c652b4",
"type": "github"
},
"original": {
@@ -157,11 +157,11 @@
]
},
"locked": {
- "lastModified": 1710638592,
- "narHash": "sha256-R6477tybK4LBP8MKlmMyvndTcZR1Ofi/XA9nDEVcViY=",
+ "lastModified": 1712623723,
+ "narHash": "sha256-jPD5+M+QPyMRk52zfFMIeHdv7yXYJ/yNGqwS0PhYF+E=",
"owner": "reckenrode",
"repo": "nix-foundryvtt",
- "rev": "0e61d84370fd051d873216553d09e596b7ad3a34",
+ "rev": "6025615b431170558c3c13f16b549fc0126425e1",
"type": "github"
},
"original": {
@@ -210,11 +210,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1712437997,
- "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
+ "lastModified": 1713638189,
+ "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
+ "rev": "74574c38577914733b4f7a775dd77d24245081dd",
"type": "github"
},
"original": {
@@ -226,11 +226,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1712439257,
- "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
+ "lastModified": 1714253743,
+ "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
+ "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
},
"original": {
@@ -242,11 +242,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1712437997,
- "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
+ "lastModified": 1714272655,
+ "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
+ "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf",
"type": "github"
},
"original": {
@@ -281,11 +281,11 @@
]
},
"locked": {
- "lastModified": 1712538578,
- "narHash": "sha256-+fFOtg2fQK6kafSucYDpMG8ENXgo52+YSQtCoXv/+Ik=",
+ "lastModified": 1713333471,
+ "narHash": "sha256-sIVQKOXzruxtTYiBRHZa8UQH+CSIa9K5MZlY6vavYfA=",
"owner": "berberman",
"repo": "nvfetcher",
- "rev": "1463db224a54cbc9499860ef5a51a9b6bf7c3180",
+ "rev": "2a824322dc6a755ffda83a13b948d42304521e4d",
"type": "github"
},
"original": {
@@ -442,11 +442,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1712458908,
- "narHash": "sha256-DMgBS+jNHDg8z3g9GkwqL8xTKXCRQ/0FGsAyrniVonc=",
+ "lastModified": 1713892811,
+ "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "39191e8e6265b106c9a2ba0cfd3a4dafe98a31c6",
+ "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index f9941ba..ae22b2e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -140,9 +140,17 @@
sops-nix.packages.${system}.sops-import-keys-hook
];
- packages = [
+ packages = with pkgs; [
sops-nix.packages.${system}.sops-init-gpg-key
deploy-rs.packages.${system}.default
+
+ cargo
+ clippy
+ rustc
+ rustfmt
+ rust-analyzer
+ pkg-config
+ openssl
];
};
};
diff --git a/pkgs/_sources_nextcloud/generated.json b/pkgs/_sources_nextcloud/generated.json
index c45e204..ce9ac04 100644
--- a/pkgs/_sources_nextcloud/generated.json
+++ b/pkgs/_sources_nextcloud/generated.json
@@ -77,10 +77,10 @@
"passthru": null,
"pinned": false,
"src": {
- "sha256": "sha256-h6RWWIQzpwObDmcGnZPwVwIJZFUXgggeCKBNwI/wDIo=",
+ "sha256": "sha256-ydpxatwuZUz7XIgK8FMklZlxNQklpsP8Uqpxvt3iK0k=",
"type": "tarball",
- "url": "https://github.com/nextcloud/notes/releases/download/v4.9.4/notes.tar.gz"
+ "url": "https://github.com/nextcloud/notes/releases/download/v4.10.0/notes.tar.gz"
},
- "version": "v4.9.4"
+ "version": "v4.10.0"
}
}
\ No newline at end of file
diff --git a/pkgs/_sources_nextcloud/generated.nix b/pkgs/_sources_nextcloud/generated.nix
index 1d0f3a0..c77aa9c 100644
--- a/pkgs/_sources_nextcloud/generated.nix
+++ b/pkgs/_sources_nextcloud/generated.nix
@@ -43,10 +43,10 @@
};
notes = {
pname = "notes";
- version = "v4.9.4";
+ version = "v4.10.0";
src = fetchTarball {
- url = "https://github.com/nextcloud/notes/releases/download/v4.9.4/notes.tar.gz";
- sha256 = "sha256-h6RWWIQzpwObDmcGnZPwVwIJZFUXgggeCKBNwI/wDIo=";
+ url = "https://github.com/nextcloud/notes/releases/download/v4.10.0/notes.tar.gz";
+ sha256 = "sha256-ydpxatwuZUz7XIgK8FMklZlxNQklpsP8Uqpxvt3iK0k=";
};
};
}
diff --git a/pkgs/afvalcalendar/src/main.rs b/pkgs/afvalcalendar/src/main.rs
index b6a5fb0..e8023f7 100644
--- a/pkgs/afvalcalendar/src/main.rs
+++ b/pkgs/afvalcalendar/src/main.rs
@@ -3,8 +3,13 @@ mod trash;
#[tokio::main]
async fn main() {
- let dates = trash::get_pickup_dates().await.unwrap();
- let calendar = calendar::calendar_from_pickup_dates(dates);
-
- calendar.print().unwrap();
+ match trash::get_pickup_dates().await {
+ Ok(dates) => {
+ let calendar = calendar::calendar_from_pickup_dates(dates);
+ calendar.print().unwrap();
+ }
+ Err(error) => {
+ eprintln!("{}", error);
+ }
+ }
}
diff --git a/pkgs/nextcloud-apps.toml b/pkgs/nextcloud-apps.toml
index 25ac8d9..36566db 100644
--- a/pkgs/nextcloud-apps.toml
+++ b/pkgs/nextcloud-apps.toml
@@ -1,24 +1,29 @@
[bookmarks]
-src.github = "nextcloud/bookmarks"
+# src.github = "nextcloud/bookmarks"
src.prefix = "v"
+src.manual = "v13.1.3"
fetch.tarball = "https://github.com/nextcloud/bookmarks/releases/download/v$ver/bookmarks-$ver.tar.gz"
[calendar]
-src.github = "nextcloud-releases/calendar"
+# src.github = "nextcloud-releases/calendar"
+src.manual = "v4.6.7"
fetch.tarball = "https://github.com/nextcloud-releases/calendar/releases/download/$ver/calendar-$ver.tar.gz"
[contacts]
-src.github = "nextcloud-releases/contacts"
+# src.github = "nextcloud-releases/contacts"
+src.manual = "v5.5.3"
fetch.tarball = "https://github.com/nextcloud-releases/contacts/releases/download/$ver/contacts-$ver.tar.gz"
[cookbook]
# src.github = "christianlupus-nextcloud/cookbook-releases"
-src.manual = "v0.10.5"
src.prefix = "v"
+src.manual = "0.10.5"
fetch.tarball = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v$ver/Cookbook-$ver.tar.gz"
[news]
-src.github = "nextcloud/news"
+# src.github = "nextcloud/news"
+# Update to 25 when angular rewrite is done/the alpha when I need to switch to nextcloud 28+
+src.manual = "24.0.0"
fetch.tarball = "https://github.com/nextcloud/news/releases/download/$ver/news.tar.gz"
[notes]