Browse Source

Update nixpkgs input to release-20.09

rsync
Emery Hemingway 1 year ago
parent
commit
a60ccd13e2
  1. 12
      flake.lock
  2. 12
      flake.nix
  3. 4
      packages/genodelabs/ports.nix

12
flake.lock

@ -2,17 +2,17 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1597134609,
"narHash": "sha256-hzF9zvnR2WSPcpiWuvdiPXMvqhHP/Rnno6hMhJm59RI=",
"owner": "ehmry",
"lastModified": 1600410083,
"narHash": "sha256-U1yLHbpYgj1oeTB30h+mwnaPBHrvnSL98ku3jYrdWE4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "de1c8a039fb0f2564526633ddfe9498354a5154b",
"rev": "66cadca58304b7914391b081cf5f9bbb00e45f61",
"type": "github"
},
"original": {
"owner": "ehmry",
"owner": "NixOS",
"ref": "release-20.09",
"repo": "nixpkgs",
"rev": "de1c8a039fb0f2564526633ddfe9498354a5154b",
"type": "github"
}
},

12
flake.nix

@ -1,8 +1,7 @@
{
description = "Genode packages";
inputs.nixpkgs.url =
"github:ehmry/nixpkgs/de1c8a039fb0f2564526633ddfe9498354a5154b";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-20.09";
outputs = { self, nixpkgs }:
let
@ -135,7 +134,7 @@
checks =
# Checks for continous testing
forAllCrossSystems ({ system, localSystem, crossSystem }:
with (forAllCrossSystems ({ system, localSystem, crossSystem }:
import ./tests {
inherit self;
apps = self.apps.${system};
@ -145,14 +144,15 @@
nixpkgs = nixpkgsFor.${system};
legacyPackages = self.legacyPackages.${system};
} // {
ports = nixpkgsFor.${localSystem}.symlinkJoin {
name = "ports";
paths = (builtins.attrValues
self.packages.${system}.genodeSources.ports);
};
});
})); {
x86_64-linux = x86_64-linux-aarch64-genode
// x86_64-linux-x86_64-genode;
};
};
}

4
packages/genodelabs/ports.nix

@ -4,7 +4,7 @@
{ buildPackages }:
with buildPackages; {
binutils = {
hash = "sha256-Y6EwEb2uFNzJ/6Q+7Jia7LZu5iRt1XkzkogUxiC93t8=";
hash = "sha256-5JpEsIAe3GOZVb8kTMlfhmzku+aGs4/BttMu4xLsnsI=";
nativeBuildInputs = [ autoconf ];
};
dde_bsd.hash = "sha256-Z2piyoOrNmXyEEp+kX5w/q4JTylYdSOocUrFeqjz13A=";
@ -35,7 +35,7 @@ with buildPackages; {
lwip.hash = "sha256-RZsqy9iKiUfQzQOrPw2QWiKS5BkVbGe4HseF2DzeWeQ=";
lz4.hash = "sha256-nydkAbexaqcKYDzp0TsECKMXyPaoY9rf3MAbU33VPrg=";
mesa = {
hash = "sha256-8QVIEpN+mLG1XktdZM64sqz1fVeK1pLVlERtnVphW8Y=";
hash = "sha256-QPtvFMCG8ilwjzzcmXIvzswU9HB22M1DoEh+reI+qes=";
nativeBuildInputs = [ python ];
};
mpc.hash = "sha256-MOs51NYXkNYxBG4d97/fMCx/iYzrNum8jHe3QujF24o=";

Loading…
Cancel
Save