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: 595a3d14b7bf
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: 9893f64b578e
Choose a head ref

Commits on Jun 17, 2020

  1. dashing: 2018-02-15 -> 0.4.0

    sikmir committed Jun 17, 2020
    Copy the full SHA
    e829b1a View commit details

Commits on Jun 20, 2020

  1. Copy the full SHA
    54bba2e View commit details

Commits on Jun 21, 2020

  1. test-driver.py: delete VM state directory after test run

    Keeping the VM state test across several run sometimes lead to subtle
    and hard to spot errors in practice. We delete the VM state which
    contains (among other things) the qcow volume.
    
    We also introduce a -K (--keep-vm-state) flag making VM state to
    persist after the test run. This flag makes test-driver.py to match
    its previous behaviour.
    picnoir committed Jun 21, 2020
    Copy the full SHA
    7e7aa52 View commit details

Commits on Jun 24, 2020

  1. Copy the full SHA
    c25fd71 View commit details
  2. fbmenugen: 2020-05-20 -> 0.85

    romildo committed Jun 24, 2020
    Copy the full SHA
    ce47481 View commit details

Commits on Jun 28, 2020

  1. pylint: fix 1.9

    It depends on pyenchant, which is disabled on python2. This results
    in:
    ```
    nix-env -iA unstable.python27Packages.pylint
    replacing old 'python2.7-pylint-1.9.5'
    installing 'python2.7-pylint-1.9.5'
    error: pyenchant-3.1.1 not supported for interpreter python2.7
    ```
    
    Remove it, à la
    NixOS/nixpkgs@eb0d5fc
    and now it builds again.
    rski committed Jun 28, 2020
    Copy the full SHA
    dfcd82a View commit details
  2. Copy the full SHA
    7706c65 View commit details
  3. easypdk: init at 1.2

    david-sawatzke committed Jun 28, 2020
    Copy the full SHA
    a531363 View commit details
  4. libosmium: 2.15.5 -> 2.15.6

    das-g committed Jun 28, 2020
    Copy the full SHA
    c00e98b View commit details
  5. osmium-tool 1.12.0 -> 1.12.1

    das-g committed Jun 28, 2020
    Copy the full SHA
    47e52ab View commit details
  6. Copy the full SHA
    b7571c9 View commit details
  7. age: unstable-2020-03-25 -> v1.0.0-beta4

    Bumping to upstream release from 2020-06-28. This skips 1.0.0-beta3,
    which was released on the same day and contained a bug.
    
    Upstream changelog:
    
    189041b6 (tag: v1.0.0-beta4) age: move package from filippo.io/age/age to filippo.io/age 🤦♂
    e6093596 (tag: v1.0.0-beta3) age,agessh,armor: unleash public API 💥🦑
    33355dcc internal/age: unexport NewX25519Recipient and NewX25519Identity
    9a08b7e6 internal/age,internal/armor: add examples
    9b83d948 internal/age: surface format.Recipient as type Stanza
    c9a35c07 internal/agessh: move EncryptedSSHIdentity out of cmd/age
    7d608d12 .github/workflows: add rage interop tests trigger (#125)
    6782356e internal/age: add some docs and polish API
    08546656 internal/format: fix a nasty bufio.Reader nesting bug
    292c3aae internal/agessh: new package
    b32ea4c1 cmd/age: add a TODO about not dumping decrypted binary to the terminal
    c7c7f187 internal/armor: new package
    a7c4274d internal/age: remove EncryptWithArmor and armor support in Decrypt
    7088a732 internal/age: unexport SSHFingerprint
    tazjin committed Jun 28, 2020
    Copy the full SHA
    c7f2976 View commit details
  8. broot: 0.18.0 -> 0.18.1

    bbigras committed Jun 28, 2020
    Copy the full SHA
    313b2dc View commit details
  9. Merge pull request #91698 from helsinki-systems/init/batsignal

    batsignal: Init at 1.0.0
    Ma27 authored Jun 28, 2020
    Copy the full SHA
    bd0d0e9 View commit details
  10. Merge pull request #90714 from Philipp-M/fix-nushell-checkphase

    nushell: add checkPhase without --target which causes failing tests
    Ma27 authored Jun 28, 2020
    Copy the full SHA
    701720b View commit details
  11. Merge pull request #91728 from tazjin/chore/age-bump-1.0.0-beta4

    age: unstable-2020-03-25 -> v1.0.0-beta4
    marsam authored Jun 28, 2020
    Copy the full SHA
    5c1086f View commit details
  12. Merge pull request #90674 from sikmir/dashing

    dashing: 2018-02-15 -> 0.4.0
    Ma27 authored Jun 28, 2020
    Copy the full SHA
    09aa289 View commit details
  13. Merge pull request #91671 from david-sawatzke/easypdkprog

    easypdkprog: init at 1.2
    danieldk authored Jun 28, 2020
    Copy the full SHA
    96ccfba View commit details
  14. Merge pull request #91729 from bbigras/broot

    broot: 0.18.0 -> 0.18.1
    danieldk authored Jun 28, 2020
    Copy the full SHA
    116053a View commit details
  15. Merge pull request #91046 from NinjaTrappeur/nin-delete-vm-state

    test-driver.py: delete VM state directory after test run
    flokli authored Jun 28, 2020
    Copy the full SHA
    9e248c9 View commit details
  16. Merge pull request #91721 from rski/pylint-19

    pylint: fix 1.9
    Ma27 authored Jun 28, 2020
    Copy the full SHA
    165ed2a View commit details
  17. Merge pull request #91725 from das-g/libosmium-2.15.6

    libosmium: 2.15.5 -> 2.15.6
    danieldk authored Jun 28, 2020
    Copy the full SHA
    70ca51c View commit details
  18. Merge pull request #91401 from romildo/upd.qogir-icon-theme

    qogir-icon-theme: 2020-02-21 -> 2020-06-22
    romildo authored Jun 28, 2020
    Copy the full SHA
    ac8b5be View commit details
  19. Merge pull request #91404 from romildo/upd.fbmenugen

    fbmenugen: 2020-05-20 -> 0.85
    romildo authored Jun 28, 2020
    Copy the full SHA
    31bbaa4 View commit details
  20. Copy the full SHA
    9893f64 View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -1788,6 +1788,12 @@
email = "christoph.senjak@googlemail.com";
name = "Christoph-Simon Senjak";
};
david-sawatzke = {
email = "d-nix@sawatzke.dev";
github = "david-sawatzke";
githubId = 11035569;
name = "David Sawatzke";
};
david50407 = {
email = "me@davy.tw";
github = "david50407";
Original file line number Diff line number Diff line change
@@ -38,7 +38,12 @@ starting VDE switch for network 1
</para>

<para>
The machine state is kept across VM restarts in
<filename>/tmp/vm-state-</filename><varname>machinename</varname>.
You can re-use the VM states coming from a previous run
by setting the <command>--keep-vm-state</command> flag.
<screen>
<prompt>$ </prompt>./result/bin/nixos-run-vms --keep-vm-state
</screen>
The machine state is stored in the
<filename>$TMPDIR/vm-state-</filename><varname>machinename</varname> directory.
</para>
</section>
6 changes: 6 additions & 0 deletions nixos/doc/manual/release-notes/rl-2009.xml
Original file line number Diff line number Diff line change
@@ -675,6 +675,12 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
<package>nextcloud18</package> before upgrading to <package>nextcloud19</package>
since Nextcloud doesn't support upgrades across multiple major versions.
</para>
<para>
The <literal>nixos-run-vms</literal> script now deletes the
previous run machines states on test startup. You can use the
<literal>--keep-vm-state</literal> flag to match the previous
behaviour and keep the same VM state between different test runs.
</para>
</listitem>
</itemizedlist>
</section>
20 changes: 18 additions & 2 deletions nixos/lib/test-driver/test-driver.py
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
from xml.sax.saxutils import XMLGenerator
import _thread
import argparse
import atexit
import base64
import codecs
@@ -751,6 +752,11 @@ def process_serial_output() -> None:

self.log("QEMU running (pid {})".format(self.pid))

def cleanup_statedir(self) -> None:
self.log("delete the VM state directory")
if os.path.isfile(self.state_dir):
shutil.rmtree(self.state_dir)

def shutdown(self) -> None:
if not self.booted:
return
@@ -889,15 +895,26 @@ def subtest(name: str) -> Iterator[None]:


if __name__ == "__main__":
arg_parser = argparse.ArgumentParser()
arg_parser.add_argument(
"-K",
"--keep-vm-state",
help="re-use a VM state coming from a previous run",
action="store_true",
)
(cli_args, vm_scripts) = arg_parser.parse_known_args()

log = Logger()

vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split()))
vde_sockets = [create_vlan(v) for v in vlan_nrs]
for nr, vde_socket, _, _ in vde_sockets:
os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket

