ehmry/genodepkgs
ehmry
/
genodepkgs
2
0
Fork 0
Code Releases Activity

Prepare ports using x86_64-linux nixpkgs

This commit is contained in:
Ehmry - 2020-10-22 19:58:10 +02:00
parent 1168611109
commit 62abcf8e6d
5 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flake.nix
View File

@ -58,7 +58,10 @@
overlay = overlay =
# Overlay of fixes applied to Nixpkgs # Overlay of fixes applied to Nixpkgs
import ./overlay genode; import ./overlay {
upstreamSources = genode;
pinnedPackages = nixpkgs.legacyPackages.x86_64-linux;
};
lib = lib =
# Local utilities merged with the Nixpkgs lib # Local utilities merged with the Nixpkgs lib

10
overlay/default.nix
View File

@ -1,4 +1,5 @@
upstreamSources: final: prev: { upstreamSources, pinnedPackages }:
final: prev:
with prev; with prev;
let let
overrideHost = drv: attrs: overrideHost = drv: attrs:
@ -62,10 +63,13 @@ in {
genodeLibcCross = callPackage ./libc { }; genodeLibcCross = callPackage ./libc { };
genodePackages = import ../packages { nixpkgs = final; }; genodePackages = import ../packages {
inherit pinnedPackages;
nixpkgs = final;
};
genodeSources = buildPackages.callPackage ../packages/genodelabs { genodeSources = buildPackages.callPackage ../packages/genodelabs {
inherit upstreamSources; inherit upstreamSources pinnedPackages;
}; };
libcCrossChooser = name: libcCrossChooser = name:

4
packages/default.nix
View File

@ -1,11 +1,11 @@
{ nixpkgs }: { pinnedPackages, nixpkgs }:
let let
inherit (nixpkgs) inherit (nixpkgs)
buildPackages callPackage fetchFromGitHub fetchgit genodeSources stdenv; buildPackages callPackage fetchFromGitHub fetchgit genodeSources stdenv;
inherit (genodeSources) buildUpstream; inherit (genodeSources) buildUpstream;
dhallPackages = buildPackages.callPackage ./dhall { }; dhallPackages = pinnedPackages.callPackage ./dhall { };
buildDepotWorld = let buildDepotWorld = let
genodeWorld = fetchFromGitHub { genodeWorld = fetchFromGitHub {

6
packages/genodelabs/default.nix
View File

@ -1,4 +1,4 @@
{ upstreamSources, buildPackages, targetPackages }: { upstreamSources, pinnedPackages, buildPackages, targetPackages }:
let let
platform = targetPackages.targetPlatform; platform = targetPackages.targetPlatform;
@ -114,7 +114,9 @@ let
}); });
ports = ports =
lib.mapAttrs preparePort (import ./ports.nix { inherit buildPackages; }); lib.mapAttrs preparePort (import ./ports.nix { pkgs = pinnedPackages; });
# The "ports" mechanism is hardly deterministic, so prepare with
# a pinned nixpkgs revision for a pinned platform.
toolchain = callPackage ./toolchain.nix { }; toolchain = callPackage ./toolchain.nix { };

14
packages/genodelabs/ports.nix
View File

@ -1,15 +1,17 @@
# This file specifies the output hashes of "Ports". # This file specifies the output hashes of "Ports".
# Ports not listed here can still be prepared, but will result in a hash mismatch. # Ports not listed here can still be prepared, but will result in a hash mismatch.
{ buildPackages }: { pkgs }:
with buildPackages; { with pkgs;
{
binutils = { binutils = {
hash = "sha256-5JpEsIAe3GOZVb8kTMlfhmzku+aGs4/BttMu4xLsnsI="; hash = "sha256-ERzYT3TjbK3fzRVN1UE7RM6XiPPeMKzkeulKx5IQa2o=";
nativeBuildInputs = [ autoconf ]; nativeBuildInputs = [ autoconf ];
}; };
dde_bsd.hash = "sha256-Z2piyoOrNmXyEEp+kX5w/q4JTylYdSOocUrFeqjz13A="; dde_bsd.hash = "sha256-Z2piyoOrNmXyEEp+kX5w/q4JTylYdSOocUrFeqjz13A=";
dde_ipxe.hash = "sha256-NJ129+DkxFg1fFHJBABBFRRjqEVNSz6v2hEB80AuEM4="; dde_ipxe.hash = "sha256-NJ129+DkxFg1fFHJBABBFRRjqEVNSz6v2hEB80AuEM4=";
dde_linux.hash = "sha256-aUp90z8dtn48QNUqGe1b08RzbESFmCJl7ECZf+lr0rg="; dde_linux.hash = "sha256-xHAgeKfArgMGKCGHi0762qkUcY97vbiAQYjM/ZRXCes=";
dde_rump = { dde_rump = {
hash = "sha256-Wr5otGkWEa+5xImsFHQzwap5LckNEbyWA/7xbNcOreI="; hash = "sha256-Wr5otGkWEa+5xImsFHQzwap5LckNEbyWA/7xbNcOreI=";
nativeBuildInputs = [ subversion ]; nativeBuildInputs = [ subversion ];
@ -17,7 +19,7 @@ with buildPackages; {
}; };
expat.hash = "sha256-KpeM2ySmf+Ojx1mAj9n8lfX7iHaa7w5MPPKZcn4GpTc="; expat.hash = "sha256-KpeM2ySmf+Ojx1mAj9n8lfX7iHaa7w5MPPKZcn4GpTc=";
gcc = { gcc = {
hash = "sha256-ZF9P6xOHvSDN6oq4SN5jOEBBMGgGh6fXyDOgYdXHG1g="; hash = "sha256-1AKjUbh8X5ips8pg0twpBTtc2qCVXGrbifJ/cf3yRcE=";
nativeBuildInputs = [ autoconf264 autogen ]; nativeBuildInputs = [ autoconf264 autogen ];
patches = [ ./gcc-port.patch ]; patches = [ ./gcc-port.patch ];
}; };
@ -27,7 +29,7 @@ with buildPackages; {
jpeg.hash = "sha256-RLVnlrnYGrhqr3Feikoi/BNditCaKN0u3t9/UDpl2wQ="; jpeg.hash = "sha256-RLVnlrnYGrhqr3Feikoi/BNditCaKN0u3t9/UDpl2wQ=";
libc = { libc = {
hash = "sha256-BSZcO25jbH8+OkJWGyJxxVYuQ4Y3yDt0DNsYcITwqxA="; hash = "sha256-BSZcO25jbH8+OkJWGyJxxVYuQ4Y3yDt0DNsYcITwqxA=";
nativeBuildInputs = [ buildPackages.gcc ]; nativeBuildInputs = [ gcc ];
}; };
libiconv.hash = "sha256-25YcW5zo1fE33ZolGQroR+KZO8wHEdN1QXa7+MhwS78="; libiconv.hash = "sha256-25YcW5zo1fE33ZolGQroR+KZO8wHEdN1QXa7+MhwS78=";
libpng.hash = "sha256-hNmSWN4gEk4UIjzkGD4j5qFooMCVXLwcBeOeFumvh+4="; libpng.hash = "sha256-hNmSWN4gEk4UIjzkGD4j5qFooMCVXLwcBeOeFumvh+4=";