From 3266df0ae9c01861090c6e3e22e42d677fc04f9a Mon Sep 17 00:00:00 2001 From: Kristian Krsnik Date: Sat, 3 Feb 2024 17:39:57 +0100 Subject: [PATCH] Added Scanned Image Extractor Application --- flake.lock | 144 +++++++++++++++++++++++++++++++++--- flake.nix | 7 ++ systems/common/packages.nix | 1 + 3 files changed, 141 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 3bb7a1e..2bb5e48 100644 --- a/flake.lock +++ b/flake.lock @@ -1,13 +1,29 @@ { "nodes": { + "appimage-runtime": { + "flake": false, + "locked": { + "lastModified": 1652289700, + "narHash": "sha256-uxQBDy/JA7uEboTOUmGaZ2FAKY/0dQ9c0A0N8+J+a7I=", + "owner": "AppImageCrafters", + "repo": "appimage-runtime", + "rev": "6500a1ef68e039caba2ebab1c7ed74c2ea9e67a5", + "type": "github" + }, + "original": { + "owner": "AppImageCrafters", + "repo": "appimage-runtime", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -32,7 +48,38 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -50,7 +97,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -108,6 +155,28 @@ "type": "github" } }, + "nix-appimage": { + "inputs": { + "appimage-runtime": "appimage-runtime", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2", + "squashfuse": "squashfuse" + }, + "locked": { + "lastModified": 1695276866, + "narHash": "sha256-/BBbYIoDhIPcVwhvau/g4lzrjTnudeRLW5qaTu7LAVs=", + "owner": "ralismark", + "repo": "nix-appimage", + "rev": "17dd6001ec228ea0b8505d6904fc5796d3de5012", + "type": "github" + }, + "original": { + "owner": "ralismark", + "repo": "nix-appimage", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -193,6 +262,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1659526864, + "narHash": "sha256-XFzXrc1+6DZb9hBgHfEzfwylPUSqVFJbQPs8eOgYufU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "478f3cbc8448b5852539d785fbfe9a53304133be", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.05", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1684570954, "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", @@ -208,7 +292,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1675309347, "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", @@ -241,7 +325,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": [ "wallpaper", "flake-utils" @@ -275,11 +359,49 @@ "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", + "scanned-image-extractor": "scanned-image-extractor", "starc": "starc", "vscode-extensions": "vscode-extensions", "wallpaper": "wallpaper" } }, + "scanned-image-extractor": { + "inputs": { + "nix-appimage": "nix-appimage", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706818288, + "narHash": "sha256-QpIHjA+z83IeRQjxQr+I7/sRirF5WFgN2RvVZR1sCDg=", + "ref": "refs/heads/main", + "rev": "eeb1cd6647500c452af2db570c45008583691743", + "revCount": 8, + "type": "git", + "url": "https://git.krsnik.at/Kristian/scanned-image-extractor.git" + }, + "original": { + "type": "git", + "url": "https://git.krsnik.at/Kristian/scanned-image-extractor.git" + } + }, + "squashfuse": { + "flake": false, + "locked": { + "lastModified": 1655253282, + "narHash": "sha256-RIhDXzpmrYUOwj5OYzjWKJw0cwE+L3t/9pIkg/hFXA0=", + "owner": "vasi", + "repo": "squashfuse", + "rev": "d1d7ddafb765098b34239eacaf2f9abee1fbc27c", + "type": "github" + }, + "original": { + "owner": "vasi", + "repo": "squashfuse", + "type": "github" + } + }, "starc": { "inputs": { "nixpkgs": [ @@ -317,9 +439,9 @@ }, "vscode-extensions": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1701566649, @@ -337,8 +459,8 @@ }, "wallpaper": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { diff --git a/flake.nix b/flake.nix index bd320c2..acc9abb 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,11 @@ url = "git+https://git.krsnik.at/Kristian/starc-flake.git"; inputs.nixpkgs.follows = "nixpkgs"; }; + + scanned-image-extractor = { + url = "git+https://git.krsnik.at/Kristian/scanned-image-extractor.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -44,6 +49,7 @@ nix-index-database, vscode-extensions, starc, + scanned-image-extractor, }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -80,6 +86,7 @@ # own programs starc = starc.packages.${system}.default; + scanned-image-extractor = scanned-image-extractor.packages.${system}.default; } ) ( # Overrides davinci-resolve with the unstable version because of https://github.com/NixOS/nixpkgs/pull/246074 diff --git a/systems/common/packages.nix b/systems/common/packages.nix index 905540d..b7d89b4 100644 --- a/systems/common/packages.nix +++ b/systems/common/packages.nix @@ -78,6 +78,7 @@ obsidian starc + scanned-image-extractor rustdesk wireshark