vm_scripts = sys.argv[1:]
machines = [create_machine({"startCommand": s}) for s in vm_scripts]
for machine in machines:
if not cli_args.keep_vm_state:
machine.cleanup_statedir()
machine_eval = [
"{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines)
]
@@ -911,7 +928,6 @@ def clean_up() -> None:
continue
log.log("killing {} (pid {})".format(machine.name, machine.pid))
machine.process.kill()

for _, _, process, _ in vde_sockets:
process.terminate()
log.close()
25 changes: 25 additions & 0 deletions pkgs/applications/misc/batsignal/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, libnotify, pkg-config, glib }:

stdenv.mkDerivation rec {
pname = "batsignal";
version = "1.0.0";

src = fetchFromGitHub {
owner = "electrickite";
repo = "batsignal";
rev = "${version}";
sha256 = "wy7YhgKfz07u0bp7rWpze+KmSdooOkmU7giaBX3wWkY=";
};

buildInputs = [ libnotify glib ];
nativeBuildInputs = [ pkg-config ];
installFlags = [ "PREFIX=${placeholder "out"}" ];

meta = with stdenv.lib; {
homepage = "https://github.com/electrickite/batsignal";
description = "Lightweight battery daemon written in C";
license = licenses.isc;
maintainers = with maintainers; [ SlothOfAnarchy ];
platforms = platforms.linux;
};
}
6 changes: 3 additions & 3 deletions pkgs/applications/misc/fbmenugen/default.nix
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@

