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: a0756f9e8841
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: 29b450fd8bc9
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Oct 12, 2020

  1. wolfssl: 4.4.0 -> 4.5.0

    @r-ryantm @mcmtroffaes
    r-ryantm authored and mcmtroffaes committed Oct 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9d27d83 View commit details

Commits on Nov 5, 2020

  1. singularity: 3.6.1 -> 3.6.4 

    Addresses CVEs:

- CVE-2020-25040
- CVE-2020-25039
    @jbedo
    jbedo committed Nov 5, 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
    b63c235 View commit details

  2. Merge pull request #100895 from jbedo/singularity-20.03 

    [20.03] singularity: 3.6.1 -> 3.6.4
    @markuskowa
    markuskowa authored Nov 5, 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
    5a62e56 View commit details

  3. Merge pull request #100332 from mcmtroffaes/feature/wolfssl-backport 

    wolfssl: 4.4.0 -> 4.5.0 [backport to 20.03]
    @roberth
    roberth authored Nov 5, 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
    29b450f View commit details
9 changes: 2 additions & 7 deletions pkgs/applications/virtualization/singularity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,15 +18,14 @@ with lib;

buildGoPackage rec {
pname = "singularity";
version = "3.6.1";
version = "3.6.4";

src = fetchurl {
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
sha256 = "070jj6kbiw23sd2p4xhvmyb8gd83imwgisdf18ahkwp7dq85db3c";
sha256 = "17z7v7pjq1ibl64ir4h183sp58v2x7iv6dn6imnnhkdvss0kl8vi";
};

goPackagePath = "github.com/sylabs/singularity";
goDeps = ./deps.nix;

buildInputs = [ gpgme openssl libuuid ];
nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper cryptsetup ];
@@ -67,10 +66,6 @@ buildGoPackage rec {
runHook postInstall
'';

postFixup = ''
find $bin/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
'';

meta = with stdenv.lib; {
homepage = "http://www.sylabs.io/";
description = "Application containers for linux";
1 change: 0 additions & 1 deletion pkgs/applications/virtualization/singularity/deps.nix
View file

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/development/libraries/wolfssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "wolfssl";
version = "4.4.0";
version = "4.5.0";

src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}-stable";
sha256 = "1bgkxqgxwa5dvi7fkna64wpcs552f3yxvs6fh6d32v7vg88vpfx9";
sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v";
};

configureFlags = [ "--enable-all" ];