Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
93fa8bacfb
61 changed files with 555 additions and 206 deletions
|
|
@ -5312,6 +5312,12 @@
|
|||
githubId = 39689;
|
||||
name = "Hugo Tavares Reis";
|
||||
};
|
||||
hufman = {
|
||||
email = "hufman@gmail.com";
|
||||
github = "hufman";
|
||||
githubId = 1592375;
|
||||
name = "Walter Huf";
|
||||
};
|
||||
hugolgst = {
|
||||
email = "hugo.lageneste@pm.me";
|
||||
github = "hugolgst";
|
||||
|
|
@ -9563,6 +9569,15 @@
|
|||
fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D";
|
||||
}];
|
||||
};
|
||||
ocfox = {
|
||||
email = "i@ocfox.me";
|
||||
github = "ocfox";
|
||||
githubId = 47410251;
|
||||
name = "ocfox";
|
||||
keys = [{
|
||||
fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F";
|
||||
}];
|
||||
};
|
||||
odi = {
|
||||
email = "oliver.dunkl@gmail.com";
|
||||
github = "odi";
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ in
|
|||
./evilwm.nix
|
||||
./exwm.nix
|
||||
./fluxbox.nix
|
||||
./fvwm.nix
|
||||
./fvwm2.nix
|
||||
./fvwm3.nix
|
||||
./herbstluftwm.nix
|
||||
./i3.nix
|
||||
./jwm.nix
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.fvwm;
|
||||
fvwm = pkgs.fvwm.override { enableGestures = cfg.gestures; };
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
services.xserver.windowManager.fvwm = {
|
||||
enable = mkEnableOption "Fvwm window manager";
|
||||
|
||||
gestures = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = "Whether or not to enable libstroke for gesture support";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = singleton
|
||||
{ name = "fvwm";
|
||||
start =
|
||||
''
|
||||
${fvwm}/bin/fvwm &
|
||||
waitPID=$!
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages = [ fvwm ];
|
||||
};
|
||||
}
|
||||
47
nixos/modules/services/x11/window-managers/fvwm2.nix
Normal file
47
nixos/modules/services/x11/window-managers/fvwm2.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.fvwm2;
|
||||
fvwm2 = pkgs.fvwm2.override { enableGestures = cfg.gestures; };
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
imports = [
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "xserver" "windowManager" "fvwm" ]
|
||||
[ "services" "xserver" "windowManager" "fvwm2" ])
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
services.xserver.windowManager.fvwm2 = {
|
||||
enable = mkEnableOption "Fvwm2 window manager";
|
||||
|
||||
gestures = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = "Whether or not to enable libstroke for gesture support";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = singleton
|
||||
{ name = "fvwm2";
|
||||
start =
|
||||
''
|
||||
${fvwm2}/bin/fvwm &
|
||||
waitPID=$!
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages = [ fvwm2 ];
|
||||
};
|
||||
}
|
||||
35
nixos/modules/services/x11/window-managers/fvwm3.nix
Normal file
35
nixos/modules/services/x11/window-managers/fvwm3.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.fvwm3;
|
||||
inherit (pkgs) fvwm3;
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
services.xserver.windowManager.fvwm3 = {
|
||||
enable = mkEnableOption "Fvwm3 window manager";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = singleton
|
||||
{ name = "fvwm3";
|
||||
start =
|
||||
''
|
||||
${fvwm3}/bin/fvwm3 &
|
||||
waitPID=$!
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages = [ fvwm3 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fdkaac";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nu774";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "tHhICq/FzbkvWkDdNzGqGoo7nIDb+DJXmkFwtPIA89c=";
|
||||
sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ in stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres kira-bruneau ];
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = [ "aarch64-darwin" ]; # Undefined symbols for architecture arm64
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64; # Undefined symbols for architecture arm64
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,26 +13,26 @@
|
|||
, libpng
|
||||
, libtheora
|
||||
, libvorbis
|
||||
, python
|
||||
, python3
|
||||
, tcl
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openmsx";
|
||||
version = "17.0";
|
||||
version = "18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openMSX";
|
||||
repo = "openMSX";
|
||||
rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "sha256-9PdUNahJZ2O6ASkzLW/uudP3hiIzTDpxzFy6Pjb8JiU=";
|
||||
rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
|
||||
sha256 = "sha256-4V2B+OQbPVRmkRuqfeqyd+7pz9Z1YISjI79WqZS0Qhc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -72,4 +72,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "ppsspp";
|
||||
version = "1.12.3";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-S16rTB0svksW5MwrPV/+qpTK4uKZ7mFcmbOyEmMmzhY=";
|
||||
sha256 = "sha256-WsFy2aSOmkII2Lte5et4W6qj0AXUKWWkYe88T0OQP08=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "492";
|
||||
version = "493";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-KtuHPKVwk6nRQ5lqHxRgm7k7DfcGeRAzR/kkHVMizDM=";
|
||||
sha256 = "sha256-sROmWFH3sDBDh1VSVLTM71Y9qD8CndvwW7PKzkavIuc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "1.1.03";
|
||||
version = "1.2.01";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "sha256-X7hAkzVqIABpyFokiYaMGZqSda69cKhKghFDWDEVOow=";
|
||||
sha256 = "sha256-V4hswyj6Ly6inaIlHlxpvER8ar09wZ55Ad+xH4GbHfs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "renderdoc";
|
||||
version = "1.18";
|
||||
version = "1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baldurk";
|
||||
repo = "renderdoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nwERwdNQYY1Fd7llwZHrJBzWDJNdsySRQ3ZvXZjB7YY=";
|
||||
sha256 = "sha256-T6OAr6Pl4VmXVSlNHF6kh8jIKs3FSTZsZ+Y4IH3SPTE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
38
pkgs/applications/misc/gum/default.nix
Normal file
38
pkgs/applications/misc/gum/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib, buildGoModule, installShellFiles, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gum";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-od0jJPfvczlru9hhO8ravGou6yYP91L2k37NYm2hD+k=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-uX0CQRqrM0/fj14owcUUpYph2j5ZwJITG53na31N6kg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
$out/bin/gum man > gum.1
|
||||
installManPage gum.1
|
||||
installShellCompletion --cmd gum \
|
||||
--bash <($out/bin/gum completion bash) \
|
||||
--fish <($out/bin/gum completion fish) \
|
||||
--zsh <($out/bin/gum completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tasty Bubble Gum for your shell";
|
||||
homepage = "https://github.com/charmbracelet/gum";
|
||||
changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ maaslalani ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,24 +2,25 @@
|
|||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, installShellFiles
|
||||
, bash
|
||||
, openssh
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k3sup";
|
||||
version = "0.11.3";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "k3sup";
|
||||
rev = version;
|
||||
sha256 = "sha256-6WYUmC2uVHFGLsfkA2EUOWmmo1dSKJzI4MEdRnlLgYY=";
|
||||
sha256 = "sha256-sb0cVLPIRD49AQ2XUsXkABFEZPrcuytr8Ht7Zt40H3o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
vendorSha256 = "sha256-Pd+BgPWoxf1AhP0o5SgFSvy4LyUQB7peKWJk0BMy7ds=";
|
||||
vendorSha256 = "sha256-I2bODrGF4D7B13qBZtCAOWgAmrxdleqfDQz+vCGmdjQ=";
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace vendor/github.com/alexellis/go-execute/pkg/v1/exec.go \
|
||||
|
|
@ -37,6 +38,11 @@ buildGoModule rec {
|
|||
postInstall = ''
|
||||
wrapProgram "$out/bin/k3sup" \
|
||||
--prefix PATH : ${lib.makeBinPath [ openssh ]}
|
||||
|
||||
installShellCompletion --cmd k3sup \
|
||||
--bash <($out/bin/k3sup completion bash) \
|
||||
--zsh <($out/bin/k3sup completion zsh) \
|
||||
--fish <($out/bin/k3sup completion fish)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "odo";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redhat-developer";
|
||||
repo = "odo";
|
||||
rev = "v${version}";
|
||||
sha256 = "KYJkCoF80UPsebWwxpc5gIfmT3Aj4OU8r6dDkaWXqbY=";
|
||||
sha256 = "sha256-+UvG+aDji/GtkXdt+xZB06j6NxjeK2nhBjle5K+lx/A=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "compactor";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dns-stats";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-AUNPUk70VwJ0nZgMPLMU258nqkL4QP6km0USrZi2ea0=";
|
||||
hash = "sha256-SgmtlbYOrSMzVfzsrbg4qs+yGkXQialiJTI99EBsUjQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pidgin, json-glib, signald }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "purple-signald";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoehermann";
|
||||
repo = "libpurple-signald";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pidgin
|
||||
json-glib
|
||||
signald
|
||||
];
|
||||
|
||||
PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
|
||||
PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/hoehermann/libpurple-signald";
|
||||
description = "Signal support for Pidgin / libpurple";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ hufman ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cvc5";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc5";
|
||||
repo = "cvc5";
|
||||
rev = "cvc5-${version}";
|
||||
sha256 = "03sxqwmlajffmv7lncqs1bx8gyihkpnikk87q9wjrd4776n13ign";
|
||||
sha256 = "sha256-D3rexkDc78w/HObT/WYPBo8mTBx1MAkxPXJvddg97ic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
|
|
|||
53
pkgs/applications/video/showmethekey/default.nix
Normal file
53
pkgs/applications/video/showmethekey/default.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, meson
|
||||
, ninja
|
||||
, libevdev
|
||||
, json-glib
|
||||
, cairo
|
||||
, pango
|
||||
, libinput
|
||||
, gtk4
|
||||
, wrapGAppsHook
|
||||
, libxkbcommon
|
||||
, pkg-config
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "showmethekey";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlynxZhou";
|
||||
repo = "showmethekey";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
meson
|
||||
ninja
|
||||
cairo
|
||||
pango
|
||||
json-glib
|
||||
pkg-config
|
||||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://showmethekey.alynx.one/";
|
||||
description = "Show keys you typed on screen";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ocfox ];
|
||||
};
|
||||
}
|
||||
|
|
@ -31,6 +31,7 @@
|
|||
, libkate
|
||||
, libmad
|
||||
, libmatroska
|
||||
, libmodplug
|
||||
, libmtp
|
||||
, liboggz
|
||||
, libopus
|
||||
|
|
@ -122,6 +123,7 @@ stdenv.mkDerivation rec {
|
|||
libmad
|
||||
libmatroska
|
||||
libmtp
|
||||
libmodplug
|
||||
liboggz
|
||||
libopus
|
||||
libplacebo
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dwl";
|
||||
version = "0.2.2";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djpohly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T2GqDehBNO8eublqZUmA5WADjnwElzT+bp9Dp1bqSgg=";
|
||||
hash = "sha256-VHxBjjnzJNmtJxrm3ywJzvt2bNHGk/Cx8TICw6SaoiQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,25 @@
|
|||
{ autoreconfHook, enableGestures ? false, lib, stdenv, fetchFromGitHub
|
||||
, pkg-config, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
|
||||
, libXpm, libXt, librsvg, libpng, fribidi, perl, libstroke, readline, libxslt }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, cairo
|
||||
, fontconfig
|
||||
, freetype
|
||||
, fribidi
|
||||
, libXcursor
|
||||
, libXft
|
||||
, libXinerama
|
||||
, libXpm
|
||||
, libXt
|
||||
, libpng
|
||||
, librsvg
|
||||
, libstroke
|
||||
, libxslt
|
||||
, perl
|
||||
, pkg-config
|
||||
, readline
|
||||
, enableGestures ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fvwm";
|
||||
|
|
@ -10,34 +29,38 @@ stdenv.mkDerivation rec {
|
|||
owner = "fvwmorg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "14jwckhikc9n4h93m00pzjs7xm2j0dcsyzv3q5vbcnknp6p4w5dh";
|
||||
hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
fontconfig
|
||||
freetype
|
||||
libXft
|
||||
fribidi
|
||||
libXcursor
|
||||
libXft
|
||||
libXinerama
|
||||
libXpm
|
||||
libXt
|
||||
librsvg
|
||||
libpng
|
||||
fribidi
|
||||
librsvg
|
||||
libxslt
|
||||
perl
|
||||
readline
|
||||
libxslt
|
||||
] ++ lib.optional enableGestures libstroke;
|
||||
|
||||
configureFlags = [ "--enable-mandoc" "--disable-htmldoc" ];
|
||||
configureFlags = [
|
||||
"--enable-mandoc"
|
||||
"--disable-htmldoc"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "http://fvwm.org";
|
||||
description = "A multiple large virtual desktop window manager";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ edanaher ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ edanaher ];
|
||||
};
|
||||
}
|
||||
88
pkgs/applications/window-managers/fvwm/3.nix
Normal file
88
pkgs/applications/window-managers/fvwm/3.nix
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, asciidoctor
|
||||
, autoreconfHook
|
||||
, cairo
|
||||
, fontconfig
|
||||
, freetype
|
||||
, fribidi
|
||||
, imlib
|
||||
, libSM
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXft
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXpm
|
||||
, libXrandr
|
||||
, libXt
|
||||
, libevent
|
||||
, libintl
|
||||
, libpng
|
||||
, librsvg
|
||||
, libstroke
|
||||
, libxslt
|
||||
, perl
|
||||
, pkg-config
|
||||
, python3
|
||||
, readline
|
||||
, sharutils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fvwm3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fvwmorg";
|
||||
repo = "fvwm3";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ByMSX4nwXkp+ly39C2+cYy3e9B0vnGcJlyIiS7V6zoI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
asciidoctor
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
fontconfig
|
||||
freetype
|
||||
fribidi
|
||||
imlib
|
||||
libSM
|
||||
libX11
|
||||
libXcursor
|
||||
libXft
|
||||
libXi
|
||||
libXinerama
|
||||
libXpm
|
||||
libXrandr
|
||||
libXt
|
||||
libevent
|
||||
libintl
|
||||
libpng
|
||||
librsvg
|
||||
libstroke
|
||||
libxslt
|
||||
perl
|
||||
python3
|
||||
readline
|
||||
sharutils
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-mandoc"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://fvwm.org";
|
||||
description = "A multiple large virtual desktop window manager - Version 3";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (libX11.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -40,13 +40,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icewm";
|
||||
version = "2.9.6";
|
||||
version = "2.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ice-wm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-qC8gEVJ/cmsEbF8jMzv7zyvVcjlbXhgHU3ixe7RLcnA=";
|
||||
hash = "sha256-SjLXPlwL3tMBD7RCJkL60lqcld/ZXIxgjeNrAn8A6KU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "labwc";
|
||||
version = "0.5.0";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labwc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-G0EQuXSHftl4JLXKIro+tmhbApwAhlzcjPEL7DP6LHk=";
|
||||
hash = "sha256-YD2bGxa7uss6KRvOGM0kn8dM+277ubaYeOB7ugRZCcY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "4th";
|
||||
version = "3.64.0";
|
||||
version = "3.64.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz";
|
||||
hash = "sha256-wJBekjFsFRIkhY/P/yHBQ8he+k+fGyrePGTP2Yjgpqg=";
|
||||
hash = "sha256-+W6nTNsqrf3Dvr+NbSz3uJdrXVbBI3OHR5v/rs7en+M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jwasm";
|
||||
version = "2.14";
|
||||
version = "2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Baron-von-Riedesel";
|
||||
repo = "JWasm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BUSsF73Q2vq6tF/YHMUyAmmFE/WWVQLRFJZkOD8T7f8=";
|
||||
hash = "sha256-ef4uEtEpnqYGhFmxuefJ40zyOuHsiPOLpH/52i7a7KI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfpgaloader";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trabucayre";
|
||||
repo = "openFPGALoader";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8AP4EJ+msOf1lstahyOyalI5dtS2ri7djN4zdN36Kfg=";
|
||||
sha256 = "sha256-GPPycZTijEMXWgxxtPEhiDJk7FelQcwIGFbbrOHna+w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.0.22";
|
||||
version = "1.0.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-YaK7scnfXkxhRe/PKZukqHD9X70X0/QUDL0znTPbIBE=";
|
||||
sha256 = "sha256-levPWBSwfw1N2tcBqQXtXznA7dzQRqVf/Rp2owGUamE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 pkg-config ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qrcodegen";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nayuki";
|
||||
repo = "QR-Code-generator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WH6O3YE/+NNznzl52TXZYL+6O25GmKSnaFqDDhRl4As=";
|
||||
sha256 = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "2.2.0";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n+W5xvWC3sPSX0SF5x1ArUtWZayoyQRThgWWhRG4Fac=";
|
||||
sha256 = "sha256-PU6yTA2FXHcuSwr6oIU+cP7uYxkgggnj3FV2LbkS69w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simpleitk";
|
||||
version = "2.1.1";
|
||||
version = "2.1.1.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "SimpleITK";
|
||||
repo = "SimpleITK";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ShUo9UVkliROIIR5bJtqlzESByfq9SQ1+Hy/40vJ50=";
|
||||
sha256 = "sha256-W53TbrgIwY9jj0GXz1LIrsBO9YL4VkH6531UYV0IqbE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake swig4 ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, buildPythonPackage, isPy27, fetchPypi, pytest, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
pname = "ci-info";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "05j6pamk8sd51qmvpkl3f7sxajmncrqm0cz6n6bqgsvzjwn66w6x";
|
||||
sha256 = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytestCheckHook ];
|
||||
|
|
|
|||
32
pkgs/development/python-modules/mediapy/default.nix
Normal file
32
pkgs/development/python-modules/mediapy/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, ipython
|
||||
, matplotlib
|
||||
, numpy
|
||||
, pillow
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mediapy";
|
||||
version = "1.0.3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cM8u27XSN4VzXONk+tQElZgT5XdShWXq0UtDg5JbF9o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipython matplotlib numpy pillow ];
|
||||
|
||||
pythonImportsCheck = [ "mediapy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Read/write/show images and videos in an IPython notebook";
|
||||
homepage = "https://github.com/google/mediapy";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mcwitt ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oscpy";
|
||||
|
|
@ -11,6 +11,15 @@ buildPythonPackage rec {
|
|||
hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix flaky tests with kivy/oscpy#67 - https://github.com/kivy/oscpy/pull/67
|
||||
(fetchpatch {
|
||||
name = "improve-reliability-of-test_intercept_errors.patch";
|
||||
url = "https://github.com/kivy/oscpy/commit/2bc114a97692aef28f8b84d52d0d5a41554a7d93.patch";
|
||||
hash = "sha256-iT7cB3ChWD1o0Zx7//Czkk8TaU1oTU1pRQWvPeIpeWY=";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "oscpy" ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, docutils
|
||||
, sphinx
|
||||
, requests
|
||||
, jinja2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-confluencebuilder";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-u+sjhj/2fu8fLGRb2zgnNI+y7wIIUYTMJhRekrdtMeU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
docutils
|
||||
sphinx
|
||||
requests
|
||||
jinja2
|
||||
];
|
||||
|
||||
# Tests are disabled due to a circular dependency on Sphinx
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sphinxcontrib.confluencebuilder"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Confluence builder for sphinx";
|
||||
homepage = "https://github.com/sphinx-contrib/confluencebuilder";
|
||||
license = licenses.bsd1;
|
||||
maintainers = with maintainers; [ graysonhead ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-gateway";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-gateway";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z3eZFd53c4cZG7CL3FrXQLi2n9A5TfUnZiB9KoA6sF4=";
|
||||
sha256 = "sha256-bxGJvvm9gGkjUA+JCpX2V0Bj35a5WJ1M/JPxa1/2gbk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PKeqjr5MZWK6ILizwRJ7oy6eUj3cH9ju/55cbS5LT8M=";
|
||||
vendorSha256 = "sha256-DVVAbtfwndwc37iqxCB9Tsscinr8A8Kl//s9X+EFPcw=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kaf";
|
||||
version = "0.1.44";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "birdayz";
|
||||
repo = "kaf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gKg/iESUXS6l3v5ovdvvrfpvaUzahPtqh0/DH5OpXoY=";
|
||||
sha256 = "sha256-5wSxaryaQ8jXwpzSltMmFRVrvaA9JMSrh8VBCnquLXE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5WzREsQdcp9lelKUEXw+nHeemHBDsKrvRcG9v+qln/E=";
|
||||
vendorSha256 = "sha256-Jpv02h+EeRhVdi/raStTEfHitz0A71dHpWdF/zcVJVU=";
|
||||
|
||||
# Many tests require a running Kafka instance
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
sha256 = "sha256-jcGnkLut8MlMqdWQxj/M6vQgIf3e7qFv8dJ1j6bEqj8=";
|
||||
sha256 = "sha256-wplNIh6NBXGiH9r3VL+CRSLZnY80JAhJNuDJNgu+Hy0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-W1/QBMnMdZWokWSFmHhPqmOu827bpGXS8+GFp5Iu9Ig=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-entgrpc";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ent";
|
||||
repo = "contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cpk8yRDBsupI277NWYFaLCvi3ltQDLgCrcpJ/FUVi9o=";
|
||||
sha256 = "sha256-hK4I2LVvw7hkbUKRuDoaRuNX3nwlwipYucnXwzOCcXs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-RwwGFBiasxMmtKMLSyAqvkozqoyzzYuslMq+HnzZUhw=";
|
||||
vendorSha256 = "sha256-bAM+NxD7mNd2fFxRDHCAzJTD7PVfT/9XHF88v9RHKwE=";
|
||||
|
||||
subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "railway";
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PAKg/8Ljcrz92M4sdKXZBe9Qa0NYwWnghzjxsCO8nhU=";
|
||||
sha256 = "sha256-7hYbTDY+ECaOKuK54hPA9oeOSnBWYUvxWJ7GElZKoWE=";
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "relic";
|
||||
version = "7.3.0";
|
||||
version = "7.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sassoftware";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0lmxgr9ld6rvqk990c60qh4gb8lr8s77f8i2p4jmp6cf434sc6y0";
|
||||
sha256 = "sha256-3YzZUwS2rU+OROMXuIbVeLDQMIpEmZz+PNnI4dbQs+Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256:1l6xxr54rzjfvwmfvpavwzjnscsp532hjqhmdv0l1vx1psdk2aci";
|
||||
vendorSha256 = "sha256-aguirMJgh/uAGl0l3wKBMH2QEIH2N8pq7Dl9Ngfkc90=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sassoftware/relic";
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@
|
|||
, libogg
|
||||
, pcre
|
||||
, makeWrapper
|
||||
, enableMultiplayer ? false # Requires old, insecure Crypto++ version
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxray";
|
||||
version = "1144-december-2021-rc1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -27,39 +27,6 @@ let
|
|||
sha256 = "07qj1lpp21g4p583gvz5h66y2q71ymbsz4g5nr6dcys0vm7ph88v";
|
||||
};
|
||||
|
||||
# https://github.com/OpenXRay/xray-16/issues/518
|
||||
ancientCryptopp = stdenv.mkDerivation {
|
||||
pname = "cryptopp";
|
||||
version = "5.6.5";
|
||||
|
||||
inherit src;
|
||||
|
||||
sourceRoot = "source/Externals/cryptopp";
|
||||
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Crypto++, a free C++ class library of cryptographic schemes";
|
||||
homepage = "https://cryptopp.com/";
|
||||
license = with licenses; [ boost publicDomain ];
|
||||
platforms = platforms.all;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2019-14318"
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxray";
|
||||
|
||||
inherit version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
|
|
@ -76,20 +43,12 @@ stdenv.mkDerivation rec {
|
|||
libjpeg
|
||||
libogg
|
||||
pcre
|
||||
] ++ lib.optionals enableMultiplayer [
|
||||
ancientCryptopp
|
||||
];
|
||||
|
||||
# Crashes can happen, we'd like them to be reasonably debuggable
|
||||
cmakeBuildType = "RelWithDebInfo";
|
||||
dontStrip = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_CRYPTOPP=${if enableMultiplayer then "ON" else "OFF"}"
|
||||
] ++ lib.optionals enableMultiplayer [
|
||||
"-DCMAKE_INCLUDE_PATH=${ancientCryptopp}/include/cryptopp"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# needed because of SDL_LoadObject library loading code
|
||||
wrapProgram $out/bin/xr_3da \
|
||||
|
|
@ -101,7 +60,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World";
|
||||
homepage = "https://github.com/OpenXRay/xray-16/";
|
||||
license = licenses.unfree // {
|
||||
url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt";
|
||||
url = "https://github.com/OpenXRay/xray-16/blob/${version}/License.txt";
|
||||
};
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "3.2.1";
|
||||
version = "3.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OK1xhsn30JE/IeKnOLE+0AmulEAeFM0Z7TyRqd6hTGY=";
|
||||
sha256 = "sha256-eIqdDBU4NWNMyRs+h30ufg4QwEEGid+wCjATZYXDGm8=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pipes-rs";
|
||||
version = "1.4.7";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lhvy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-egjmvvbPmIjccg44F2/TiGrn5HRN5hp8XL0yd0/ctv0=";
|
||||
sha256 = "sha256-UwRXErlGtneEtc3UAiREwILQPTRQn1AgxiWDzSCZv/M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-i9aR0dGNRF37Hhs9vq0wpdZGIVkX7M1SzbpASR5ve+g=";
|
||||
cargoSha256 = "sha256-Qyuvg13SnTN1dvxn4Gu4tizmjk4zrEi/iuXTV28fZbQ=";
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gmid";
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omar-polo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-vghoPsyGspPn22Kl61qiaALS2R243JSuS80uKFBHc9k=";
|
||||
hash = "sha256-WI3EJEhhd0UwtbOhRpt+8XEHuG6YrKAcT4mO1caZ+hE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubemq-community";
|
||||
version = "2.2.12";
|
||||
version = "2.2.13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubemq-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "06n3avcqknqzf9y03xqcsg36pwcha29j2psp9xsnir7hrx66zww8";
|
||||
sha256 = "sha256-YeFSea6aCNH+v3AKqiG8BY4u7/enmOPlEybkz6RwU8w=";
|
||||
};
|
||||
|
||||
CGO_ENABLED=0;
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
|
||||
doCheck = false; # grpc tests are flaky
|
||||
|
||||
vendorSha256 = "1sh0dzz8z065964k2gzkzw9p3db3rcf6mv901zym0wqm4p71045w";
|
||||
vendorSha256 = "sha256-pRbYNR3z4KdA9pdthX8a3FZ0LNyvoT+PR+6OinDGF2g=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kubemq-io/kubemq-community";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "piping-server-rust";
|
||||
version = "0.12.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwtgck";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L15ofIM5a/qoJHGXmkuTsmQLLmERG/PxAJ4+z1nn7w4=";
|
||||
sha256 = "sha256-ON3/GaDwQ9DtApRZuYClZWzFhmiLi988jIBvl0DgYSM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-CcIM7T7P4LbPxPK1ZqoJRP0IsLMEwMZg9DcuRu0aJHM=";
|
||||
cargoSha256 = "sha256-rc3VTJllDu4oIFcswCNUJejJHzC2PoJJV9EU5fOC7fQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rmfakecloud";
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddvk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ax+eozbAIE3425ndT4z4fVBMwzLN7iR5fTz8rz60zWg=";
|
||||
sha256 = "sha256-Q9zymQW8XWApy5ssfMtojN4AhteqrQzZyMeAkOsJDyw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-NwDaPpjkQogXE37RGS3zEALlp3NuXP9RW//vbwM6y0A=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "1.10.2";
|
||||
version = "1.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v9/zy7wHqZexaIn3iVDvr3RQNGncnNqqcl88kNDBAfQ=";
|
||||
sha256 = "sha256-+xrjIef8ToN07sfgZt/R5ZfCJ68v9293dSfaOwh1kmI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sJHq2ZSeCpUXhcF5HZQxIE0Jkutnc/m86NcaDNs7a7A=";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ksnip";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ksnip";
|
||||
repo = "ksnip";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4EIb1cHmScnFN7IralBR5hnvPBCHNQRcTWEWYezoOcQ=";
|
||||
sha256 = "sha256-a5mS2mrbs0CyZ83hwwFdherq6kMS93ItQIDKu1AjnN4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "massren";
|
||||
version = "1.5.4";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laurent22";
|
||||
repo = "massren";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bn6qy30kpxi3rkr3bplsc80xnhj0hgfl0qaczbg3zmykfmsl3bl";
|
||||
sha256 = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/laurent22/massren";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mmctl";
|
||||
version = "7.0.1";
|
||||
version = "7.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "mmctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xNj8aM3hpcvxwXCdFCfkXDBagIdCjcjWLGNp43KsV10=";
|
||||
sha256 = "sha256-wqX6HVcI8PTE0gFYh03oxWRQ1Tzs/Z9V2cG9qu1MsLA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
}:
|
||||
let
|
||||
pname = "qFlipper";
|
||||
version = "1.1.0";
|
||||
sha256 = "sha256-tZ+GXBv+LB1CYhO4hRtZFP25xUAVZaZJoee7Q7RJLp8=";
|
||||
version = "1.1.1";
|
||||
sha256 = "sha256-X29iurCloH//7soHd+trPTjhOe9S6ixFts5KldATlwA=";
|
||||
timestamp = "99999999999";
|
||||
commit = "nix-${version}";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rcm";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz";
|
||||
sha256 = "sha256-mxGuN0Sc9NI07G0TSEeb/tMlPauhH36ed0BZhltmwko=";
|
||||
sha256 = "sha256-JHQefybxagSTJLqoavcARDxCgeLN4JlynXTE1LKevi0=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-rcmlib-path.patch ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "s5cmd";
|
||||
version = "1.4.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peak";
|
||||
repo = "s5cmd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-12bKMZ6SMPsqLqaBTVxCxvs7PZ0CKimI9wlqvWZ/bgY=";
|
||||
sha256 = "sha256-9G0GSMNLYeIrbq7zctM3OCRcEZF1giEt+u5g3lTX96M=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdnf";
|
||||
version = "0.66.0";
|
||||
version = "0.67.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpm-software-management";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-fQyNm51roz6wn9QAE8/ZIrutyWP45xiKVHzn8n0LcwE=";
|
||||
sha256 = "sha256-ajYrR4MBHjGWaQwFmLSmZkazY93b05Ur4/E+mb/By9E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openseachest";
|
||||
version = "21.06.21";
|
||||
version = "22.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Seagate";
|
||||
repo = "openSeaChest";
|
||||
rev = "v${version}";
|
||||
sha256 = "09xay3frk0yh48ww650dsjp0rx0w1m3ab3rpz5k1jizppv4kk9fi";
|
||||
sha256 = "sha256-YZOQfABDr5DGkL08TYn908XdCSCJCg+9nlWXRBjYBOU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tidy-viewer";
|
||||
version = "1.4.3";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexhallam";
|
||||
repo = "tv";
|
||||
rev = version;
|
||||
sha256 = "sha256-onLu4XNe3sLfZ273Hq9IvgZEV9ir8oEXX7tQG75K2Hw=";
|
||||
sha256 = "sha256-aCso4+EdHKeYVFyOrVwE967//9VkfNHvvnumtkORVmw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-CYiRi6ny0wzTddpjdnnMHGqcWRM9wVjF34RmETgLH5A=";
|
||||
cargoSha256 = "sha256-bEwfdjvBbvlMyuqdH0xprCVrOV5Wm2E1uwDsg2M66dY=";
|
||||
|
||||
# this test parses command line arguments
|
||||
# error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
|
|
|
|||
|
|
@ -1464,9 +1464,7 @@ with pkgs;
|
|||
|
||||
oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { };
|
||||
|
||||
openmsx = callPackage ../applications/emulators/openmsx {
|
||||
python = python3;
|
||||
};
|
||||
openmsx = callPackage ../applications/emulators/openmsx { };
|
||||
|
||||
packwiz = callPackage ../tools/games/minecraft/packwiz { };
|
||||
|
||||
|
|
@ -10574,6 +10572,8 @@ with pkgs;
|
|||
|
||||
shout = nodePackages.shout;
|
||||
|
||||
showmethekey = callPackage ../applications/video/showmethekey { };
|
||||
|
||||
shrikhand = callPackage ../data/fonts/shrikhand { };
|
||||
|
||||
shunit2 = callPackage ../tools/misc/shunit2 { };
|
||||
|
|
@ -26914,7 +26914,9 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa;
|
||||
};
|
||||
|
||||
fvwm = callPackage ../applications/window-managers/fvwm { };
|
||||
fvwm = fvwm2;
|
||||
fvwm2 = callPackage ../applications/window-managers/fvwm/2.6.nix { };
|
||||
fvwm3 = callPackage ../applications/window-managers/fvwm/3.nix { };
|
||||
|
||||
ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { };
|
||||
|
||||
|
|
@ -27406,6 +27408,8 @@ with pkgs;
|
|||
|
||||
gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };
|
||||
|
||||
gum = callPackage ../applications/misc/gum { };
|
||||
|
||||
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
|
||||
inherit miniupnpc_2 swftools;
|
||||
inherit (qt5) wrapQtAppsHook;
|
||||
|
|
@ -29712,6 +29716,8 @@ with pkgs;
|
|||
|
||||
purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
|
||||
|
||||
purple-signald = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-signald { };
|
||||
|
||||
purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { };
|
||||
|
||||
purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { };
|
||||
|
|
|
|||
|
|
@ -5386,6 +5386,8 @@ in {
|
|||
|
||||
mediafile = callPackage ../development/python-modules/mediafile { };
|
||||
|
||||
mediapy = callPackage ../development/python-modules/mediapy { };
|
||||
|
||||
meilisearch = callPackage ../development/python-modules/meilisearch { };
|
||||
|
||||
meinheld = callPackage ../development/python-modules/meinheld { };
|
||||
|
|
@ -10068,6 +10070,8 @@ in {
|
|||
|
||||
sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { };
|
||||
|
||||
sphinxcontrib-confluencebuilder = callPackage ../development/python-modules/sphinxcontrib-confluencebuilder { };
|
||||
|
||||
sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { };
|
||||
|
||||
sphinxcontrib-excel-table = callPackage ../development/python-modules/sphinxcontrib-excel-table { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue