From 963b31160a93d71c5ae3cfedbe2da3c7748747e5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 8 Apr 2024 21:04:54 +0200 Subject: [PATCH] update lock --- flake.lock | 78 +++++++++++++-------------- upstream/modules/appimage/default.nix | 33 ------------ upstream/modules/default.nix | 1 - 3 files changed, 39 insertions(+), 73 deletions(-) delete mode 100644 upstream/modules/appimage/default.nix diff --git a/flake.lock b/flake.lock index d206e43..580851f 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1711934712, - "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", + "lastModified": 1712356478, + "narHash": "sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA=", "owner": "nix-community", "repo": "disko", - "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", + "rev": "0a17298c0d96190ef3be729d594ba202b9c53beb", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1711944236, - "narHash": "sha256-ojbn/vd70A0q5exwbBwOLzTFODQls1BrkghShqqouUM=", + "lastModified": 1712599849, + "narHash": "sha256-ruu2SZCSlm2hYbesJriuPFnC5jx5t9+EeIJfsVGI2a0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "bf108287a1a055d42b769328e2e18333bb5f842e", + "rev": "47800ce1e512d0dfb814394f97616cdc0e8ce786", "type": "gitlab" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1711915616, - "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=", + "lastModified": 1712462372, + "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=", "owner": "nix-community", "repo": "home-manager", - "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6", + "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9", "type": "github" }, "original": { @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1711231487, - "narHash": "sha256-dRdFjStMA7GeuD/V4vzKblzuHwxMPgzEboRleVdZlUM=", + "lastModified": 1712521891, + "narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1171169117f63f1de9ef2ea36efd8dcf377c6d5a", + "rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixlib_2": { "locked": { - "lastModified": 1711846064, - "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=", + "lastModified": 1712450863, + "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "90b1a963ff84dc532db92f678296ff2499a60a87", + "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "type": "github" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1711932680, - "narHash": "sha256-CEpVtyB7uyRprTuiG+lpWWMvM/C0CbY/dbBuxT5BDwM=", + "lastModified": 1712537332, + "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "1f4c32ca4295bb7cca1e48a2f39b65490b249b0b", + "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933", "type": "github" }, "original": { @@ -381,11 +381,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1711352745, - "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", + "lastModified": 1712566108, + "narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", + "rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { @@ -428,11 +428,11 @@ ] }, "locked": { - "lastModified": 1711760932, - "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", + "lastModified": 1712055707, + "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c11e43aed6f17336c25cd120eac886b96c455731", + "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", "type": "github" }, "original": { @@ -452,11 +452,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711877037, - "narHash": "sha256-I7saIsZCSf2JY/oMQphDqUZAfp+UDeZFjTA4IV6tSXI=", + "lastModified": 1712479783, + "narHash": "sha256-EanPoBgWxzQX38xM+SL2STM/tA2T5pR3NSzRbQiCI98=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "a2d28f6872841d047ce3854365c595ebf941b848", + "rev": "70f7e0878e00e66192271a19a0c935be7ab08cd1", "type": "github" }, "original": { @@ -513,11 +513,11 @@ ] }, "locked": { - "lastModified": 1711932894, - "narHash": "sha256-aiMc4JHJU72cbkeHPDBE8pQEOel/RrW8YkGXelRvFn8=", + "lastModified": 1712537533, + "narHash": "sha256-7am1D7k7xn0q7VfRgS9lFBaBFSFLiiQilCRQagPjQHE=", "owner": "nix-community", "repo": "srvos", - "rev": "e5a5f15acaff9daa69e7ef5596f6985ec695685f", + "rev": "ea19f15cf66d334f9a20a8b0bd0a260aff8919a6", "type": "github" }, "original": { @@ -544,11 +544,11 @@ "tela-icon-theme": { "flake": false, "locked": { - "lastModified": 1711940547, - "narHash": "sha256-nPP0GvM9zt1zaLFDw515Vx7uxq+T1mDifOi7tiCRnf0=", + "lastModified": 1712393207, + "narHash": "sha256-tAcUojcMdKEhJweNHqp0XyjZYi3+fp0xBiHWQI1Vj4Q=", "owner": "vinceliuice", "repo": "Tela-icon-theme", - "rev": "7698d422b7cdcdb5fa422cf17465d8390b48e8af", + "rev": "2928bdb775bb4279a22ea858f1bdef7c25afe75e", "type": "github" }, "original": { diff --git a/upstream/modules/appimage/default.nix b/upstream/modules/appimage/default.nix deleted file mode 100644 index 0011c2f..0000000 --- a/upstream/modules/appimage/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, config, pkgs, ... }: - -let - cfg = config.programs.appimage; -in - -{ - options.programs.appimage = { - enable = lib.mkEnableOption "appimage-run wrapper script for executing appimages on NixOS"; - binfmt = lib.mkEnableOption "binfmt registration to run appimages via appimage-run seamlessly"; - package = lib.mkPackageOption pkgs "appimage-run" { - example = '' - pkgs.appimage-run.override { - extraPkgs = pkgs: [ pkgs.ffmpeg pkgs.imagemagick ]; - } - ''; - }; - }; - - config = lib.mkIf cfg.enable { - boot.binfmt.registrations.appimage = lib.mkIf cfg.binfmt { - wrapInterpreterInShell = false; - interpreter = lib.getExe cfg.package; - recognitionType = "magic"; - offset = 0; - mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; - magicOrExtension = ''\x7fELF....AI\x02''; - }; - environment.systemPackages = [ cfg.package ]; - }; - - meta.maintainers = with lib.maintainers; [ jopejoe1 atemu ]; -} diff --git a/upstream/modules/default.nix b/upstream/modules/default.nix index 847db5c..c08a416 100644 --- a/upstream/modules/default.nix +++ b/upstream/modules/default.nix @@ -2,6 +2,5 @@ { imports = [ - ./appimage ]; }