perlPackages.buildPerlPackage rec {
pname = "fbmenugen";
version = "2020-05-20";
version = "0.85";

src = fetchFromGitHub {
owner = "trizen";
repo = pname;
rev = "ed9a680546edbb5b05086971b6a9f42a37cb485f";
sha256 = "1fikdl08a0s8d6k1ls1pzmw2rcwkfbbczsjfx6lr12ngd2bz222h";
rev = version;
sha256 = "1pmms3wzkm8h41a8zrkpn6gq9m9yy5wr5rrzmb84lbacprqq6q7q";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/applications/misc/osmium-tool/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "osmium-tool";
version = "1.12.0";
version = "1.12.1";

src = fetchFromGitHub {
owner = "osmcode";
repo = "osmium-tool";
rev = "v${version}";
sha256 = "18afn5qzdjpip176kk5pr04mj0p7dv70dbz1n36qmqnq3gyms10q";
sha256 = "13142hj8gfgj6w51a62hjzfmzic90xgrnnlnb70hpdqjy86bxv7j";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/data/icons/qogir-icon-theme/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "qogir-icon-theme";
version = "2020-02-21";
version = "2020-06-22";

src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "0m7f26dzzz5gkxi9dbbc96pl0xcvayr1ibxbjkrlsjcdvfg7p3rr";
sha256 = "0s5fhwfhn4qgk198jw736byxdrfm42l5m681pllbhg02j8ld4iik";
};

nativeBuildInputs = [ gtk3 ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libosmium/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "libosmium";
version = "2.15.5";
version = "2.15.6";

src = fetchFromGitHub {
owner = "osmcode";
repo = "libosmium";
rev = "v${version}";
sha256 = "1f21dzzkxzi74hv17fs9kb2w6indqvvm4lkxclz4j4x98k8q3n59";
sha256 = "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pylint/1.9.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort,
mccabe, configparser, backports_functools_lru_cache, singledispatch,
pytest, pytestrunner, pyenchant, setuptools }:
pytest, pytestrunner, setuptools }:

buildPythonPackage rec {
pname = "pylint";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "004kfapkqxqy2s85pmddqv0fabxdxywxrlbi549p0v237pr2v94p";
};

checkInputs = [ pytest pytestrunner pyenchant ];
checkInputs = [ pytest pytestrunner ];

propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ];

27 changes: 27 additions & 0 deletions pkgs/development/tools/misc/easypdkprog/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, lib, fetchFromGitHub }:

