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: 16dd1df08174
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: 6bbdce2b1566
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 9, 2020

  1. fetchsvn: Fix for cross 

    Just use `nativeBuildInputs` at build time.
    @Ericson2314
    Ericson2314 committed Mar 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lucasfernog Lucas Fernandes Nogueira
    GPG key ID: FFEA6C72E73482F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2607aae View commit details

Commits on Mar 18, 2020

  1. Merge pull request #82248 from Ericson2314/fetchsvn-cross 

    fetchsvn: Fix for cross
    @Ericson2314
    Ericson2314 authored Mar 18, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lucasfernog Lucas Fernandes Nogueira
    GPG key ID: FFEA6C72E73482F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7562a06 View commit details

  2. pwsafe -> 1.9.0 

    fixes the broken build
there is a problem with wxGTK 3.1.2
maybe related to
https://github.com/pwsafe/pwsafe/blob/master/src/ui/wxWidgets/TreeCtrl.cpp
line 107
So I use wxGTK30

file is a new depedency

(cherry picked from commit 0b2047d)
    @chrbauer @Mic92
    chrbauer authored and Mic92 committed Mar 18, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lucasfernog Lucas Fernandes Nogueira
    GPG key ID: FFEA6C72E73482F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6bbdce2 View commit details
Showing with 21 additions and 15 deletions.
  1. +7 −6 pkgs/applications/misc/pwsafe/default.nix
  2. +0 −4 pkgs/build-support/fetchsvn/builder.sh
  3. +14 −5 pkgs/build-support/fetchsvn/default.nix
13 changes: 7 additions & 6 deletions pkgs/applications/misc/pwsafe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl
, wxGTK31, libXext, libXi, libXt, libXtst, xercesc
, wxGTK30, libXext, libXi, libXt, libXtst, xercesc
, qrencode, libuuid, libyubikey, yubikey-personalization
, curl, openssl
, curl, openssl, file
}:

stdenv.mkDerivation rec {
pname = "pwsafe";
version = "1.08.2";
version = "1.09.0";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "${version}BETA";
sha256 = "14qwk3cv5psj7ll71ikyv452x55c7iwjw9765yrpij6741r4yjln";
rev = "${version}";
sha256 = "0dmazm95d53wq74qvsjvhl7r6fr4dv11nzf8sgdy47nyxv06xs1b";
};

nativeBuildInputs = [
cmake gettext perl pkgconfig zip
];
buildInputs = [
libXext libXi libXt libXtst wxGTK31
libXext libXi libXt libXtst wxGTK30
curl qrencode libuuid openssl xercesc
libyubikey yubikey-personalization
file
];

cmakeFlags = [
4 changes: 0 additions & 4 deletions pkgs/build-support/fetchsvn/builder.sh
View file
Original file line number Diff line number Diff line change
@@ -2,10 +2,6 @@ source $stdenv/setup

header "exporting $url (r$rev) into $out"

if test "$sshSupport"; then
export SVN_SSH="$openssh/bin/ssh"
fi

if test -n "$http_proxy"; then
# Configure proxy
mkdir .subversion
19 changes: 14 additions & 5 deletions pkgs/build-support/fetchsvn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{stdenvNoCC, subversion, glibcLocales, sshSupport ? true, openssh ? null}:
{url, rev ? "HEAD", md5 ? "", sha256 ? ""
{ stdenvNoCC, buildPackages
, subversion, glibcLocales, sshSupport ? true, openssh ? null
}:

{ url, rev ? "HEAD", md5 ? "", sha256 ? ""
, ignoreExternals ? false, ignoreKeywords ? false, name ? null
, preferLocalBuild ? true }:
, preferLocalBuild ? true
}:

assert sshSupport -> openssh != null;

let
repoName = with stdenvNoCC.lib;
@@ -32,13 +38,16 @@ else
stdenvNoCC.mkDerivation {
name = name_;
builder = ./builder.sh;
nativeBuildInputs = [ subversion glibcLocales ];
nativeBuildInputs = [ subversion glibcLocales ]
++ stdenvNoCC.lib.optional sshSupport openssh;

SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;

outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = sha256;

inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
inherit url rev ignoreExternals ignoreKeywords;

impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
inherit preferLocalBuild;