From 5b157e174ecce8731e1ad7e5fc59d31ee5c66b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlys=20Bras=20de=20fer?= Date: Wed, 27 Dec 2023 14:06:58 +0100 Subject: [PATCH] Downgrade joplin-desktop to 2.12.16 --- flake.lock | 17 +++++++++++++++++ flake.nix | 14 ++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 0a95118..7ed20d8 100644 --- a/flake.lock +++ b/flake.lock @@ -36,6 +36,22 @@ "type": "github" } }, + "nixpkgs-joplin": { + "locked": { + "lastModified": 1695837737, + "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "517501bcf14ae6ec47efd6a17dda0ca8e6d866f9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "517501bcf14ae6ec47efd6a17dda0ca8e6d866f9", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1703620235, @@ -55,6 +71,7 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", + "nixpkgs-joplin": "nixpkgs-joplin", "nur": "nur" } } diff --git a/flake.nix b/flake.nix index b5799d3..aa327ef 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-joplin.url = "github:nixos/nixpkgs/517501bcf14ae6ec47efd6a17dda0ca8e6d866f9"; # 2.12.16 + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -10,9 +12,9 @@ nur.url = "github:nix-community/NUR"; }; - outputs = { nixpkgs, home-manager, nur, ... }: { + outputs = { nixpkgs, home-manager, nur, ... }@ inputs: { nixosConfigurations = { - nixos = nixpkgs.lib.nixosSystem { + nixos = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = [ @@ -29,6 +31,14 @@ extraSpecialArgs.nur = config.nur; }; }) + + { + nixpkgs.overlays = [ + (final: prev: { + inherit (inputs.nixpkgs-joplin.legacyPackages.${system}) joplin-desktop; + }) + ]; + } ]; }; };