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: 39dcb59fbf6f
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: f5a072bdf4e4
Choose a head ref

Commits on Mar 3, 2020

  1. sqlite: 3.31.0 -> 3.31.1

    r-ryantm committed Mar 3, 2020
    Copy the full SHA
    15b4beb View commit details

Commits on Mar 6, 2020

  1. cmake: 3.16.4 -> 3.16.5

    r-ryantm committed Mar 6, 2020
    Copy the full SHA
    b3793e1 View commit details
  2. stdenv: Fix gcc multi line libc-cflags

    which broke at least libstdc++5.
    
    Closes #79761
    clkamp committed Mar 6, 2020
    Copy the full SHA
    80729b6 View commit details

Commits on Mar 7, 2020

  1. mc: 4.8.23 -> 4.8.24

    Izorkin committed Mar 7, 2020
    Copy the full SHA
    784740a View commit details
  2. Copy the full SHA
    805e068 View commit details
  3. libical: 3.0.7 -> 3.0.8

    r-ryantm committed Mar 7, 2020
    Copy the full SHA
    d985dc8 View commit details
  4. libseccomp: 2.4.2 -> 2.4.3

    r-ryantm committed Mar 7, 2020
    Copy the full SHA
    051637d View commit details

Commits on Mar 8, 2020

  1. Merge pull request #81998 from eadwu/eigen/gitlab-source

    eigen: fetch source from gitlab
    markuskowa authored Mar 8, 2020
    Copy the full SHA
    fd48d9b View commit details
  2. Merge pull request #81191 from clkamp/stdenv-multi-line-libc-cflags

    stdenv: Fix gcc multi line libc-cflags
    Ericson2314 authored Mar 8, 2020
    Copy the full SHA
    5c4dd08 View commit details
  3. Merge master into staging-next

    FRidh committed Mar 8, 2020
    Copy the full SHA
    a7db7b5 View commit details
  4. Merge pull request #81869 from r-ryantm/auto-update/cmake

    cmake: 3.16.4 -> 3.16.5
    ttuegel authored Mar 8, 2020
    Copy the full SHA
    65d5cc1 View commit details
  5. libgme: 0.6.2 -> 0.6.3

    r-ryantm committed Mar 8, 2020
    Copy the full SHA
    8d612a3 View commit details
  6. libusb-compat: 0.1.5 -> 0.1.7

    Also, change the source repository to the GitHub repository pointed to by the
    official website.
    Leon Schuermann authored and lschuermann committed Mar 8, 2020
    Copy the full SHA
    54bab3f View commit details
  7. libusb: build from source instead of release tarball

    Leon Schuermann authored and lschuermann committed Mar 8, 2020
    Copy the full SHA
    aa63d51 View commit details
  8. Merge pull request #82024 from r-ryantm/auto-update/libical

    libical: 3.0.7 -> 3.0.8
    jtojnar authored Mar 8, 2020
    Copy the full SHA
    71a76a4 View commit details

Commits on Mar 9, 2020

  1. Merge pull request #82025 from r-ryantm/auto-update/libseccomp

    libseccomp: 2.4.2 -> 2.4.3
    marsam authored Mar 9, 2020
    Copy the full SHA
    824635f View commit details
  2. Merge pull request #48434 from lschuermann/libusb-mirror

    libusb-compat: 0.1.5 -> 0.1.7 && change libusb source to GitHub
    Mic92 authored Mar 9, 2020
    Copy the full SHA
    9f55c5e View commit details
  3. Merge pull request #82066 from r-ryantm/auto-update/libgme

    libgme: 0.6.2 -> 0.6.3
    lheckemann authored Mar 9, 2020
    Copy the full SHA
    4eeb6f0 View commit details

