Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 40952628a9f2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d8736c215f62
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 17, 2021

  1. libstrophe: 0.10.0 -> 0.10.1

    @devhell
    devhell committed Jan 17, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    SamirHafez Samir Hafez
    GPG key ID: 95806A3539FE7066
    Verified
    Learn about vigilant mode
    Copy the full SHA
    58899f1 View commit details

  2. Merge pull request #107644 from devhell/libstrophe

    @SuperSandro2000
    SuperSandro2000 authored Jan 17, 2021

    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
    d8736c2 View commit details
Showing with 8 additions and 9 deletions.
  1. +8 −9 pkgs/development/libraries/libstrophe/default.nix
17 changes: 8 additions & 9 deletions pkgs/development/libraries/libstrophe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{ stdenv
, fetchFromGitHub
, pkg-config
, automake
, autoconf
, autoreconfHook
, libtool
, openssl
, expat
, pkg-config
, check
}:

@@ -17,16 +16,14 @@ stdenv.mkDerivation rec {
owner = "strophe";
repo = pname;
rev = version;
sha256 = "sha256-6byg7hE0DN/cbf9NHpK/2DhXZyuelYAp+SA7vVUgo4U=";
sha256 = "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79";
};

nativeBuildInputs = [ automake autoconf pkg-config libtool check ];
buildInputs = [ openssl expat ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ openssl expat libtool check ];

dontDisableStatic = true;

preConfigure = "mkdir m4 && sh bootstrap.sh";

doCheck = true;

meta = with stdenv.lib; {
@@ -37,8 +34,10 @@ stdenv.mkDerivation rec {
runs well on both Linux, Unix, and Windows based platforms.
'';
homepage = "https://strophe.im/libstrophe/";
license = with licenses; [ gpl3 mit ];
license = with licenses; [ gpl3Only mit ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
maintainers = with maintainers; [ devhell flosse ];
};
}