Compare commits
4 commits
202bab9d5d
...
83fb160819
Author | SHA1 | Date | |
---|---|---|---|
83fb160819 | |||
884a06bfe1 | |||
9afdfdeeab | |||
0ae2504b5d |
3 changed files with 13 additions and 21 deletions
|
@ -1,10 +1,12 @@
|
||||||
let self = {
|
{
|
||||||
lock ? import lockFile,
|
lock ? import lockFile,
|
||||||
lockFile ? ./lock.nix,
|
lockFile ? ./lock.nix,
|
||||||
pkgs ? throw "inputs called without pkgs",
|
pkgs ? throw "inputs called without pkgs",
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{
|
let
|
||||||
|
|
||||||
|
self = {
|
||||||
inherit lock;
|
inherit lock;
|
||||||
nixos-vscode-server = rec {
|
nixos-vscode-server = rec {
|
||||||
url = "https://github.com/nix-community/nixos-vscode-server/archive/${lock.nixos-vscode-server.revision}.tar.gz";
|
url = "https://github.com/nix-community/nixos-vscode-server/archive/${lock.nixos-vscode-server.revision}.tar.gz";
|
||||||
|
@ -110,4 +112,5 @@ let self = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
in self
|
in self
|
||||||
|
|
12
lock.nix
12
lock.nix
|
@ -4,19 +4,19 @@
|
||||||
sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=";
|
sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=";
|
||||||
};
|
};
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
revision = "1eae3268880484be84199bdb77941c09bb4a97ba";
|
revision = "5630cf13cceac06cefe9fc607e8dfa8fb342dde3";
|
||||||
sha256 = "sha256-1Sj8MToixDwakJYNMYBS/PYbg8Oa4CAxreXraMHB5qg=";
|
sha256 = "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=";
|
||||||
};
|
};
|
||||||
nixpkgs-unstable = {
|
nixpkgs-unstable = {
|
||||||
revision = "c11863f1e964833214b767f4a369c6e6a7aba141";
|
revision = "f771eb401a46846c1aebd20552521b233dd7e18b";
|
||||||
sha256 = "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=";
|
sha256 = "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=";
|
||||||
};
|
};
|
||||||
nix-bitcoin = {
|
nix-bitcoin = {
|
||||||
revision = "990805aa7c7fcd1552c6e14e8c6df9a88ba9be41";
|
revision = "990805aa7c7fcd1552c6e14e8c6df9a88ba9be41";
|
||||||
sha256 = "sha256-yU7iYlDSD8lOrm02igxIl3y+bXGZDDO0qcG0gO48Cto=";
|
sha256 = "sha256-yU7iYlDSD8lOrm02igxIl3y+bXGZDDO0qcG0gO48Cto=";
|
||||||
};
|
};
|
||||||
cosmic-modules = {
|
cosmic-modules = {
|
||||||
revision = "84d7c1002734f21f150c641da095c5ce43f1cb98";
|
revision = "998c6a241cf458adb98c214bbaca6cde0c01851b";
|
||||||
sha256 = "sha256-Rbw+E3Na694sTPjNSRFHtT1o31eQXO3OLEzM+25kcME=";
|
sha256 = "sha256-2StppY6gXH8of4W9LBGS/e7XQL+rAr+p5LDyeSx6uTY=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,21 +8,10 @@ self: super:
|
||||||
let
|
let
|
||||||
nixos-cosmic = inputs.cosmic-modules;
|
nixos-cosmic = inputs.cosmic-modules;
|
||||||
|
|
||||||
# Pinned unstable nixpkgs from cosmic-modules
|
# Initialize pinned unstable nixpkgs
|
||||||
cosmicModulesLock = builtins.fromJSON (builtins.readFile "${nixos-cosmic}/flake.lock");
|
|
||||||
pinnedNixpkgsRev = cosmicModulesLock.nodes.nixpkgs.locked.rev;
|
|
||||||
pinnedNixpkgsNarHash = cosmicModulesLock.nodes.nixpkgs.locked.narHash;
|
|
||||||
|
|
||||||
futureNixpkgsSrc = builtins.fetchTarball {
|
|
||||||
name = "nixpkgs";
|
|
||||||
url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgsRev}.tar.gz";
|
|
||||||
sha256 = pinnedNixpkgsNarHash;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Initialize pinned nixpkgs
|
|
||||||
futureNixpkgs = let
|
futureNixpkgs = let
|
||||||
extended = self.extend (import ./unstable-from-source.nix {
|
extended = self.extend (import ./unstable-from-source.nix {
|
||||||
unstableSource = futureNixpkgsSrc;
|
unstableSource = inputs.nixpkgs-unstable;
|
||||||
});
|
});
|
||||||
in extended.unstable;
|
in extended.unstable;
|
||||||
in
|
in
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue