Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 0 additions & 17 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,23 +53,6 @@ let

inherit (nixFmt) nix-fmt;
nix-fmt-check = nixFmt.check;

lib = super.lib // {
mk-jobset = import ./mk-jobset.nix self;
};

# An attribute set mapping every supported system to a nixpkgs evaluated for
# that system. Special care is taken not to reevaluate nixpkgs for the current
# system because we already did that in self.
pkgsForSystem = super.lib.genAttrs [ "x86_64-linux" "x86_64-darwin" ] (
supportedSystem:
if supportedSystem == system
then self
else import ./. {
inherit RustSec-advisory-db;
system = supportedSystem;
}
);
}
)
];
Expand Down
145 changes: 0 additions & 145 deletions nix/mk-jobset.nix

This file was deleted.

5 changes: 3 additions & 2 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"common": {
"ref": "master",
"branch": "basvandijk/refactor-and-optimize-mk-jobset",
"ref": "basvandijk/refactor-and-optimize-mk-jobset",
"repo": "ssh://git@github.com/dfinity-lab/common",
"rev": "c022ff9f16ed0b9e3eb4ed97f26b493de3858df7",
"rev": "ed0b80ce1f370ead2f67f9827bb3ab5cc38655aa",
"type": "git"
},
"dfinity": {
Expand Down