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: d6fa9f3806fe
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 65db4d0da04f
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on May 20, 2020

  1. Pepper in allowing old openssl

    @grahamc
    grahamc committed May 20, 2020
    Copy the full SHA
    65db4d0 View commit details
Showing with 17 additions and 1 deletion.
  1. +7 −1 default.nix
  2. +6 −0 release.nix
  3. +4 −0 shell.nix
8 changes: 7 additions & 1 deletion default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{ pkgs ? import ./nix { overlays = [ (import ./nix/overlay.nix) ]; } }:
{ pkgs ? import ./nix {
config.permittedInsecurePackages = [
"openssl-1.0.2u"
];
overlays = [ (import ./nix/overlay.nix) ];
}
}:

let
ofborgCrates = pkgs.callPackage ./Cargo.nix {
6 changes: 6 additions & 0 deletions release.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,9 @@
}:
let
pkgs = import nixpkgs {
config.permittedInsecurePackages = [
"openssl-1.0.2u"
];
overlays = [ (import ./nix/overlay.nix) ];
};
inherit (pkgs) lib;
@@ -18,6 +21,9 @@ let
collector // {
"${system}" = import ./. {
pkgs = import nixpkgs {
config.permittedInsecurePackages = [
"openssl-1.0.2u"
];
inherit system;
overlays = [
(import ./nix/overlay.nix)
4 changes: 4 additions & 0 deletions shell.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{ pkgs ? import ./nix {
config.permittedInsecurePackages = [
"openssl-1.0.2u"
];

overlays = [
(import ./nix/overlay.nix)
(import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))