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: dd2701e82d88
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: 1bcd6fdc4127
Choose a head ref
  • 15 commits
  • 9 files changed
  • 10 contributors

Commits on Sep 16, 2019

  1. stress-ng: 0.10.02 -> 0.10.05

    dtzWill committed Sep 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    Copy the full SHA
    3eb894e View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    Copy the full SHA
    31be449 View commit details

Commits on Sep 26, 2019

  1. atlassian-jira: 8.3.2 -> 8.4.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/atlassian-jira/versions
    r-ryantm committed Sep 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    Copy the full SHA
    a8dc4e3 View commit details
  2. closurecompiler: 20190215 -> 20190909

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/closure-compiler/versions
    r-ryantm committed Sep 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    Copy the full SHA
    fae0694 View commit details
  3. linuxPackages.virtualboxGuestAdditions: apply mp-r0drv-linux.c patch

    These don't use a the virtualbox sources, but an iso as src, and we need
    to add the kernel 5.3 patch aswell.
    
    As for some reason the source files are present on the .iso with Windows
    Line endings (sic!), call dos2unix first.
    
    Unfortunately, we can't use the same kernel-5.3-fix.patch as virtualbox
    itself, as some files are missing and paths are different.
    flokli committed Sep 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    Copy the full SHA
    61f0f8d View commit details
  4. fuse-overlayfs: 0.5.1 -> 0.6.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/fuse-overlayfs/versions
    r-ryantm committed Sep 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    Copy the full SHA
    994e18d View commit details

Commits on Sep 27, 2019

  1. Merge pull request #69482 from r-ryantm/auto-update/closure-compiler

    closurecompiler: 20190215 -> 20190909
    marsam authored Sep 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    f524175 View commit details
  2. Merge pull request #68918 from dtzWill/update/stress-ng-0.10.05-musl

    stress-ng: 0.10.02 -> 0.10.05, fix w/musl
    c0bw3b authored Sep 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    7651937 View commit details
  3. linuxPackages.virtualboxGuestAdditions: apply mp-r0drv-linux.c… (#69500)

    linuxPackages.virtualboxGuestAdditions: apply mp-r0drv-linux.c patch
    flokli authored Sep 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    8058883 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    39d7eeb View commit details
  5. Merge pull request #69541 from r-ryantm/auto-update/fuse-overlayfs

    fuse-overlayfs: 0.5.1 -> 0.6.2
    ryantm authored Sep 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    Copy the full SHA
    7c7a623 View commit details
  6. zfs: 0.8.1 -> 0.8.2

    Baughn committed Sep 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    f6a8944 View commit details
  7. Merge pull request #69459 from r-ryantm/auto-update/atlassian-jira

    atlassian-jira: 8.3.2 -> 8.4.1
    WilliButz authored Sep 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    Copy the full SHA
    420e18c View commit details
  8. libfaketime: 0.9.7 -> 0.9.8

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/libfaketime/versions
    r-ryantm authored and bjornfor committed Sep 27, 2019
    Copy the full SHA
    497fdfb View commit details
  9. Merge pull request #69647 from Baughn/zfs

    zfs: 0.8.1 -> 0.8.2
    fpletz authored Sep 27, 2019
    Copy the full SHA
    1bcd6fd View commit details
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
, zlib, xorg, dbus, virtualbox }:
, zlib, xorg, dbus, virtualbox, dos2unix }:

let
version = virtualbox.version;
@@ -32,21 +32,25 @@ in stdenv.mkDerivation {
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include";

# If you add a patch you probably need this.
#patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ];

hardeningDisable = [ "pic" ];

NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";

nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies;

postPatch = ''

prePatch = ''
substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \
--replace "<ttm/" "<drm/ttm/"
${dos2unix}/bin/dos2unix src/vboxguest-${version}/vboxguest/r0drv/linux/mp-r0drv-linux.c
'';

patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ];
# Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14
# https://www.virtualbox.org/ticket/18911
patches = [ ./kernel-5.3-fix.patch ];

