matrix-conduit: Stop using the version from unstable
This commit is contained in:
parent
7a2b862235
commit
19576ffb1e
17
flake.lock
17
flake.lock
|
@ -289,22 +289,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1667610399,
|
||||
"narHash": "sha256-XZd0f4ZWAY0QOoUSdiNWj/eFiKb4B9CJPtl9uO9SYY4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1dd8696f96db47156e1424a49578fe7dd4ce99a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1667564121,
|
||||
|
@ -406,7 +390,6 @@
|
|||
"inputs": {
|
||||
"deploy-rs": "deploy-rs",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nvfetcher": "nvfetcher",
|
||||
"sops-nix": "sops-nix",
|
||||
"tlaternet-webserver": "tlaternet-webserver"
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
deploy-rs.url = "github:serokell/deploy-rs";
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
|
@ -22,7 +21,6 @@
|
|||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
sops-nix,
|
||||
nvfetcher,
|
||||
deploy-rs,
|
||||
|
@ -66,7 +64,7 @@
|
|||
# Helper functions #
|
||||
####################
|
||||
lib = import ./lib {
|
||||
inherit nixpkgs nixpkgs-unstable sops-nix tlaternet-webserver;
|
||||
inherit nixpkgs sops-nix tlaternet-webserver;
|
||||
lib = nixpkgs.lib;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
sops-nix,
|
||||
tlaternet-webserver,
|
||||
}: let
|
||||
|
@ -25,15 +24,6 @@ in {
|
|||
sops-nix.nixosModules.sops
|
||||
tlaternet-webserver.nixosModules.default
|
||||
(import ../configuration)
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
matrix-conduit = nixpkgs-unstable.legacyPackages.${system}.matrix-conduit.override {
|
||||
inherit (self) stdenv lib fetchFromGitLab rustPlatform pkg-config rocksdb;
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
]
|
||||
++ extraModules;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue