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: d222dc257502
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: 8072b0975468
Choose a head ref
  • 17 commits
  • 9 files changed
  • 6 contributors

Commits on Feb 20, 2020

  1. fluent-bit: 1.3.7 -> 1.3.8

    marsam committed Feb 20, 2020
    Copy the full SHA
    612130c View commit details

Commits on Feb 21, 2020

  1. go-tools: 2019.2.2 -> 2020.1.3

    marsam committed Feb 21, 2020
    Copy the full SHA
    6559330 View commit details
  2. Copy the full SHA
    be25539 View commit details
  3. grails: 4.0.1 -> 4.0.2

    r-ryantm committed Feb 21, 2020
    Copy the full SHA
    af12b02 View commit details

Commits on Feb 22, 2020

  1. kubectx: 0.7.1 -> 0.8.0

    r-ryantm committed Feb 22, 2020
    Copy the full SHA
    f14a49c View commit details
  2. sudo-font: 0.41 -> 0.42

    marsam committed Feb 22, 2020
    Copy the full SHA
    8ba4961 View commit details
  3. luigi: 2.8.11 -> 2.8.12

    r-ryantm committed Feb 22, 2020
    Copy the full SHA
    08191ab View commit details
  4. cassowary: 0.3.0 -> 0.7.0

    r-ryantm authored and marsam committed Feb 22, 2020
    Copy the full SHA
    66df83f View commit details
  5. Merge pull request #80765 from marsam/update-sudo-font

    sudo-font: 0.41 -> 0.42
    rnhmjoj authored Feb 22, 2020
    Copy the full SHA
    4335b36 View commit details
  6. Copy the full SHA
    75f604e View commit details
  7. Merge pull request #80736 from mmahut/vboximg

    nixos/virtualbox-image: add params
    lukateras authored Feb 22, 2020
    Copy the full SHA
    ab88bb2 View commit details
  8. Merge pull request #80776 from r-ryantm/auto-update/cassowary

    cassowary: 0.3.0 -> 0.7.0
    marsam authored Feb 22, 2020
    Copy the full SHA
    f084468 View commit details
  9. Merge pull request #80767 from r-ryantm/auto-update/luigi

    luigi: 2.8.11 -> 2.8.12
    marsam authored Feb 22, 2020
    Copy the full SHA
    31ebc35 View commit details
  10. Merge pull request #80764 from r-ryantm/auto-update/kubectx

    kubectx: 0.7.1 -> 0.8.0
    marsam authored Feb 22, 2020
    Copy the full SHA
    71368f3 View commit details
  11. Merge pull request #80726 from marsam/update-fluent-bit

    fluent-bit: 1.3.7 -> 1.3.8
    marsam authored Feb 22, 2020
    Copy the full SHA
    443d509 View commit details
  12. Merge pull request #80757 from r-ryantm/auto-update/grails

    grails: 4.0.1 -> 4.0.2
    marsam authored Feb 22, 2020
    Copy the full SHA
    1278add View commit details
  13. Merge pull request #80723 from marsam/update-go-tools

    go-tools: 2019.2.2 -> 2020.1.2
    marsam authored Feb 22, 2020
    Copy the full SHA
    8072b09 View commit details
5 changes: 3 additions & 2 deletions nixos/doc/manual/development/releases.xml
Original file line number Diff line number Diff line change
@@ -71,8 +71,9 @@
<para>
<link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06">
Update <literal>versionSuffix</literal> in
<literal>nixos/release.nix</literal></link>, use <literal>git log
--format=%an|wc -l</literal> to get the commit count
<literal>nixos/release.nix</literal></link>, use
<literal>git rev-list --count 17.09-beta</literal>
to get the commit count.
</para>
</listitem>
<listitem>
39 changes: 33 additions & 6 deletions nixos/modules/virtualisation/virtualbox-image.nix
Original file line number Diff line number Diff line change
@@ -45,10 +45,41 @@ in {
The file name of the VirtualBox appliance.
'';
};
params = mkOption {
type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
example = {
audio = "alsa";
rtcuseutc = "on";
usb = "off";
};
description = ''
Parameters passed to the Virtualbox appliance.
Run <literal>VBoxManage modifyvm --help</literal> to see more options.
'';
};
};
};

