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: a095c366688d
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b8e39f7d22e0
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 12, 2020

  1. Remove nix1 

    As of NixOS/nixpkgs@7121160, nix1 has been removed from Nixpkgs. Thus, we
remove it here.
    @cole-h
    cole-h committed Apr 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    35bb3a8 View commit details

  2. nix: fix failing test 

    Nix 2.3.4 now shows the assertion that failed since NixOS/nix@307bcb9, changing
the message we need to check against.
    @cole-h
    cole-h committed Apr 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f5e0318 View commit details

Commits on Apr 20, 2020

  1. Merge pull request #460 from cole-h/nix1-removal 

    Nix1 removal
    @grahamc
    grahamc authored Apr 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b8e39f7 View commit details
Showing with 6 additions and 10 deletions.
  1. +3 −5 .travis.yml
  2. +1 −1 ofborg/src/nix.rs
  3. +2 −4 shell.nix
8 changes: 3 additions & 5 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -4,10 +4,8 @@ sudo: true
matrix:
include:
- name: cargo pedantry
script: nix-shell --run checkPhase --arg useNix1 false -A mozilla-rust-overlay
- name: checkPhase - Nix 2
script: nix-shell --run checkPhase --arg useNix1 false
- name: checkPhase - Nix 1
script: nix-shell --run checkPhase --arg useNix1 true
script: nix-shell --run checkPhase -A mozilla-rust-overlay
- name: checkPhase
script: nix-shell --run checkPhase
- name: nix-build
script: nix-build ./default.nix -A ofborg.rs -A ofborg.php
2 changes: 1 addition & 1 deletion ofborg/src/nix.rs
View file
Original file line number Diff line number Diff line change
@@ -752,7 +752,7 @@ mod tests {
assert_run(
ret,
Expect::Fail,
vec!["You just can't", "assertion failed"],
vec!["You just can't", "assertion", "failed"],
);
}

6 changes: 2 additions & 4 deletions shell.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
overlays = [
(import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
];
}, useNix1 ? false }:
} }:

let
# A random Nixpkgs revision *before* the default glibc
@@ -29,8 +29,7 @@ let
php
curl
bash
]
++ stdenv.lib.optional useNix1 oldpkgs.nix1;
];

# HISTFILE = "${src}/.bash_hist";
};
@@ -84,7 +83,6 @@ let
pkgconfig
git
]
++ stdenv.lib.optional useNix1 oldpkgs.nix1
++ stdenv.lib.optional stdenv.isDarwin pkgs.darwin.Security;

postHook = ''