Merge pull request from Artturin/updatemypackages

Update packages maintained by Artturin
This commit is contained in:
Artturi 2022-10-24 23:30:52 +03:00 committed by GitHub
commit b7e4f7a30b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 20 deletions
pkgs
applications
misc/nwg-wrapper
networking/instant-messengers/discord
development/libraries/libvarlink
misc/flashfocus

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "nwg-wrapper";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "114y55mv2rgnp75a3c7rk46v5v84d1zqb6wkha7x16ab6xa9phzl";
rev = "refs/tags/v${version}";
sha256 = "sha256-GKDAdjO67aedCEFHKDukQ+oPMomTPwFE/CvJu112fus=";
};
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
@ -17,9 +17,6 @@ python3Packages.buildPythonPackage rec {
propagatedBuildInputs = with python3Packages; [ i3ipc pygobject3 ];
# ValueError: Namespace GtkLayerShell not available
strictDeps = false;
# No tests
doCheck = false;

View file

@ -1,4 +1,4 @@
{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, withOpenASAR ? false }:
{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, branch, withOpenASAR ? false }:
stdenv.mkDerivation {
inherit pname version src meta;

View file

@ -2,7 +2,7 @@
let
versions = if stdenv.isLinux then {
stable = "0.0.21";
ptb = "0.0.29";
ptb = "0.0.34";
canary = "0.0.140";
} else {
stable = "0.0.264";
@ -18,7 +18,7 @@ let
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc=";
sha256 = "CD6dLoBnlvhpwEFfLI9OqjhviZPj3xNDyPK9qBJUqck=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
@ -69,7 +69,7 @@ let
(_: value:
callPackage package (value
// {
inherit src version openasar;
inherit src version openasar branch;
meta = meta // { mainProgram = value.binaryName; };
}))
{

View file

@ -5,6 +5,7 @@
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
, branch
, common-updater-scripts, withOpenASAR ? false }:
let
@ -141,7 +142,7 @@ stdenv.mkDerivation rec {
}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
version=''${url##https://dl*.discordapp.net/apps/linux/}
version=''${version%%/*.tar.gz}
update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix
update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch}
'';
};
}

View file

@ -4,17 +4,19 @@
, meson
, ninja
, python3
, nix-update-script
, testers
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libvarlink";
version = "22";
version = "23";
src = fetchFromGitHub {
owner = "varlink";
repo = pname;
rev = version;
sha256 = "1i15227vlc9k4276r833ndhxrcys9305pf6dga1j0alx2vj85yz2";
repo = finalAttrs.pname;
rev = finalAttrs.version;
sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE=";
};
nativeBuildInputs = [ meson ninja ];
@ -33,6 +35,18 @@ stdenv.mkDerivation rec {
doCheck = true;
passthru = {
updateScript = nix-update-script {
attrPath = finalAttrs.pname;
};
tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "varlink --version";
};
};
};
meta = with lib; {
description = "C implementation of the Varlink protocol and command line tool";
homepage = "https://github.com/varlink/libvarlink";
@ -40,4 +54,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ artturin ];
platforms = platforms.linux;
};
}
})

View file

@ -1,12 +1,12 @@
{ lib, python3, netcat-openbsd }:
{ lib, python3, netcat-openbsd, nix-update-script }:
python3.pkgs.buildPythonApplication rec {
pname = "flashfocus";
version = "2.2.3";
version = "2.3.1";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "0cn44hryvz2wl7xklaslxsb3l2i3f8jkgmml0n9v2ks22j5l4r4h";
sha256 = "sha256-XT3CKJWn1uKnPPsJC+MWlEAd8sWdVTEXz5b3n0UUedY=";
};
postPatch = ''
@ -36,6 +36,10 @@ python3.pkgs.buildPythonApplication rec {
pythonImportsCheck = [ "flashfocus" ];
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
homepage = "https://github.com/fennerm/flashfocus";
description = "Simple focus animations for tiling window managers";