stdenv.mkDerivation rec {
pname = "easypdkprog";
version = "1.2";

src = fetchFromGitHub {
owner = "free-pdk";
repo = "easy-pdk-programmer-software";
rev = version;
sha256 = "06bn86rd57ff567l0ipx38raih0zll3y16lg5fpn7c601a9jldps";
};

installPhase = ''
install -Dm755 -t $out/bin easypdkprog
'' + lib.optionalString stdenv.isLinux ''
install -Dm644 -t $out/etc/udev/rules.d Linux_udevrules/70-stm32vcp.rules
'';

meta = with lib; {
description = "Read, write and execute programs on PADAUK microcontroller";
homepage = "https://github.com/free-pdk/easy-pdk-programmer-software";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ david-sawatzke ];
platforms = platforms.unix;
};
}
7 changes: 7 additions & 0 deletions pkgs/shells/nushell/default.nix
Original file line number Diff line number Diff line change
@@ -39,6 +39,13 @@ rustPlatform.buildRustPackage rec {
export HOME=$TMPDIR
'';

checkPhase = ''
runHook preCheck
echo "Running cargo test"
cargo test
runHook postCheck
'';

meta = with lib; {
description = "A modern shell written in Rust";
homepage = "https://www.nushell.sh/";
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-06-26";
version = "2020-06-28";
pname = "oh-my-zsh";
rev = "6152ac30bede172ba0422a8610dc796948ae1546";
rev = "97cf0bf4bd7655767e9e5ea27ddb6fbe550a305d";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "1kadz2c4lwvp37yw95fly4gc5klzajxsi8x9463xiqj2rrcpd1m3";
sha256 = "1hynii1nvchnlgyiy0phyz5gd83xcbjdj82ddd2dyl1ci1yvpvqb";
};

pathsToLink = [ "/share/oh-my-zsh" ];
6 changes: 3 additions & 3 deletions pkgs/tools/misc/broot/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "broot";
version = "0.18.0";
version = "0.18.1";

src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "0b2hggm2ckdzl9f2dn64gdyvd7flpq3szmx69k84f3fimabn7yrm";
sha256 = "0lmcjc08902h4mi6qx3x2v1xa4w980xvmbrbfm59lis856whaqww";
};

cargoSha256 = "1bl2y7h72vwi2jvnszd8vna4yc71s9n6kgmlq4ib2cjmzsppqdpa";
cargoSha256 = "1bgrm6a7p7xl95ljk87g4bxv1insl14yxc895yszr0my3ksmpzqh";

nativeBuildInputs = [ installShellFiles ];

19 changes: 10 additions & 9 deletions pkgs/tools/misc/dashing/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ stdenv, buildGoPackage, fetchgit }:
{ stdenv, buildGoPackage, fetchFromGitHub }:

buildGoPackage rec {
pname = "dashing-unstable";
version = "2018-02-15";
rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49";
pname = "dashing";
version = "0.4.0";

goPackagePath = "github.com/technosophos/dashing";

src = fetchgit {
inherit rev;
url = "https://github.com/technosophos/dashing";
sha256 = "066njyk3c1fqqr0v6aa6knp3dnksmh6hnl9d84fgd4wzyw3ma2an";
src = fetchFromGitHub {
owner = "technosophos";
repo = pname;
rev = version;
sha256 = "0mhv0w5q5vpynbfi21n5i3yw2165bppdlg0amvbv86n9z4c21h89";
};

goDeps = ./deps.nix;

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

meta = with stdenv.lib; {
description = "A Dash Generator Script for Any HTML";
homepage = "https://github.com/technosophos/dashing";
Loading