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: 3b50998b4fa9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6294ee2fbdf7
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 9, 2020

  1. cinnamon.warpinator: init at 1.0.8

    (cherry picked from commit bf9e9cd)
    mkg20001 committed Sep 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    Copy the full SHA
    28dec5f View commit details
  2. cinnamon.warpinator: license fix

    (cherry picked from commit 9b9d0fd)
    mkg20001 committed Sep 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    Copy the full SHA
    8b6f99c View commit details
  3. nixos/cinnamon: add warpinator & blueberry pkgs

    (cherry picked from commit 8c4dd13)
    mkg20001 committed Sep 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    Copy the full SHA
    03c54b9 View commit details
  4. Merge pull request #97604 from mkg20001/rolling

    [20.09] cinnamon fixes
    worldofpeace authored Sep 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6294ee2 View commit details
Showing with 83 additions and 2 deletions.
  1. +2 −2 nixos/modules/services/x11/desktop-managers/cinnamon.nix
  2. +2 −0 pkgs/desktops/cinnamon/default.nix
  3. +79 −0 pkgs/desktops/cinnamon/warpinator/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/x11/desktop-managers/cinnamon.nix
Original file line number Diff line number Diff line change
@@ -193,8 +193,8 @@ in

environment.systemPackages = (with pkgs // pkgs.gnome3 // pkgs.cinnamon; pkgs.gnome3.removePackagesByName [
# cinnamon team apps
# warp
# blueberry
blueberry
warpinator

# external apps shipped with linux-mint
hexchat
2 changes: 2 additions & 0 deletions pkgs/desktops/cinnamon/default.nix
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ lib.makeScope pkgs.newScope (self: with self; {
installPhase = "mv svg $out/share/iso-flags-svg";
});

# blueberry -> pkgs/tools/bluetooth/blueberry/default.nix
cinnamon-common = callPackage ./cinnamon-common { };
cinnamon-control-center = callPackage ./cinnamon-control-center { };
cinnamon-desktop = callPackage ./cinnamon-desktop { };
@@ -29,4 +30,5 @@ lib.makeScope pkgs.newScope (self: with self; {
mint-y-icons = callPackage ./mint-y-icons { };
muffin = callPackage ./muffin { };
xapps = callPackage ./xapps { };
warpinator = callPackage ./warpinator { };
})
79 changes: 79 additions & 0 deletions pkgs/desktops/cinnamon/warpinator/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{ fetchFromGitHub
, stdenv
, gobject-introspection
, meson
, ninja
, python3
, gtk3
, gdk-pixbuf
, wrapGAppsHook
, gettext
, polkit
, glib
}:

python3.pkgs.buildPythonApplication rec {
pname = "warpinator";
version = "1.0.8";

format = "other";
doCheck = false;

src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "0n1b50j2w76qnhfj5yg5q2j7fgxr9gbmzpazmbml4q41h8ybcmxm";
};

nativeBuildInputs = [
meson
ninja
gobject-introspection
wrapGAppsHook
gettext
polkit # for its gettext
];

buildInputs = [
glib
gtk3
gdk-pixbuf
];

propagatedBuildInputs = with python3.pkgs; [
grpcio-tools
protobuf
pygobject3
setproctitle
xapp
zeroconf
grpcio
setuptools
cryptography
pynacl
netifaces
];

postPatch = ''
chmod +x install-scripts/*
patchShebangs .
find . -type f -exec sed -i \
-e s,/usr/libexec/warpinator,$out/libexec/warpinator,g \
{} +
'';

preFixup = ''
# these get loaded via import from bin, so don't need wrapping
chmod -x+X $out/libexec/warpinator/*.py
'';

meta = with stdenv.lib; {
homepage = "https://github.com/linuxmint/warpinator";
description = "Share files across the LAN";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.mkg20001 ];
};
}