unpackPhase = ''
${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
--- a/vboxguest/r0drv/linux/mp-r0drv-linux.c
+++ a/vboxguest/r0drv/linux/mp-r0drv-linux.c
@@ -283,12 +283,15 @@
if (RTCpuSetCount(&OnlineSet) > 1)
{
/* Fire the function on all other CPUs without waiting for completion. */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
+ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
+ Assert(!rc); NOREF(rc);
# else
int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
-# endif
Assert(!rc); NOREF(rc);
+# endif
}
#endif

@@ -326,7 +329,6 @@
{
#ifdef CONFIG_SMP
IPRT_LINUX_SAVE_EFL_AC();
- int rc;
RTMPARGS Args;

RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
@@ -337,14 +339,17 @@
Args.cHits = 0;

RTThreadPreemptDisable(&PreemptState);
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
+ Assert(rc == 0); NOREF(rc);
# else /* older kernels */
- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
+ Assert(rc == 0); NOREF(rc);
# endif /* older kernels */
RTThreadPreemptRestore(&PreemptState);

- Assert(rc == 0); NOREF(rc);
IPRT_LINUX_RESTORE_EFL_AC();
#else
RT_NOREF(pfnWorker, pvUser1, pvUser2);
4 changes: 2 additions & 2 deletions pkgs/development/compilers/closure/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "closure-compiler";
version = "20190215";
version = "20190909";

src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
sha256 = "16rpl7x90ganpxlz6v9292cwx7dnkhklqx1nn161yj7ypf9bzd4k";
sha256 = "0km45pz19dz1hi8vjj290hyxdhr379iixmml0rs8crr4gvs3685w";
};

sourceRoot = ".";
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libfaketime/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "libfaketime";
version = "0.9.7";
version = "0.9.8";

src = fetchurl {
url = "https://github.com/wolfcw/libfaketime/archive/v${version}.tar.gz";
sha256 = "07l189881q0hybzmlpjyp7r5fwz23iafkm957bwy4gnmn9lg6rad";
sha256 = "18s2hjm4sbrlg6sby944z87yslnq9s85p7j892hyr42qrlvq4a06";
};

patches = [
12 changes: 6 additions & 6 deletions pkgs/os-specific/linux/zfs/default.nix
Original file line number Diff line number Diff line change
@@ -154,12 +154,12 @@ in {
# incompatibleKernelVersion = "4.20";

# this package should point to the latest release.
version = "0.8.1";
version = "0.8.2";

sha256 = "0wlbziijx08a9bmbyq4gfz4by9l5jrx44g18i99qnfm78k2q8a84";
sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";

extraPatches = [
./build-fixes-unstable.patch
./build-fixes-0.8.patch
];
};

@@ -168,13 +168,13 @@ in {
# incompatibleKernelVersion = "4.19";

# this package should point to a version / git revision compatible with the latest kernel release
version = "0.8.1";
version = "0.8.2";

sha256 = "0wlbziijx08a9bmbyq4gfz4by9l5jrx44g18i99qnfm78k2q8a84";
sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";
isUnstable = true;

extraPatches = [
./build-fixes-unstable.patch
./build-fixes-0.8.patch
];
};
}
6 changes: 3 additions & 3 deletions pkgs/servers/atlassian/jira.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "8.3.2";
version = "8.4.1";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "0cqj7al9892psc5zqpfvj0gnjf8b4dpm2kx7sr21grczss1dkcs1";
sha256 = "0dkilp5wvda29rin2wj9zs2vgwyfning7cz6dyk0kyg45dl07wky";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "Proprietary issue tracking product, also providing project management functions";
homepage = https://www.atlassian.com/software/jira;
homepage = "https://www.atlassian.com/software/jira";
license = licenses.unfree;
maintainers = with maintainers; [ fpletz globin ciil ];
};
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/fuse-overlayfs/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
version = "0.5.1";
version = "0.6.2";

src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "03sdnnq0x44jlwf41snrrma4hxdiixmhynw35gjhm84slpljnngp";
sha256 = "03gad89jg0dif5wqdl1kh0rpmfc80pnkx8hk0v4hrlirr130dgl2";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
6 changes: 4 additions & 2 deletions pkgs/tools/system/stress-ng/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
pname = "stress-ng";
version = "0.10.02";
version = "0.10.05";

src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
sha256 = "100daxz0j80jhmpfnqa78mvfwq1qj7zb67y7w9f747a0f1havvim";
sha256 = "0hkghs99fl8kzg3lkkd4w6cj5133zr9a415py0ng60kzrfffmgdy";
};

# All platforms inputs then Linux-only ones
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "/usr" ""
'';

NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1";

# Won't build on i686 because the binary will be linked again in the
# install phase without checking the dependencies. This will prevent
# triggering the rebuild. Why this only happens on i686 remains a