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: 444f22ca892a
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: 958eef35331e
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on May 28, 2019

  1. reaverwps-t6x: 1.6.3 -> 1.6.5

    @dywedir
    dywedir committed May 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    45e517b View commit details

  2. Merge pull request #62134 from dywedir/reaverwps-t6x 

    reaverwps-t6x: 1.6.3 -> 1.6.5
    @c0bw3b
    c0bw3b authored May 28, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    travi Matt Travi
    GPG key ID: 8C173646C24FED70
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3edeb5c View commit details

  3. krita: fixed missing python path

    @d3rped
    d3rped committed May 28, 2019
    Copy the full SHA
    7af3d21 View commit details

  4. Merge pull request #61653 from d3rped/fix/krita 

    krita: fixed missing python path
    @worldofpeace
    worldofpeace authored May 28, 2019
    Copy the full SHA
    958eef3 View commit details
Showing with 12 additions and 11 deletions.
  1. +8 −2 pkgs/applications/graphics/krita/default.nix
  2. +4 −9 pkgs/tools/networking/reaver-wps-t6x/default.nix
10 changes: 8 additions & 2 deletions pkgs/applications/graphics/krita/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchurl, cmake, extra-cmake-modules
{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules
, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash
@@ -25,7 +25,7 @@ mkDerivation rec {
sha256 = "0h2rplc76r82b8smk61zci1ijj9xkjmf20pdqa8fc2lz4zicjxh4";
};

nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip ];
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];

buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
@@ -44,6 +44,12 @@ mkDerivation rec {
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
];

postInstall = ''
for i in $out/bin/*; do
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
done
'';

meta = with lib; {
description = "A free and open source painting application";
homepage = https://krita.org/;
13 changes: 4 additions & 9 deletions pkgs/tools/networking/reaver-wps-t6x/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
{ stdenv, fetchFromGitHub, libpcap, pixiewps, makeWrapper }:

stdenv.mkDerivation rec {
version = "1.6.3";
name = "reaver-wps-t6x-${version}";
pname = "reaver-wps-t6x";
version = "1.6.5";

src = fetchFromGitHub {
owner = "t6x";
repo = "reaver-wps-fork-t6x";
rev = "v${version}";
sha256 = "1bccwp67q1q0h5m38gqxn9imq5rb75jbmv7fjr2n38v10jcga2pb";
sha256 = "03v5jyb4if74rpg0mcd8700snb120b6w2gnsa3aqdgj5676ic5dn";
};

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpcap pixiewps ];

preConfigure = "cd src";

installPhase = ''
mkdir -p $out/bin
cp reaver wash $out/bin/
'';
sourceRoot = "source/src";

meta = with stdenv.lib; {
description = "Online and offline brute force attack against WPS";