Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Nixpkgs #191

Closed
wants to merge 3 commits into from
Closed

Bump Nixpkgs #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
983d5c1
Abbreviate Makefile argument
nspin Sep 10, 2024
dce65e3
nix: Bump Nixpkgs
nspin Sep 10, 2024
b899768
nix: Provide suitable MissingH version to capdl-tool
nspin Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ifneq ($(J),)
jobs_args := -j$(J)
endif

ifneq ($(CORES),)
cores_args := --cores $(CORES)
ifneq ($(C),)
cores_args := --cores $(C)
endif

nix_args := $(keep_going_args) $(jobs_args) $(cores_args)
Expand Down
4 changes: 2 additions & 2 deletions hacking/nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ let

defaultNixpkgsPath =
let
rev = "1811c4fec88995679397d6fa20f4f3395a0bebe5";
rev = "3add434811677ed7fcd013c136806f8c6f410545";
in
builtins.fetchTarball {
url = "https://github.com/coliasgroup/nixpkgs/archive/refs/tags/keep/${builtins.substring 0 32 rev}.tar.gz";
sha256 = "sha256:0ad2c7vlr9fidzjjg8szigfhmp1gvlf62ckd6cir8ymrxc93pby7";
sha256 = "sha256:1pi5chvv5jld5jb8x0j4ni4w60m4x5dajfwhk1nh2j1kjxxrk1mk";
};

in
Expand Down
5 changes: 4 additions & 1 deletion hacking/nix/scope/capdl-tool/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ top_level := ../../../..
capdl := $(top_level)/../x/capdl/capDL-tool
cabal2nix := $(shell nix-build $(top_level) -A pkgs.build.cabal2nix --no-out-link)/bin/cabal2nix

all := capDL-tool.nix base-compat-0-12-2.nix base-compat-batteries-0-12-2.nix
all := capDL-tool.nix base-compat-0-12-2.nix base-compat-batteries-0-12-2.nix MissingH-1.5.0.1.nix

.PHONY: all $(all)
all: $(all)
Expand All @@ -21,3 +21,6 @@ base-compat-0-12-2.nix:

base-compat-batteries-0-12-2.nix:
$(cabal2nix) cabal://base-compat-batteries-0.12.2 > $@

MissingH-1.5.0.1.nix:
$(cabal2nix) cabal://MissingH-1.5.0.1 > $@
22 changes: 22 additions & 0 deletions hacking/nix/scope/capdl-tool/MissingH-1.5.0.1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ mkDerivation, array, base, containers, directory, filepath
, hslogger, HUnit, lib, mtl, network, network-bsd, old-locale
, old-time, parsec, process, regex-compat, time, unix
}:
mkDerivation {
pname = "MissingH";
version = "1.5.0.1";
sha256 = "cb2fa4a62a609ec6bcfa2eab6ae6d34c6f5bfba523fed8dc0c055b3176732231";
revision = "2";
editedCabalFile = "11d922r06p00gcgzhb29hhjkq8ajy1xbqdiwdpbmhp2ar7fw7g9l";
libraryHaskellDepends = [
array base containers directory filepath hslogger mtl network
network-bsd old-locale old-time parsec process regex-compat time
unix
];
testHaskellDepends = [
base containers directory filepath HUnit old-time parsec
regex-compat time unix
];
description = "Large utility library";
license = lib.licenses.bsd3;
}
1 change: 1 addition & 0 deletions hacking/nix/scope/capdl-tool/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ let
overrides = self: super: {
base-compat = self.callPackage ./base-compat-0-12-2.nix {};
base-compat-batteries = self.callPackage ./base-compat-batteries-0-12-2.nix {};
MissingH = self.callPackage ./MissingH-1.5.0.1.nix {};
capDL-tool = self.callPackage ./capDL-tool.nix {
inherit sources;
};
Expand Down
2 changes: 1 addition & 1 deletion hacking/nix/scope/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ superCallPackage ../rust-utils {} self //

overrideWorldScope = self: super: {};

mkWorldFrom = newScope: unelaboratedWorldConfig: (lib.makeScope newScope (callPackage ./world {} unelaboratedWorldConfig)).overrideScope' overrideWorldScope;
mkWorldFrom = newScope: unelaboratedWorldConfig: (lib.makeScope newScope (callPackage ./world {} unelaboratedWorldConfig)).overrideScope overrideWorldScope;

mkWorld = mkWorldFrom newScope;

Expand Down
2 changes: 1 addition & 1 deletion hacking/nix/scope/sel4test/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ let
tests = stdenv.mkDerivation {
name = "sel4test";

src = fetchRepoProject {
src = buildPackages.fetchRepoProject {
name = "sel4test";
manifest = "https://github.com/seL4/sel4test-manifest.git";
rev = "8bf6fd506a0546866ba5fbd7396f497d5a056f5c";
Expand Down
4 changes: 2 additions & 2 deletions hacking/nix/scope/shell-for-hacking.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{ lib, stdenv, hostPlatform, buildPackages
, mkShell

, pkgconfig
, pkg-config
, git
, cacert
, rustup, rustPlatform
Expand All @@ -34,7 +34,7 @@ mkShell (shellForMakefile.apply {
];

nativeBuildInputs = [
pkgconfig
pkg-config
git
cacert
rustup
Expand Down
Loading