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: 4c1ae47e8cc9
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: 3bbf7d3a96b7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Sep 20, 2020

  1. cawbird: 1.1.0 -> 1.2.1 

    - regular version bump to 1.2.0, then bugfix release on top
- changes: see
    - https://github.com/IBBoard/cawbird/releases/tag/v1.2.0
    - https://github.com/IBBoard/cawbird/releases/tag/v1.2.1

(cherry picked from commit 0b3ffb5)
    @schmittlauch
    schmittlauch committed Sep 20, 2020
    Copy the full SHA
    6f77ca1 View commit details

Commits on Sep 21, 2020

  1. libversion: fix tests on Darwin (#98361) 

    (cherry picked from commit a2228f4)
cc #98361
    @r-burns @veprbl
    r-burns authored and veprbl committed Sep 21, 2020

    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
    7a5d897 View commit details

  2. Merge pull request #98326 from schmittlauch/cawbird-v1.2.1-back 

    [20.09] cawbird: 1.1.0 -> 1.2.1
    @doronbehar
    doronbehar authored Sep 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3bbf7d3 View commit details
Showing with 9 additions and 3 deletions.
  1. +4 −2 pkgs/applications/networking/cawbird/default.nix
  2. +5 −1 pkgs/development/libraries/libversion/default.nix
6 changes: 4 additions & 2 deletions pkgs/applications/networking/cawbird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,18 +16,19 @@
, wrapGAppsHook
, gobject-introspection
, glib-networking
, librest
, python3
}:

stdenv.mkDerivation rec {
version = "1.1.0";
version = "1.2.1";
pname = "cawbird";

src = fetchFromGitHub {
owner = "IBBoard";
repo = "cawbird";
rev = "v${version}";
sha256 = "0zghryx5y47ff8kxa65lvgmy1cnhvhazxml7r1lxixxj3d88wh7p";
sha256 = "11s8x48syy5wjj23ab4bn5jxhi7l5sx7aw6q2ggk99v042hxh3h2";
};

nativeBuildInputs = [
@@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
dconf
gspell
glib-networking
librest
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
6 changes: 5 additions & 1 deletion pkgs/development/libraries/libversion/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake }:
{ stdenv, fetchFromGitHub, cmake, lib }:

stdenv.mkDerivation rec {
pname = "libversion";
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ];

cmakeFlags = lib.optional stdenv.isDarwin [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests
];

preCheck = ''
export LD_LIBRARY_PATH=/build/source/build/libversion/''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
'';