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: 443b0f63323b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 45c62cbfd86a
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 30, 2019

  1. fractal: stylize, add me to maintainers

    @worldofpeace
    worldofpeace committed Jul 30, 2019

    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
    37158a3 View commit details

Commits on Aug 1, 2019

  1. fractal: 4.0.0 -> 4.2.0 

    Build system changes happening in the following commits:

* https://gitlab.gnome.org/GNOME/fractal/commit/79bf10af6ddecf50b0dc7641658694c196f73403
* https://gitlab.gnome.org/GNOME/fractal/commit/6982765607fb0a0c9e5eae4ad32659b29e5d0fb3
* https://gitlab.gnome.org/GNOME/fractal/commit/4abfa58282e958b2ab6fe44c5e3963d1b5db258a

Submitted MR upstream to update Cargo.lock [0] and to
make scripts executable [1].

[0]: https://gitlab.gnome.org/GNOME/fractal/merge_requests/446
[1]: https://gitlab.gnome.org/GNOME/fractal/merge_requests/447
    @worldofpeace
    worldofpeace committed Aug 1, 2019

    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
    43dcb05 View commit details

  2. Merge pull request #65610 from worldofpeace/fractal-update 

     fractal: 4.0.0 -> 4.2.0
    @worldofpeace
    worldofpeace authored Aug 1, 2019

    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
    45c62cb View commit details
Showing with 61 additions and 16 deletions.
  1. +61 −16 pkgs/applications/networking/instant-messengers/fractal/default.nix
77 changes: 61 additions & 16 deletions pkgs/applications/networking/instant-messengers/fractal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,83 @@
{ stdenv, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gtksourceview
, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook, fetchpatch }:
{ stdenv
, fetchFromGitLab
, fetchpatch
, meson
, ninja
, gettext
, cargo
, rustc
, python3
, rustPlatform
, pkgconfig
, gtksourceview
, hicolor-icon-theme
, glib
, libhandy
, gtk3
, dbus
, openssl
, sqlite
, gst_all_1
, cairo
, gdk_pixbuf
, gspell
, wrapGAppsHook
}:

rustPlatform.buildRustPackage rec {
version = "4.0.0";
name = "fractal-${version}";
pname = "fractal";
version = "4.2.0";

src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "fractal";
rev = version;
sha256 = "05q47jdgbi5jz01280msb8gxnbsrgf2jvglfm6k40f1xw4wxkrzy";
sha256 = "0clwsmd6h759bzlazfq5ig56dbx7npx3h43yspk87j1rm2dp1177";
};

cargoSha256 = "1hwjajkphl5439dymglgj3h92hxgbf7xpipzrga7ga8m10nx1dhl";

nativeBuildInputs = [
meson ninja pkgconfig gettext cargo rustc python3 wrapGAppsHook
cargo
gettext
meson
ninja
pkgconfig
python3
rustc
wrapGAppsHook
];

buildInputs = [
glib gtk3 libhandy dbus openssl sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad
gtksourceview hicolor-icon-theme libsecret
cairo
dbus
gdk_pixbuf
glib
gspell
gst_all_1.gst-editing-services
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
gtk3
gtksourceview
hicolor-icon-theme
libhandy
openssl
sqlite
];

patches = [
# Fixes build with >= gstreamer 1.15.1
cargoPatches = [
# https://gitlab.gnome.org/GNOME/fractal/merge_requests/446
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/fractal/commit/e78f36c25c095ea09c9c421187593706ad7c4065.patch";
sha256 = "1qv7ayhkhgrrldag2lzs9ql17nbc1d72j375ljhhf6cms89r19ir";
url = "https://gitlab.gnome.org/GNOME/fractal/commit/2778acdc6c50bc6f034513029b66b0b092bc4c38.patch";
sha256 = "08v17xmbwrjw688ps4hsnd60d5fm26xj72an3zf6yszha2b97j6y";
})
];

postPatch = ''
patchShebangs scripts/meson_post_install.py
chmod +x scripts/test.sh
patchShebangs scripts/meson_post_install.py scripts/test.sh
'';

# Don't use buildRustPackage phases, only use it for rust deps setup
@@ -39,13 +86,11 @@ rustPlatform.buildRustPackage rec {
checkPhase = null;
installPhase = null;

cargoSha256 = "1ax5dv200v8mfx0418bx8sbwpbp6zj469xg75hp78kqfiv83pn1g";

meta = with stdenv.lib; {
description = "Matrix group messaging app";
homepage = https://gitlab.gnome.org/GNOME/fractal;
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ dtzWill worldofpeace ];
};
}