Commits on Mar 10, 2020

  1. stdenv cc-wrapper: deal with edge-case regressions

    Regression introduced in PR #81191 80729b6.  The file does not exist
    somewhere during bootstrap of pkgsStatic.busybox which is used in nix
    (by default).
    
    I tested the builds.
    vcunat committed Mar 10, 2020
    Copy the full SHA
    1d9c10c View commit details
  2. Copy the full SHA
    0e3ad60 View commit details
  3. nss: 3.49.2 -> 3.51

    KamilaBorowska committed Mar 10, 2020
    Copy the full SHA
    60c646c View commit details
  4. Copy the full SHA
    1e579d1 View commit details
  5. Merge branch 'master' into staging-next

    Hydra nixpkgs: ?compare=1574844
    vcunat committed Mar 10, 2020
    Copy the full SHA
    f8d4120 View commit details
  6. rabbitmq-server: 3.8.2 -> 3.8.3

    r-ryantm authored and Profpatsch committed Mar 10, 2020
    Copy the full SHA
    cf2bba7 View commit details
  7. Copy the full SHA
    967a5b3 View commit details
  8. Merge pull request #81648 from r-ryantm/auto-update/sqlite

    sqlite: 3.31.0 -> 3.31.1
    andir authored Mar 10, 2020
    Copy the full SHA
    4df9601 View commit details
  9. Merge branch 'staging' into staging-next

    It turned out we additionally need sqlite bump for firefox 74.
    vcunat committed Mar 10, 2020
    Copy the full SHA
    b693c8c View commit details

Commits on Mar 11, 2020

  1. sqlite-analyzer: 3.31.0 -> 3.31.1

    This was forgotten in PR #81648.
    It's a small bump, so I just tested that it builds.
    vcunat committed Mar 11, 2020
    Copy the full SHA
    f8bf6f0 View commit details

