Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b33a1d23f899
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d597c629aa7
Choose a head ref
  • 2 commits
  • 15 files changed
  • 1 contributor

Commits on Dec 1, 2018

  1. Add back known users

    @grahamc
    grahamc committed Dec 1, 2018
    Copy the full SHA
    67be56f View commit details

  2. Update nixpkgs, dependencies, carnix, blah blah blah

    @grahamc
    grahamc committed Dec 1, 2018
    Copy the full SHA
    3d597c6 View commit details
Showing with 4,969 additions and 2,373 deletions.
  1. +51 −5 config.known-users.json
  2. +4 −10 default.nix
  3. +0 −50 nix/carnix.patch
  4. +1 −0 nix/default.nix
  5. +1,442 −0 nix/nixpkgs-pr50452.patch
  6. +4 −4 nix/nixpkgs.json
  7. +0 −2,061 nix/ofborg-carnix.nix
  8. +3 −15 nix/update-carnix.sh
  9. +178 −223 ofborg/Cargo.lock
  10. +514 −0 ofborg/Cargo.nix
  11. +3 −3 ofborg/Cargo.toml
  12. +99 −0 ofborg/crates-io.list
  13. +2,669 −0 ofborg/crates-io.nix
  14. +0 −2 ofborg/default.nix
  15. +1 −0 shell.nix
56 changes: 51 additions & 5 deletions config.known-users.json
View file
Original file line number Diff line number Diff line change
@@ -2,78 +2,111 @@
"runner": {
"known_users": [
"7c6f434c",
"ma27",
"synthetica9",
"thomasmader",
"aanderse",
"abbradar",
"adisbladis",
"aforemny",
"akru",
"aminechikhaoui",
"andersontorres",
"andir",
"arianvp",
"aristidb",
"armijnhemel",
"aszlig",
"aycanirican",
"basvandijk",
"bbarker",
"bendlas",
"benley",
"bennofs",
"bhipple",
"bignaux",
"bjornfor",
"bluescreen303",
"brainrape",
"c0bw3b",
"chaoflow",
"cillianderoiste",
"cleverca22",
"copumpkin",
"costrouc",
"cpages",
"cstrahan",
"danieldk",
"dezgeg",
"dguibert",
"disassembler",
"domenkozar",
"dotlambda",
"dtzwill",
"dywedir",
"edef1c",
"edolstra",
"edwtjo",
"ehmry",
"ekleog",
"ekleog",
"elvishjerricco",
"enzime",
"eqyiel",
"ericson2314",
"erictapen",
"erikarvstedt",
"etu",
"falsifian",
"fgaz",
"flokli",
"florianjacob",
"fpletz",
"fridh",
"fuuzetsu",
"garbas",
"gebner",
"geistesk",
"gerschtli",
"globin",
"grahamc",
"grahamcofborg",
"grwlf",
"hedning",
"hrdinka",
"infinisil",
"imalsogreg",
"infinisil",
"jagajaga",
"jfrankenau",
"jgeerds",
"jlesquembre",
"jluttine",
"joachifm",
"johanot",
"jtojnar",
"jwiegley",
"kalbasit",
"kalbasit",
"kevincox",
"knedlsepp",
"kosmikus",
"lheckemann",
"lnl7",
"lovek323",
"lschuermann",
"lsix",
"ma27",
"madjar",
"maggesi",
"markuskowa",
"matejc",
"matthewbauer",
"mic92",
"moredread",
"mp2e",
"nbp",
"nckx",
"ndowens",
"nequissimus",
"nh2",
"nicolaspetton",
"nlewo",
"obadz",
"ocharles",
"offlinehacker",
@@ -84,6 +117,7 @@
"peti",
"phreedom",
"pikajude",
"pmiddend",
"primeos",
"profpatsch",
"psub",
@@ -94,31 +128,43 @@
"roberth",
"roconnor",
"rushmorem",
"ryantm",
"ryantrinkle",
"rycee",
"samueldr",
"samueldr",
"shlevy",
"smaret",
"srhb",
"svanderburg",
"synthetica9",
"tadfisher",
"teto",
"the-kenny",
"thomasmader",
"thoughtpolice",
"timokau",
"tomberek",
"ts468",
"ttuegel",
"unode",
"va1entin",
"vbgl",
"vcunat",
"veprbl",
"viric",
"volth",
"vrthra",
"wizeman",
"wkennington",
"wmertens",
"woffs",
"worldofpeace",
"worldofpeace",
"xeji",
"xeji",
"yegortimoshenko",
"yesbox",
"yurrriq",
"zimbatm"
]
14 changes: 4 additions & 10 deletions default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,17 +11,11 @@ let
'';
in {
ofborg.rs = let
drv = (pkgs.callPackage ./nix/ofborg-carnix.nix {}).ofborg {};
build = drv.override {
crateOverrides = pkgs.defaultCrateOverrides // {
ofborg = attrs: {
buildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin
[ pkgs.darwin.apple_sdk.frameworks.Security ];
};
};
};
drv = (pkgs.callPackage ./ofborg/Cargo.nix {
cratesIO = pkgs.callPackage ./ofborg/crates-io.nix {};
}).ofborg {};
in pkgs.runCommand "ofborg-rs-symlink-compat" {
src = stripDeps build;
src = stripDeps drv;
} ''
mkdir -p $out/bin
for f in $(find $src -type f); do
50 changes: 0 additions & 50 deletions nix/carnix.patch
View file

This file was deleted.

1 change: 1 addition & 0 deletions nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ in import (hostpkgs.stdenv.mkDerivation {
};

patches = [
./nixpkgs-pr50452.patch
];

moveToOut = ''
Loading