config = {

virtualbox.params = mkMerge [
(mapAttrs (name: mkDefault) {
acpi = "on";
vram = 32;
nictype1 = "virtio";
nic1 = "nat";
audiocontroller = "ac97";
audio = "alsa";
audioout = "on";
rtcuseutc = "on";
usb = "on";
usbehci = "on";
mouse = "usbtablet";
})
(mkIf (pkgs.stdenv.hostPlatform.system == "i686-linux") { pae = "on"; })
];

system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {
name = cfg.vmDerivationName;

@@ -69,12 +100,8 @@ in {
VBoxManage createvm --name "$vmName" --register \
--ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
VBoxManage modifyvm "$vmName" \
--memory ${toString cfg.memorySize} --acpi on --vram 32 \
${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \
--nictype1 virtio --nic1 nat \
--audiocontroller ac97 --audio alsa --audioout on \
--rtcuseutc on \
--usb on --usbehci on --mouse usbtablet
--memory ${toString cfg.memorySize} \
${lib.cli.toGNUCommandLineShell { } cfg.params}
VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
--medium disk.vmdk
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/luigi/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

python3Packages.buildPythonApplication rec {
pname = "luigi";
version = "2.8.11";
version = "2.8.12";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "17nc5xrqp6hp3ayscvdpsiiga8gsfpa4whsk0n97gzk5qpndrcy2";
sha256 = "1p83mxqs7w5v27a58ps7wji5mlyfz66cpkbyrndix0pv9hdyzpxn";
};

propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];
10 changes: 6 additions & 4 deletions pkgs/data/fonts/sudo/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
{ lib, fetchzip }:

let
version = "0.41";
version = "0.42";
in fetchzip {
name = "sudo-font-${version}";
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
sha256 = "055sz9jg3fg7ypk9nia4dl9haaaq3w8zx5c2cdi3iq9kj8k5gg53";
sha256 = "1rqpwihf2sakrhkaw041r3xc9fhafaqn22n79haqkmwv4vmnspch";

postFetch = ''
mkdir -p $out/share/fonts/truetype/
mkdir -p $out/share/fonts/
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/
unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff/
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2/
'';
meta = with lib; {
description = "Font for programmers and command line users";
homepage = https://www.kutilek.de/sudo-font/;
homepage = "https://www.kutilek.de/sudo-font/";
license = licenses.ofl;
maintainers = with maintainers; [ dtzWill ];
platforms = platforms.all;
9 changes: 4 additions & 5 deletions pkgs/development/tools/go-tools/default.nix
Original file line number Diff line number Diff line change
@@ -5,22 +5,21 @@

buildGoModule rec {
pname = "go-tools";
version = "2019.2.2";
version = "2020.1.3";

goPackagePath = "honnef.co/go/tools";
excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata'';

src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = version;
sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd";
sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf";
};

modSha256 = "0ysaq94m7pkziliz4z4dl8ad84mbn17m2hqxvs9wbw4iwhkpi7gz";
modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p";

meta = with lib; {
description = "A collection of tools and libraries for working with Go code, including linters and static analysis.";
description = "A collection of tools and libraries for working with Go code, including linters and static analysis";
homepage = https://staticcheck.io;
license = licenses.mit;
maintainers = with maintainers; [ rvolosatovs kalbasit ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/kubectx/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@ with lib;

stdenv.mkDerivation rec {
pname = "kubectx";
version = "0.7.1";
version = "0.8.0";

src = fetchFromGitHub {
owner = "ahmetb";
repo = pname;
rev = "v${version}";
sha256 = "0mv40jh94by99i5wkf3p52wk4l68hvly1k5gnn7zsy9avc8fjd0p";
sha256 = "1wkvmic29mkzfs6619wjs3mya8ffigwv9n1w9y7zkfvpi8gxa0a6";
};

buildInputs = [ makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/development/web/grails/default.nix
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
pname = "grails";
version = "4.0.1";
version = "4.0.2";

src = fetchurl {
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
sha256 = "0igkzxqfm6lvp4s8w6kavdvjriq59q42jmj9ynbc669dvy6y6725";
sha256 = "0ry2z4xn0zmdr38k0aa9qiwvfg3q4yxd1wxdwmhzp1vd3g39cx49";
};

buildInputs = [ unzip ];
4 changes: 2 additions & 2 deletions pkgs/tools/misc/fluent-bit/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "fluent-bit";
version = "1.3.7";
version = "1.3.8";

src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
sha256 = "1j0fzhakk4kpfpq4p4c0byw99adxd9w7irfn83rlvw8bw32j2lrj";
sha256 = "1b14hm809zy4idg8p2ah1sg4pgzqyy459mlf7rfc2msvf716sicr";
};

nativeBuildInputs = [ cmake flex bison ];
12 changes: 7 additions & 5 deletions pkgs/tools/networking/cassowary/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }:
{ lib, buildGoModule, fetchFromGitHub }:

buildGoModule rec {
pname = "cassowary";
version = "0.3.0";
version = "0.7.0";

src = fetchFromGitHub {
owner = "rogerwelin";
repo = pname;
rev = "33b7e81a5d147980f4ddc689818df2b071f6ab4e";
sha256 = "01cdmh2v9rz8rna08hdsddllck6zp9wcrhxdy6hs77zfsbzyfflx";
rev = "v${version}";
sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj";
};

modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c";

buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

meta = with lib; {
homepage = "https://github.com/rogerwelin/cassowary";
description = "Modern cross-platform HTTP load-testing tool written in Go ";
description = "Modern cross-platform HTTP load-testing tool written in Go";
license = licenses.mit;
maintainers = with maintainers; [ hugoreeves ];
platforms = platforms.unix;