From 97d6bf380aa4c094e0e97d437fb6760376e5da92 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 18 Mar 2025 23:35:14 +0100 Subject: [PATCH] logseq: pull in an unstable more recent version from development branch Allows getting rid of insecure ancient electron_27 --- common/packages.nix | 1 - flake.lock | 17 +++++++++++++++++ flake.nix | 1 + home/modules/packages.nix | 3 +-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/common/packages.nix b/common/packages.nix index db8de1e..9634e2a 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -11,7 +11,6 @@ nixpkgs.config.permittedInsecurePackages = [ # (temporarily) permit the usage of libolm "olm-3.2.16" - "electron-27.3.11" # logseq ]; # List packages installed in system profile. diff --git a/flake.lock b/flake.lock index 258af3b..23a8b16 100644 --- a/flake.lock +++ b/flake.lock @@ -214,6 +214,22 @@ "type": "github" } }, + "nix-logseq-unstable": { + "locked": { + "lastModified": 1742136863, + "narHash": "sha256-y8w/QKc6O3ZACA8gmraVl3ChIbtX+Ojl4RXrUWu9vpU=", + "owner": "TomaSajt", + "repo": "nixpkgs", + "rev": "1e18638e96cd3264a55f0831bc9866758dacd1bc", + "type": "github" + }, + "original": { + "owner": "TomaSajt", + "ref": "logseq", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1742217307, @@ -367,6 +383,7 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", + "nix-logseq-unstable": "nix-logseq-unstable", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 5053a22..3577777 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nix-logseq-unstable.url = "github:TomaSajt/nixpkgs/logseq"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index ed223b6..2cf8c42 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -184,7 +184,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - logseq + inputs.nix-logseq-unstable.legacyPackages.${system}.logseq # for Hibiscus banking software jameica @@ -260,7 +260,6 @@ in nixpkgs.config = { permittedInsecurePackages = [ - "electron-27.3.11" # logseq # (temporarily) permit the usage of libolm "olm-3.2.16" ];