Commit Graph

1071 Commits

Author SHA1 Message Date
Wolfgang Thaller
cfa89940f2 remove CXXFLAGS hack for gcc9 2023-12-29 01:16:18 +01:00
Wolfgang Thaller
a777d4d585 Merge remote-tracking branch 'origin/master' into gcc12-update 2023-12-29 00:24:02 +01:00
Wolfgang Thaller
c525614549
Merge pull request #221 from autc04/flakes
Nix Flakes
2023-12-29 00:22:26 +01:00
Wolfgang Thaller
b6b30d2c10 setup nix source formatter 2023-12-28 23:50:29 +01:00
Wolfgang Thaller
09e4e34c41 disable garnix for now 2023-12-28 22:29:24 +01:00
Wolfgang Thaller
8063e142d7 re-enable regular build 2023-12-28 22:26:23 +01:00
Wolfgang Thaller
3516d8ca44 no reason to limit parallelism for the nix builds
(yet, until the carbon & powerpc builds actually share a package)
2023-12-28 22:25:29 +01:00
Wolfgang Thaller
e0d73d5329 update README for nix flakes 2023-12-28 21:34:56 +01:00
Wolfgang Thaller
504108a43a deprecate default.nix 2023-12-28 20:57:54 +01:00
Wolfgang Thaller
db9c28db76 crossPkgs -> pkgsCross 2023-12-28 20:40:32 +01:00
Wolfgang Thaller
08baa1ab70 use macos-latest and ubuntu-latest for nix builds 2023-12-28 20:40:19 +01:00
Wolfgang Thaller
ede7d46d0e hfsutils: add missing includes 2023-12-28 00:59:39 +01:00
Wolfgang Thaller
1ee050839f various fixes & workarounds for nix/mac 2023-12-27 23:51:51 +01:00
Wolfgang Thaller
3c453c897f fix --out-link option syntax 2023-12-26 23:52:27 +01:00
Wolfgang Thaller
de58f40581 try to fix a nixpkgs assert 2023-12-26 23:50:25 +01:00
Wolfgang Thaller
3193ad031c trust the right user for cache setup 2023-12-26 23:37:56 +01:00
Wolfgang Thaller
d88e9aba55 disable non-nix builds 2023-12-26 23:33:22 +01:00
Wolfgang Thaller
193610a2e1 we want nix in path 2023-12-26 23:33:00 +01:00
Wolfgang Thaller
ddfda03281 install cachix via nixpkgs#cachix 2023-12-26 23:28:47 +01:00
Wolfgang Thaller
d22b0d3184 setup nx before checkout 2023-12-26 23:26:45 +01:00
Wolfgang Thaller
9ccb30d35c use no-confirm option for nix installer 2023-12-26 23:25:43 +01:00
Wolfgang Thaller
d37d7e0612 use determinate nix installer & flake build on ADO 2023-12-26 23:22:55 +01:00
Wolfgang Thaller
97a0822244 add platform-specific samples packages 2023-12-26 23:14:38 +01:00
Wolfgang Thaller
7bebb04690 use nixos-23.11, update niv to match flake 2023-12-26 20:26:57 +01:00
Wolfgang Thaller
867b3eca74 update multiversal 2023-12-26 20:15:15 +01:00
Wolfgang Thaller
af8c831bfa add carbon to default package 2023-12-26 19:54:40 +01:00
Wolfgang Thaller
047e390419 add a 'samples' package 2023-12-26 19:53:51 +01:00
Wolfgang Thaller
2dd9d79398 add a check so that the flake can be used with submodules as well 2023-12-26 19:53:34 +01:00
Wolfgang Thaller
914ce6e144 add an url for flake-parts 2023-12-26 19:04:49 +01:00
Wolfgang Thaller
faf6b7fbbf we don't actually need libcCrossChooser 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
e51da67371 add a default package 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
963594d8d8 add .envrc 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
f98b4910dc add packages for tools & hfsutils 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
7e0e20edbd add ninja to shells 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
c11fd5f303 prevent inifinite recursion for stdenvUniversal 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
21e79c8adf overlay.nix cleanup 2023-12-26 18:43:52 +01:00
Wolfgang Thaller
f21a12a7eb platfoms.nix cleanup: add vendor and abi 2023-12-26 18:43:52 +01:00
Wolfgang Thaller
551c7588ca Set up flake using the old overlay.nix 2023-12-26 18:43:32 +01:00
Wolfgang Thaller
a3db211410
Merge pull request #216 from mcayland/feature/docker-build-universal
Retro68: improve Docker support to enable builds with Universal interfaces
2023-12-17 23:03:12 +01:00
Mark Cave-Ayland
14503f0611 README.md: add section on using the Retro68 docker image 2023-12-17 21:13:07 +00:00
Mark Cave-Ayland
6931631adc Dockerfile: add logic for optional install Universal interfaces on startup
Define a docker-entrypoint.sh that checks for the environment variables INTERFACES.
If INTERFACES is set to "universal" then we do the following:

  - If the universal/RIncludes directory is not empty, assume that the Universal
    interfaces are already installed. Call interfaces-and-libraries.sh to link
    the Universal interfaces instead of the default multiversal interfaces.

  - Otherwise check the INTERFACESFILE environment variable to locate a suitable
    Macbinary DiskCopy image of MPW-GM.img.bin containing the
    "Interfaces&Libraries" directory, which can be a path within the container
    image itself or an external URL. If the file is a URL then download it first,
    then decompress the file using ConvertDiskImage and then use the in-built
    hfsutils to extract the relevant files under /tmp/InterfacesAndLibraries.
    Finally call interfaces-and-libraries.sh to link the Universal interfaces
    instead of the default multiversal interfaces.

Otherwise use the multiversal interfaces which are included by default.
2023-12-17 21:13:01 +00:00
Mark Cave-Ayland
4042463991 Dockerfile: add macutils and interfaces-and-libraries.sh to image
These files will be required in order to download and install the Universal
Interfaces within the created image.
2023-12-17 20:11:54 +00:00
Wolfgang Thaller
c57f0d98db init flake 2023-12-17 19:42:57 +01:00
Wolfgang Thaller
9dd5dca1fa fix libelf build 2023-12-17 19:04:58 +01:00
Wolfgang Thaller
b4a91d430f
Merge pull request #213 from Thesola10/patch-1
Use global nixpkgs to allow immutable builds
2023-12-17 01:20:13 +01:00
Wolfgang Thaller
4116be4acc Merge branch 'docker-build' - finally incorporate PR #193 :-) 2023-12-16 23:49:12 +01:00
Wolfgang Thaller
01bccd3d35 remove test image from Dockerfile, link to repo 2023-12-16 22:49:02 +01:00
Wolfgang Thaller
bde2e8f74f only push docker image when on main branch 2023-12-16 22:29:26 +01:00
Wolfgang Thaller
323d3e3a34 Revert "azure-pipelines.yml: temporary disable all non-Linux builds"
This reverts commit a230a79ca3.
2023-12-16 22:27:36 +01:00
Wolfgang Thaller
9ff29c557e reactivate actual build 2023-12-16 20:40:14 +01:00