summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrigory Shipunov2022-10-28 01:57:00 +0200
committerGrigory Shipunov2022-10-28 01:57:00 +0200
commitcbe96a1738148571b8e027f26f777cd12b3259b4 (patch)
treee225f71b942178d1488b0c658ffd274a07555f4a
parent846e9e536db9286950120caf2fcd3f02a5b04b9d (diff)
yolo
-rw-r--r--flake.lock38
-rw-r--r--flake.nix1
-rw-r--r--hosts/microwave/configuration.nix2
-rw-r--r--pkgs/imhex.nix17
4 files changed, 38 insertions, 20 deletions
diff --git a/flake.lock b/flake.lock
index d4f8b3c..0c8fee1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1666691950,
- "narHash": "sha256-0+gJByTBEY/GlXXaV6b40ZgRJ0tH7YZubLGCQdVJFww=",
+ "lastModified": 1666900021,
+ "narHash": "sha256-KEDx6LhRMxEdLXL1jF1LNIm+QCtOCcKcFmTJrA/iU3E=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "87099c473e76a499ee78fcc4cda9f7c0a88db0ca",
+ "rev": "b3f81bcbda84bf2ef957cfff6cf89aedbdfa2be9",
"type": "github"
},
"original": {
@@ -27,11 +27,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1666681245,
- "narHash": "sha256-zrTNsPi/aGxixmdXC20gL2MZ1JbIG1ePPXovDSEO6Y4=",
+ "lastModified": 1666852257,
+ "narHash": "sha256-axGHhzM8/h4FT3p89vbvo4oYj1usGOp1IT2EqOUh2H0=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "736b83b304d0a75e863170ecd2b60618e882825c",
+ "rev": "dae71d8923f0721d587fb29d4d1724df008ae019",
"type": "github"
},
"original": {
@@ -108,10 +108,10 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1666528161,
- "narHash": "sha256-PFOQSC0x4xPD1p/GZIbpKuoEBu6M8HnEOeNRiBUCELA=",
- "path": "/nix/store/ml0shjsrv72lsa3l43aci55wxpc18bpk-source",
- "rev": "471d92178b978fcbad8db27c2e8a4e737d4e0e27",
+ "lastModified": 1666767323,
+ "narHash": "sha256-drbsgF8iLzQQ6umzOU/idYkI+UoifQdpH+mwohB3J7c=",
+ "path": "/nix/store/qxspy38dddsjpbgzxlvh41fvwky1ym0i-source",
+ "rev": "e6e675cafe6a1d1b0eeb9ac3fe046091244b714e",
"type": "path"
},
"original": {
@@ -137,11 +137,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1666629043,
- "narHash": "sha256-Yoq6Ut2F3Ol73yO9hG93x6ts5c4F5BhKTbcF3DtBEAw=",
+ "lastModified": 1666792786,
+ "narHash": "sha256-uG81j5Axyps2IjedvlmRbWhCCUXOAI4wNpH3O0dVG0s=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b39fd6e4edef83cb4a135ebef98751ce23becc33",
+ "rev": "5bdb380ee7fa036d47b19e9d854928f4881c50a1",
"type": "github"
},
"original": {
@@ -153,11 +153,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1666610816,
- "narHash": "sha256-q4F2VNe5bpxXOvp16DyLwE1SgNZMbNO29ZQJPIomedg=",
+ "lastModified": 1666767323,
+ "narHash": "sha256-drbsgF8iLzQQ6umzOU/idYkI+UoifQdpH+mwohB3J7c=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6107f97012a0c134c5848125b5aa1b149b76d2c9",
+ "rev": "e6e675cafe6a1d1b0eeb9ac3fe046091244b714e",
"type": "github"
},
"original": {
@@ -181,11 +181,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1666620525,
- "narHash": "sha256-XL/8MDKydIni4ObTvuXBOVT+i87TLlutFPxYcd0Cy8I=",
+ "lastModified": 1666807967,
+ "narHash": "sha256-UN55jYNsYrz8HRYan3Hq2wl4qnsqI9BVh6n4H/LSrs0=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "53b6d69e931a52cca44ef94c3b713b4d255754b8",
+ "rev": "0340b51ff710daf8e8b8895e8fc1a12c95e8886f",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 707d876..77db18a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,7 @@
in
{
packages.slick = pkgs.callPackage "${self}/pkgs/slick.nix" { };
+ packages.imhex = pkgs.callPackage "${self}/pkgs/imhex.nix" { };
})
//
{
diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix
index 83475be..1e3f038 100644
--- a/hosts/microwave/configuration.nix
+++ b/hosts/microwave/configuration.nix
@@ -15,7 +15,7 @@
tdesktop
signal-desktop
cubicsdr
- #kicad
+ kicad
gimp
inkscape
];
diff --git a/pkgs/imhex.nix b/pkgs/imhex.nix
new file mode 100644
index 0000000..f7d912f
--- /dev/null
+++ b/pkgs/imhex.nix
@@ -0,0 +1,17 @@
+{ stdenv, lib, cmake, openssl, pkgconfig, wrapQtAppsHook, fetchFromGithub }: {
+ stdenv.mkDerivation rec {
+ pname = "imhex";
+ version = "1.24.3";
+
+ src = fetchFromGithub {
+ owner = "WerWolv";
+ repo = "ImHex";
+ rev = "v${version}";
+ sha256 = lib.fakeSha256;
+ };
+ };
+
+ nariveBuildInputs = [
+ cmake
+ ];
+}