Update nixpkgs input to release-20.09
This commit is contained in:
parent
205fadc83d
commit
a60ccd13e2
12
flake.lock
12
flake.lock
|
@ -2,17 +2,17 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1597134609,
|
"lastModified": 1600410083,
|
||||||
"narHash": "sha256-hzF9zvnR2WSPcpiWuvdiPXMvqhHP/Rnno6hMhJm59RI=",
|
"narHash": "sha256-U1yLHbpYgj1oeTB30h+mwnaPBHrvnSL98ku3jYrdWE4=",
|
||||||
"owner": "ehmry",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "de1c8a039fb0f2564526633ddfe9498354a5154b",
|
"rev": "66cadca58304b7914391b081cf5f9bbb00e45f61",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "ehmry",
|
"owner": "NixOS",
|
||||||
|
"ref": "release-20.09",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "de1c8a039fb0f2564526633ddfe9498354a5154b",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
12
flake.nix
12
flake.nix
|
@ -1,8 +1,7 @@
|
||||||
{
|
{
|
||||||
description = "Genode packages";
|
description = "Genode packages";
|
||||||
|
|
||||||
inputs.nixpkgs.url =
|
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-20.09";
|
||||||
"github:ehmry/nixpkgs/de1c8a039fb0f2564526633ddfe9498354a5154b";
|
|
||||||
|
|
||||||
outputs = { self, nixpkgs }:
|
outputs = { self, nixpkgs }:
|
||||||
let
|
let
|
||||||
|
@ -135,7 +134,7 @@
|
||||||
|
|
||||||
checks =
|
checks =
|
||||||
# Checks for continous testing
|
# Checks for continous testing
|
||||||
forAllCrossSystems ({ system, localSystem, crossSystem }:
|
with (forAllCrossSystems ({ system, localSystem, crossSystem }:
|
||||||
import ./tests {
|
import ./tests {
|
||||||
inherit self;
|
inherit self;
|
||||||
apps = self.apps.${system};
|
apps = self.apps.${system};
|
||||||
|
@ -145,14 +144,15 @@
|
||||||
nixpkgs = nixpkgsFor.${system};
|
nixpkgs = nixpkgsFor.${system};
|
||||||
legacyPackages = self.legacyPackages.${system};
|
legacyPackages = self.legacyPackages.${system};
|
||||||
} // {
|
} // {
|
||||||
|
|
||||||
ports = nixpkgsFor.${localSystem}.symlinkJoin {
|
ports = nixpkgsFor.${localSystem}.symlinkJoin {
|
||||||
name = "ports";
|
name = "ports";
|
||||||
paths = (builtins.attrValues
|
paths = (builtins.attrValues
|
||||||
self.packages.${system}.genodeSources.ports);
|
self.packages.${system}.genodeSources.ports);
|
||||||
};
|
};
|
||||||
|
})); {
|
||||||
});
|
x86_64-linux = x86_64-linux-aarch64-genode
|
||||||
|
// x86_64-linux-x86_64-genode;
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
{ buildPackages }:
|
{ buildPackages }:
|
||||||
with buildPackages; {
|
with buildPackages; {
|
||||||
binutils = {
|
binutils = {
|
||||||
hash = "sha256-Y6EwEb2uFNzJ/6Q+7Jia7LZu5iRt1XkzkogUxiC93t8=";
|
hash = "sha256-5JpEsIAe3GOZVb8kTMlfhmzku+aGs4/BttMu4xLsnsI=";
|
||||||
nativeBuildInputs = [ autoconf ];
|
nativeBuildInputs = [ autoconf ];
|
||||||
};
|
};
|
||||||
dde_bsd.hash = "sha256-Z2piyoOrNmXyEEp+kX5w/q4JTylYdSOocUrFeqjz13A=";
|
dde_bsd.hash = "sha256-Z2piyoOrNmXyEEp+kX5w/q4JTylYdSOocUrFeqjz13A=";
|
||||||
|
@ -35,7 +35,7 @@ with buildPackages; {
|
||||||
lwip.hash = "sha256-RZsqy9iKiUfQzQOrPw2QWiKS5BkVbGe4HseF2DzeWeQ=";
|
lwip.hash = "sha256-RZsqy9iKiUfQzQOrPw2QWiKS5BkVbGe4HseF2DzeWeQ=";
|
||||||
lz4.hash = "sha256-nydkAbexaqcKYDzp0TsECKMXyPaoY9rf3MAbU33VPrg=";
|
lz4.hash = "sha256-nydkAbexaqcKYDzp0TsECKMXyPaoY9rf3MAbU33VPrg=";
|
||||||
mesa = {
|
mesa = {
|
||||||
hash = "sha256-8QVIEpN+mLG1XktdZM64sqz1fVeK1pLVlERtnVphW8Y=";
|
hash = "sha256-QPtvFMCG8ilwjzzcmXIvzswU9HB22M1DoEh+reI+qes=";
|
||||||
nativeBuildInputs = [ python ];
|
nativeBuildInputs = [ python ];
|
||||||
};
|
};
|
||||||
mpc.hash = "sha256-MOs51NYXkNYxBG4d97/fMCx/iYzrNum8jHe3QujF24o=";
|
mpc.hash = "sha256-MOs51NYXkNYxBG4d97/fMCx/iYzrNum8jHe3QujF24o=";
|
||||||
|
|
Loading…
Reference in New Issue