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: 1c951b1484eb
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: 3759b67af2dd
Choose a head ref
  • 10 commits
  • 5 files changed
  • 7 contributors

Commits on Mar 25, 2020

  1. Copy the full SHA
    bb549ca View commit details
  2. nixos/boinc: create boinc group

    This allows users that are members of the boinc group
    to interact with the boinc service by running:
    
    boincmgr -d /var/lib/boinc
    bachp committed Mar 25, 2020
    Copy the full SHA
    2e5835c View commit details

Commits on Apr 14, 2020

  1. wasmtime: Do not prefix version with v

    it seems that this breaks the use of `nix-env -i wasmtime`
    nomeata committed Apr 14, 2020
    Copy the full SHA
    acc5a9c View commit details
  2. wifite2: 2.2.5 -> 2.5.2

    The kimocoder repo is more recently updated, and is the one used by
    Debian / Kali Linux as well.
    danielfullmer committed Apr 14, 2020
    Copy the full SHA
    7e46e2a View commit details
  3. Copy the full SHA
    93f3b6e View commit details
  4. wf-recorder: 0.2 -> 0.2.1

    primeos committed Apr 14, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    Copy the full SHA
    ca2a222 View commit details
  5. Merge pull request #85240 from danielfullmer/wifite2-update

    wifite2: 2.2.5 -> 2.5.2
    Lassulus authored Apr 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
    c7348b0 View commit details
  6. Merge pull request #83362 from bachp/boinc

    nixos/boinc: simplify setup of boinc service
    matthewbauer authored Apr 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
    57e20c5 View commit details
  7. Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    Copy the full SHA
    e27369f View commit details
  8. Merge pull request #85239 from nomeata/joachim/wasmtime-version

    wasmtime: Do not prefix version with `v`
    jtojnar authored Apr 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
    3759b67 View commit details
6 changes: 4 additions & 2 deletions nixos/modules/services/computing/boinc/client.nix
Original file line number Diff line number Diff line change
@@ -99,22 +99,24 @@ in
environment.systemPackages = [cfg.package];

users.users.boinc = {
group = "boinc";
createHome = false;
description = "BOINC Client";
home = cfg.dataDir;
isSystemUser = true;
};
users.groups.boinc = {};

systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' - boinc - - -"
"d '${cfg.dataDir}' - boinc boinc - -"
];

systemd.services.boinc = {
description = "BOINC Client";
after = ["network.target"];
wantedBy = ["multi-user.target"];
script = ''
${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag}
${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}
'';
serviceConfig = {
User = "boinc";
4 changes: 2 additions & 2 deletions pkgs/applications/video/wf-recorder/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "wf-recorder";
version = "0.2";
version = "0.2.1";

src = fetchFromGitHub {
owner = "ammen99";
repo = pname;
rev = "v${version}";
sha256 = "1772hrd7j8b32y65x5c392kdijlcn13iqg9hrlagfar92102vsbf";
sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim";
};

nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ];
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/wasmtime/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "v0.12.0";
version = "0.12.0";

src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "${pname}";
rev = "${version}";
rev = "v${version}";
sha256 = "08dhk5s8rv41mjqbwfqwqmp6p6p9y7qc5yc76ljjd9l7j1phl7mr";
fetchSubmodules = true;
};
7 changes: 5 additions & 2 deletions pkgs/tools/misc/lf/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, lib }:
{ buildGoModule, fetchFromGitHub, lib, installShellFiles }:

buildGoModule rec {
pname = "lf";
@@ -13,6 +13,8 @@ buildGoModule rec {

modSha256 = "1c6c6qg8yrhdhqsnqj3jw3x2hi8vrhfm47cp9xlkfnjfrz3nk6jp";

nativeBuildInputs = [ installShellFiles ];

# TODO: Setting buildFlags probably isn't working properly. I've tried a few
# variants, e.g.:
# - buildFlags = [ "-ldflags" "\"-s" "-w"" ""-X 'main.gVersion=${version}'\"" ];
@@ -26,8 +28,9 @@ buildGoModule rec {
'';

postInstall = ''
install -D --mode=444 lf.1 $out/share/man/man1/lf.1
install -D --mode=444 lf.desktop $out/share/applications/lf.desktop
installManPage lf.1
installShellCompletion etc/lf.{zsh,fish}
'';

meta = with lib; {
30 changes: 23 additions & 7 deletions pkgs/tools/networking/wifite2/default.nix
Original file line number Diff line number Diff line change
@@ -1,23 +1,39 @@
{ stdenv, lib, fetchFromGitHub, python3, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools, which }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, python3, wirelesstools
, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools
, hcxdumptool, pyrit, which }:

python3.pkgs.buildPythonApplication rec {
version = "2.2.5";
version = "2.5.2";
pname = "wifite2";

src = fetchFromGitHub {
owner = "derv82";
owner = "kimocoder";
repo = "wifite2";
rev = version;
sha256 = "1hfy90wf2bjg0z8rbs8cfhhvz78pzg2c6nj0zksal42mb6b5cjdp";
sha256 = "0hsb59d86szn27s3hynpzkp49rmw4g692vrl67nal7rfcdvpp8hb";
};

patches = [
(fetchpatch {
url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-aircrack-failing-test.patch";
sha256 = "04qql8w27c1lqk59ghkr1n6r08jwdrb1dcam5k88szkk2bxv8yx1";
})
(fetchpatch {
url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-two-failing-tests.patch";
sha256 = "1sixcqz1kbkhxf38yq55pwycm54adjx22bq46dfnl44mg69nx356";
})
];

propagatedBuildInputs = [
aircrack-ng
wireshark-cli
reaverwps-t6x
cowpatty
hashcat
hcxtools
hcxdumptool
wirelesstools
pyrit
which
];

@@ -27,14 +43,14 @@ python3.pkgs.buildPythonApplication rec {
mv ${sitePackagesDir}/wifite/__main__.py ${sitePackagesDir}/wifite/wifite.py
'';

# which is not found
doCheck = false;
checkInputs = propagatedBuildInputs;
checkPhase = "python -m unittest discover tests -v";

meta = with stdenv.lib; {
homepage = "https://github.com/derv82/wifite2";
description = "Rewrite of the popular wireless network auditor, wifite";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ lassulus ];
maintainers = with maintainers; [ lassulus danielfullmer ];
};
}