Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6460602eec5c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f8248ab6d9e6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 24, 2020

  1. texlive: fix build for scheme-infraonly 

    (cherry picked from commit 8852a81)
    @veprbl
    veprbl committed Jun 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    GPG key ID: 06AF1D3C38F04E0E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f2cdade View commit details

  2. hydra-unstable: 2020-06-01 -> 2020-06-23 

    Fixes the build the changes from b505bf2.

(cherry picked from commit 39e3c15)
    @Ma27
    Ma27 committed Jun 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f8248ab View commit details
Showing with 8 additions and 11 deletions.
  1. +4 −11 pkgs/development/tools/misc/hydra/default.nix
  2. +4 −0 pkgs/tools/typesetting/tex/texlive/combine.nix
15 changes: 4 additions & 11 deletions pkgs/development/tools/misc/hydra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }:
{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }:

{
# Package for phase-1 of the db migration for Hydra.
@@ -24,22 +24,15 @@
# so when having an older version, `pkgs.hydra-migration` should be deployed first.

hydra-unstable = callPackage ./common.nix {
version = "2020-06-01";
version = "2020-06-23";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a";
sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4";
rev = "bb32aafa4a9b027c799e29b1bcf68727e3fc5f5b";
sha256 = "0kl9h70akwxpik3xf4dbbh7cyqn06023kshfvi14mygdlb84djgx";
};
nix = nixFlakes;

patches = [
(fetchpatch {
url = "https://github.com/NixOS/hydra/commit/d4822a5f4b57dff26bdbf436723a87dd62bbcf30.patch";
sha256 = "1n6hyjz1hzvka4wi78d4wg0sg2wanrdmizqy23vmp7pmv8s3gz8w";
})
];

tests = {
db-migration = nixosTests.hydra-db-migration.mig;
basic = nixosTests.hydra.hydra-unstable;
4 changes: 4 additions & 0 deletions pkgs/tools/typesetting/tex/texlive/combine.nix
View file
Original file line number Diff line number Diff line change
@@ -49,6 +49,10 @@ in buildEnv {

ignoreCollisions = false;
paths = pkgList.nonbin;
pathsToLink = [
"/"
"/tex/generic/config" # make it a real directory for scheme-infraonly
];

buildInputs = [ makeWrapper ] ++ pkgList.extraInputs;