Commits on Mar 12, 2020

  1. Merge master into staging-next

    FRidh committed Mar 12, 2020
    Copy the full SHA
    8fa5eb4 View commit details
  2. firefox: 73.0.1 -> 74.0 (#82276)

    https://www.mozilla.org/en-US/firefox/74.0/releasenotes/
    
    Co-authored-by: Daniel Frank <git@danielfrank.net>
    andir and tokudan authored Mar 12, 2020
    Copy the full SHA
    ea8362e View commit details

Commits on Mar 13, 2020

  1. nixos/kvmgt: fix driver option

    extraModprobeConfig could be applied too late i.e. if the driver has been
    loaded in initrd, while the harddrive is still encrypted.
    Using a kernelParams works in all cases however.
    Mic92 committed Mar 13, 2020
    Copy the full SHA
    85aae79 View commit details
  2. Copy the full SHA
    505d241 View commit details

Commits on Mar 14, 2020

  1. hcloud: 1.14.0 -> 1.16.1

    r-ryantm committed Mar 14, 2020
    Copy the full SHA
    5b82787 View commit details
  2. helmfile: 0.85.0 -> 0.102.0

    r-ryantm committed Mar 14, 2020
    Copy the full SHA
    fb7e2cd View commit details
  3. Merge branch 'staging-next'

    vcunat committed Mar 14, 2020
    Copy the full SHA
    6dcb71e View commit details
  4. Merge pull request #82468 from Mic92/kvmgt

    nixos/kvmgt: udev rules + fix module initialisation
    Mic92 authored Mar 14, 2020
    Copy the full SHA
    4a8a014 View commit details
  5. Copy the full SHA
    96bfae7 View commit details
  6. mc: add autoreconfHook instead of /usr/bin/file patch

    The error is still there but harmless.
    It should be rather fixed in autoconf than in every package that
    uses autotools.
    Mic92 committed Mar 14, 2020
    Copy the full SHA
    841b89c View commit details
  7. mc: quote urls

    Mic92 committed Mar 14, 2020
    Copy the full SHA
    0ad2243 View commit details
  8. Merge pull request #78172 from Izorkin/mc

    mc: 4.8.23 -> 4.8.24
    Mic92 authored Mar 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    4202545 View commit details
  9. abiword: 3.0.2 -> 3.0.4

    Updates AbiWord to the latest version, patches it to support enchant2, and add
    myself to the maintainers list.
    S-NA committed Mar 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    0cf9343 View commit details
  10. Merge pull request #82549 from r-ryantm/auto-update/lefthook

    gitAndTools.lefthook: 0.6.3 -> 0.7.1
    Mic92 authored Mar 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    f8676f8 View commit details
  11. Merge pull request #82544 from r-ryantm/auto-update/hcloud

    hcloud: 1.14.0 -> 1.16.1
    Mic92 authored Mar 14, 2020
    Copy the full SHA
    1a3ca53 View commit details
  12. Merge pull request #82545 from r-ryantm/auto-update/helmfile

    helmfile: 0.85.0 -> 0.102.0
    Mic92 authored Mar 14, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    83535fd View commit details
  13. radare2: 4.3.0 -> 4.3.1

    Mic92 committed Mar 14, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    09ad2cf View commit details
  14. linux: 5.4.24 -> 5.4.25

    NeQuissimus committed Mar 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f9fcf29 View commit details
  15. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    16eb11b View commit details
  16. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f30b8ad View commit details
  17. Merge pull request #82553 from S-NA/updates/abiword-3.0.4

    abiword: 3.0.2 -> 3.0.4
    pSub authored Mar 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f5a072b View commit details
16 changes: 8 additions & 8 deletions nixos/modules/virtualisation/kvmgt.nix
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@ in {
virtualisation.kvmgt = {
enable = mkEnableOption ''
KVMGT (iGVT-g) VGPU support. Allows Qemu/KVM guests to share host's Intel integrated graphics card.
Currently only one graphical device can be shared
Currently only one graphical device can be shared. To allow users to access the device without root add them
to the kvm group: <literal>users.extraUsers.&lt;yourusername&gt;.extraGroups = [ "kvm" ];</literal>
'';
# multi GPU support is under the question
device = mkOption {
@@ -35,9 +36,7 @@ in {
and find info about device via <command>cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description</command>
'';
example = {
i915-GVTg_V5_8 = {
uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525";
};
i915-GVTg_V5_8.uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525";
};
};
};
@@ -50,10 +49,7 @@ in {
};

boot.kernelModules = [ "kvmgt" ];

boot.extraModprobeConfig = ''
options i915 enable_gvt=1
'';
boot.kernelParams = [ "i915.enable_gvt=1" ];

systemd.paths = mapAttrs' (name: value:
nameValuePair "kvmgt-${name}" {
@@ -65,6 +61,10 @@ in {
}
) cfg.vgpus;

services.udev.extraRules = ''
SUBSYSTEM=="vfio", OWNER="root", GROUP="kvm"
'';

systemd.services = mapAttrs' (name: value:
nameValuePair "kvmgt-${name}" {
description = "KVMGT VGPU ${name}";
8 changes: 3 additions & 5 deletions pkgs/applications/networking/browsers/firefox/common.nix
Original file line number Diff line number Diff line change
@@ -94,11 +94,6 @@ stdenv.mkDerivation ({
patches = [
./env_var_for_system_dir.patch
]
++ lib.optional (lib.versionAtLeast ffversion "73") (fetchpatch {
# https://phabricator.services.mozilla.com/D60667
url = "https://hg.mozilla.org/mozilla-central/raw-rev/b3d8b08265b800165d684281d19ac845a8ff9a66";
sha256 = "0b4s75w7sl619rglcjmlyvyibpj2ar5cpy6pnywl1xpd9qzyb27p";
})
++ patches;


@@ -297,6 +292,9 @@ stdenv.mkDerivation ({
inherit browserName;
} // lib.optionalAttrs gtk3Support { inherit gtk3; };
} //
lib.optionalAttrs (lib.versionAtLeast ffversion "74") {
hardeningDisable = [ "format" ]; # -Werror=format-security
} //
# the build system verifies checksums of the bundled rust sources
# ./third_party/rust is be patched by our libtool fixup code in stdenv
# unfortunately we can't just set this to `false` when we do not want it.
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/packages.nix
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "73.0.1";
ffversion = "74.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9";
sha512 = "245n2ilfgx3rd0xlxzpg4gcwddcy0cgaqnaf5pwixjx0n8py1imiylwlsbihf70s41cq5q8awckchs287yysr4v6pdfqqbj7s0f02ki";
};

patches = [
8 changes: 4 additions & 4 deletions pkgs/applications/networking/cluster/helmfile/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:

let version = "0.85.0"; in
let version = "0.102.0"; in

buildGoModule {
pname = "helmfile";
@@ -10,12 +10,12 @@ buildGoModule {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "0k1019ddzhhl8kn70ibqf6srlfv92jkc26m78pic5c7ibqyq5fds";
sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy";
};

goPackagePath = "github.com/roboll/helmfile";

modSha256 = "1npjm3rs32c1rwx8xb9s03jhd156da6p66hpaqccm7b6zxsm32nv";
modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq";

nativeBuildInputs = [ makeWrapper ];

@@ -31,7 +31,7 @@ buildGoModule {

meta = {
description = "Deploy Kubernetes Helm charts";
homepage = https://github.com/roboll/helmfile;
homepage = "https://github.com/roboll/helmfile";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
platforms = lib.platforms.unix;
18 changes: 12 additions & 6 deletions pkgs/applications/office/abiword/default.nix
Original file line number Diff line number Diff line change
@@ -5,23 +5,29 @@

stdenv.mkDerivation rec {
pname = "abiword";
version = "3.0.2";
version = "3.0.4";

src = fetchurl {
url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
sha256 = "1mx5l716n0z5788i19qmad30cck4v9ggr071cafw2nrf375rcc79";
};

enableParallelBuilding = true;

patches = [
# https://bugzilla.abisource.com/show_bug.cgi?id=13791
# Switch to using enchant2; note by the next update enchant2 should be
# default and this patch can be removed.
# https://github.com/NixOS/nixpkgs/issues/38506
(fetchurl {
url = https://bugzilla.abisource.com/attachment.cgi?id=5860;
sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/enchant-2.1.patch?h=packages/abiword";
sha256 = "444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2";
})
];

postPatch = ''
substituteInPlace configure --replace 'enchant >=' 'enchant-2 >='
'';

nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

buildInputs = [
@@ -34,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = https://www.abisource.com/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ylwghst ];
maintainers = with maintainers; [ pSub ylwghst sna ];
};
}
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "lefthook";
version = "0.6.3";
version = "0.7.1";

src = fetchFromGitHub {
rev = "v${version}";
owner = "Arkweid";
repo = "lefthook";
sha256 = "01zvlw2yyxjg92d1qag1b42kc2kd68h4fmrv9y6ar7z0rw3p9a5d";
sha256 = "14rcvbzzrx0m3xijl8qhw5l2h0q10hqzad2hqm3079g893f2qad0";
};

modSha256 = "0mjhw778x40c2plmjlkiry4rwvr9xkz65b88a61j86liv2plbmq2";
modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq";

meta = with stdenv.lib; {
description = "Fast and powerful Git hooks manager for any type of projects";
6 changes: 6 additions & 0 deletions pkgs/build-support/cc-wrapper/default.nix
Original file line number Diff line number Diff line change
@@ -363,7 +363,13 @@ stdenv.mkDerivation {
done
''

# There are a few tools (to name one libstdcxx5) which do not work
# well with multi line flags, so make the flags single line again
+ ''
if [ -e "$out/nix-support/libc-cflags" ]; then
substituteInPlace "$out/nix-support/libc-cflags" --replace $'\n' ' '
fi
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
6 changes: 3 additions & 3 deletions pkgs/development/libraries/audio/libgme/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchFromBitbucket, cmake }:
let
version = "0.6.2";
version = "0.6.3";
in stdenv.mkDerivation {
pname = "libgme";
inherit version;

meta = with stdenv.lib; {
description = "A collection of video game music chip emulators";
homepage = https://bitbucket.org/mpyne/game-music-emu/overview;
homepage = "https://bitbucket.org/mpyne/game-music-emu/overview";
license = licenses.lgpl21;
platforms = platforms.all;
maintainers = with maintainers; [ lheckemann ];
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
owner = "mpyne";
repo = "game-music-emu";
rev = version;
sha256 = "00vlbfk5h99dq5rbwxk20dv72dig6wdwpgf83q451avsscky0jvk";
sha256 = "100ahb4n4pvgcry9xzlf2fr4j57n5h9x7pvyhhxys4dcy8axqqsy";
};

buildInputs = [ cmake ];
21 changes: 10 additions & 11 deletions pkgs/development/libraries/eigen/2.0.nix
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
{stdenv, fetchurl, cmake}:
{ stdenv, fetchFromGitLab, cmake }:

let
v = "2.0.17";
in
stdenv.mkDerivation {
name = "eigen-${v}";
stdenv.mkDerivation rec {
pname = "eigen";
version = "2.0.17";

src = fetchurl {
url = "https://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
name = "eigen-${v}.tar.bz2";
sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj";
src = fetchFromGitLab {
owner = "libeigen";
repo = "eigen";
rev = version;
sha256 = "0d4knrcz04pxmxaqs5r3wv092950kl1z9wsw87vdzi9kgvc6wl0b";
};

nativeBuildInputs = [ cmake ];

meta = with stdenv.lib; {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
homepage = http://eigen.tuxfamily.org ;
homepage = "https://eigen.tuxfamily.org";
maintainers = with stdenv.lib.maintainers; [ sander raskin ];
branch = "2";
platforms = with stdenv.lib.platforms; unix;
20 changes: 9 additions & 11 deletions pkgs/development/libraries/eigen/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{stdenv, fetchurl, cmake}:
{ stdenv, fetchFromGitLab, cmake }:

let
version = "3.3.7";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "eigen";
inherit version;
version = "3.3.7";

src = fetchurl {
url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
sha256 = "1nnh0v82a5xibcjaph51mx06mxbllk77fvihnd5ba0kpl23yz13y";
src = fetchFromGitLab {
owner = "libeigen";
repo = "eigen";
rev = version;
sha256 = "1i3cvg8d70dk99fl3lrv3wqhfpdnm5kx01fl7r2bz46sk9bphwm1";
};

patches = [
@@ -22,7 +20,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
homepage = http://eigen.tuxfamily.org ;
homepage = "https://eigen.tuxfamily.org";
platforms = platforms.unix;
maintainers = with stdenv.lib.maintainers; [ sander raskin ];
inherit version;
6 changes: 3 additions & 3 deletions pkgs/development/libraries/libical/default.nix
Original file line number Diff line number Diff line change
@@ -15,15 +15,15 @@

stdenv.mkDerivation rec {
pname = "libical";
version = "3.0.7";
version = "3.0.8";

outputs = [ "out" "dev" ]; # "devdoc" ];

src = fetchFromGitHub {
owner = "libical";
repo = "libical";
rev = "v${version}";
sha256 = "1ppf8jlpiclq3jprhx889y5lgf6lc2q4d8wy2zavzsxgnsqf67il";
sha256 = "0pkh74bfrgp1slv8wsv7lbmal2m7qkixwm5llpmfwaiv14njlp68";
};

nativeBuildInputs = [
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
homepage = https://github.com/libical/libical;
homepage = "https://github.com/libical/libical";
description = "An Open Source implementation of the iCalendar protocols";
license = licenses.mpl20;
platforms = platforms.unix;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libseccomp/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "libseccomp";
version = "2.4.2";
version = "2.4.3";

src = fetchurl {
url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
sha256 = "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm";
sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg";
};

outputs = [ "out" "lib" "dev" "man" ];
17 changes: 10 additions & 7 deletions pkgs/development/libraries/libusb/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{stdenv, fetchurl, pkgconfig, libusb1}:
{stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1}:

stdenv.mkDerivation {
name = "libusb-compat-0.1.5";
stdenv.mkDerivation rec {
name = "libusb-compat-${version}";
version = "0.1.7";

outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
outputBin = "dev";

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
propagatedBuildInputs = [ libusb1 ];

src = fetchurl {
url = mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2;
sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0";
src = fetchFromGitHub {
owner = "libusb";
repo = "libusb-compat-0.1";
rev = "v${version}";
sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5";
};

patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
23 changes: 12 additions & 11 deletions pkgs/development/libraries/libusb1/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchurl
, fetchFromGitHub
, autoreconfHook
, pkgconfig
, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
, systemd ? null
@@ -10,22 +11,26 @@

assert enableSystemd -> systemd != null;

stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
pname = "libusb";
version = "1.0.23";

src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv";
src = fetchFromGitHub {
owner = "libusb";
repo = "libusb";
rev = "v${version}";
sha256 = "0mxbpg01kgbk5nh6524b0m4xk7ywkyzmc3yhi5asqcsd3rbhjj98";
};

outputs = [ "out" "dev" ]; # get rid of propagating systemd closure

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
propagatedBuildInputs =
stdenv.lib.optional enableSystemd systemd ++
stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];

dontDisableStatic = withStatic;

NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

preFixup = stdenv.lib.optionalString stdenv.isLinux ''
@@ -43,8 +48,4 @@ stdenv.mkDerivation (rec {
license = licenses.lgpl21Plus;
maintainers = [ ];
};
} // stdenv.lib.optionalAttrs withStatic {
# Carefully added here to avoid a mass rebuild.
# Inline this the next time this package changes.
dontDisableStatic = withStatic;
})
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/nss/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ let
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
version = "3.49.2";
version = "3.51";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;

in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
sha256 = "1ck0c4ikr0d747pn63h62b2iqzfgi0yzd25aw95hs9797hn519zs";
sha256 = "1725d0idf5zzqafdqfdn9vprc7ys2ywhv23sqn328di968xqnd3m";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/sqlite/analyzer.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@ in

stdenv.mkDerivation rec {
pname = "sqlite-analyzer";
version = "3.31.0";
version = "3.31.1";

src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip";
sha256 = "1dz3s3q9gsxxfj9wp4lqndzpwd1hcvm42yqn02p0l0bs6bw0mp5l";
sha256 = "0n7f3w59gr80s6k4l5a9bp2s97dlfapfbhb3qdhak6axhn127p7j";
};

nativeBuildInputs = [ unzip ];
6 changes: 3 additions & 3 deletions pkgs/development/libraries/sqlite/default.nix
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ in

stdenv.mkDerivation rec {
pname = "sqlite";
version = "3.31.0";
version = "3.31.1";

# NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "1w7i954349sjd5a6rvy118prra43k07y9hy8rpajs6vmjmnnx7bw";
sha256 = "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32";
};

outputs = [ "bin" "dev" "out" ];
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
downloadPage = https://sqlite.org/download.html;
homepage = https://www.sqlite.org/;
homepage = "https://www.sqlite.org/";
license = licenses.publicDomain;
maintainers = with maintainers; [ eelco np ];
platforms = platforms.unix ++ platforms.windows;
14 changes: 7 additions & 7 deletions pkgs/development/tools/analysis/radare2/default.nix
Original file line number Diff line number Diff line change
@@ -110,17 +110,17 @@ in {
#<generated>
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
version_commit = "23881";
gittap = "4.3.0";
gittip = "bb78ef34573020a6e92a975d0dafcddff52e6892";
rev = "4.3.0";
version = "4.3.0";
sha256 = "19mj419shphcgsf6ndii5i45dcac0nwiwnzp83wccnivpyfhcpnv";
version_commit = "23963";
gittap = "4.3.1";
gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";
rev = "4.3.1";
version = "4.3.1";
sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30";
cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
r2-for-cutter = generic {
version_commit = "23881";
version_commit = "23963";
gittap = "4.2.1";
gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
6 changes: 3 additions & 3 deletions pkgs/development/tools/build-managers/cmake/default.nix
Original file line number Diff line number Diff line change
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
version = "3.16.4";
version = "3.16.5";

src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v";
sha256 = "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz";
};

patches = [
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
doCheck = false; # fails

meta = with lib; {
homepage = http://www.cmake.org/;
homepage = "http://www.cmake.org/";
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else platforms.all;
maintainers = with maintainers; [ ttuegel lnl7 ];
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.204.4";
version = "2.204.5";

src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "0m4g0hm7cfmma5lrs9jsdy2gzp383hhh4k968s41krdms2pf5jhf";
sha256 = "17437wshci2fyvvaznzk738m2npqa61w16aw5jslw2ifnyjkziwl";
};

buildCommand = ''
6 changes: 3 additions & 3 deletions pkgs/development/tools/hcloud/default.nix
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

buildGoModule rec {
pname = "hcloud";
version = "1.14.0";
version = "1.16.1";

goPackagePath = "github.com/hetznercloud/cli";

src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "v${version}";
sha256 = "167x64ni4xm0d9b02gy8zvc8knhsvb1c9jhysw7svi7iaw5f2ds5";
sha256 = "1d6qa21sq79hr84nnn3j7w0776mnq58g8g1krpnh4d6bv3kc3lq7";
};

modSha256 = "1g81szkrkxmv51l78v0d39i8dvrrdhf8wh38rwxvnay3iajgrnqk";
modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx";

buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];

4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.24";
version = "5.4.25";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1cvy3mxwzll4f9j8i3hfmi0i0zq75aiafq1jskp9n4kq9iwar83z";
sha256 = "09ay0adc3s3m7qk0nj5lkmrp5i0q76a9kax0xix8914d115rgvf0";
};
} // (args.argsOverride or {}))
11 changes: 8 additions & 3 deletions pkgs/servers/amqp/rabbitmq-server/default.nix
Original file line number Diff line number Diff line change
@@ -2,17 +2,18 @@
, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat
, procps, coreutils, gnused, systemd, glibcLocales
, AppKit, Carbon, Cocoa
, nixosTests
}:

stdenv.mkDerivation rec {
pname = "rabbitmq-server";

version = "3.8.2";
version = "3.8.3";

# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "17gixahxass9n4d697my8sq4an51rw3cicb36fqvl8fbhnwjjrwc";
sha256 = "1fhs3g2pgrq2xi4hnlc437hkv3261l4i134m6mxid00sf1c89p5f";
};

buildInputs =
@@ -59,10 +60,14 @@ stdenv.mkDerivation rec {
'';

meta = {
homepage = https://www.rabbitmq.com/;
homepage = "https://www.rabbitmq.com/";
description = "An implementation of the AMQP messaging protocol";
license = stdenv.lib.licenses.mpl11;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
};

passthru.tests = {
vm-test = nixosTests.rabbitmq;
};
}
6 changes: 3 additions & 3 deletions pkgs/shells/zsh/oh-my-zsh/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:

stdenv.mkDerivation rec {
version = "2020-03-05";
version = "2020-03-12";
pname = "oh-my-zsh";
rev = "2eb3e9d57cf69f3c2fa557f9047e0a648d80b235";
rev = "07e3236bc5c8dbf9d818a4f0145f09bdb4bec6f0";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "025xd53j307wh3bly456b7y6r71wm2dzqn6xway0rsc6r5b70z4x";
sha256 = "1imjvig60r250ljbnajxq4zv4fgs3l3jrrda0dvlnax5v5psxb12";
};

pathsToLink = [ "/share/oh-my-zsh" ];
15 changes: 8 additions & 7 deletions pkgs/tools/misc/mc/default.nix
Original file line number Diff line number Diff line change
@@ -15,18 +15,19 @@
, libssh2
, openssl
, coreutils
, autoreconfHook
}:

stdenv.mkDerivation rec {
pname = "mc";
version = "4.8.23";
version = "4.8.24";

src = fetchurl {
url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz";
sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx";
url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz";
sha256 = "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5";
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];

buildInputs = [
file
@@ -58,12 +59,12 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "File Manager and User Shell for the GNU Project";
downloadPage = "http://www.midnight-commander.org/downloads/";
homepage = "http://www.midnight-commander.org";
downloadPage = "https://www.midnight-commander.org/downloads/";
homepage = "https://www.midnight-commander.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ sander ];
platforms = with platforms; linux ++ darwin;
repositories.git = git://github.com/MidnightCommander/mc.git;
repositories.git = "https://github.com/MidnightCommander/mc.git";
updateWalker = true;
};
}