Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
39ffc1cb70
|
|
@ -130,6 +130,15 @@
|
|||
PHP now defaults to PHP 8.1, updated from 8.0.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
PHP is now built <literal>NTS</literal> (Non-Thread Safe)
|
||||
style by default, for Apache and <literal>mod_php</literal>
|
||||
usage we still enable <literal>ZTS</literal> (Zend Thread
|
||||
Safe). This has been a common practice for a long time in
|
||||
other distributions.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>protonup</literal> has been aliased to and replaced
|
||||
|
|
|
|||
|
|
@ -53,6 +53,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- PHP now defaults to PHP 8.1, updated from 8.0.
|
||||
|
||||
- PHP is now built `NTS` (Non-Thread Safe) style by default, for Apache and
|
||||
`mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a
|
||||
common practice for a long time in other distributions.
|
||||
|
||||
- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it.
|
||||
|
||||
- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ let
|
|||
sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|'
|
||||
'';
|
||||
|
||||
php = cfg.phpPackage.override { apacheHttpd = pkg; };
|
||||
php = cfg.phpPackage.override { apxs2Support = true; apacheHttpd = pkg; };
|
||||
|
||||
phpModuleName = let
|
||||
majorVersion = lib.versions.major (lib.getVersion php);
|
||||
|
|
@ -660,6 +660,13 @@ in
|
|||
`services.httpd.virtualHosts.<name>.useACMEHost` are mutually exclusive.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.enablePHP -> php.ztsSupport;
|
||||
message = ''
|
||||
The php package provided by `services.httpd.phpPackage` is not built with zts support. Please
|
||||
ensure the php has zts support by settings `services.httpd.phpPackage = php.override { ztsSupport = true; }`
|
||||
'';
|
||||
}
|
||||
] ++ map (name: mkCertOwnershipAssertion {
|
||||
inherit (cfg) group user;
|
||||
cert = config.security.acme.certs.${name};
|
||||
|
|
|
|||
|
|
@ -1,23 +1,25 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
, alsa-lib
|
||||
, libjack2
|
||||
, libpulseaudio
|
||||
, fftw
|
||||
, json_c
|
||||
, libjack2
|
||||
, jackSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lingot";
|
||||
version = "1.0.1";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "03x0qqb9iarjapvii3ja522vkxrqv1hwix6b1r53is48p5xwgf3i";
|
||||
sha256 = "sha256-xPl+SWo2ZscHhtE25vLMxeijgT6wjNo1ys1+sNFvTVY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -31,6 +33,7 @@ stdenv.mkDerivation rec {
|
|||
alsa-lib
|
||||
libpulseaudio
|
||||
fftw
|
||||
json_c
|
||||
] ++ lib.optional jackSupport libjack2;
|
||||
|
||||
configureFlags = lib.optional (!jackSupport) "--disable-jack";
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ self: let
|
|||
then null
|
||||
else super.project;
|
||||
# Compilation instructions for the Ada executables:
|
||||
# https://www.nongnu.org/ada-mode/ada-mode.html#Ada-executables
|
||||
# https://www.nongnu.org/ada-mode/
|
||||
ada-mode = super.ada-mode.overrideAttrs (old: {
|
||||
# actually unpack source of ada-mode and wisi
|
||||
# which are both needed to compile the tools
|
||||
|
|
@ -85,15 +85,18 @@ self: let
|
|||
nativeBuildInputs = [
|
||||
buildPackages.gnat
|
||||
buildPackages.gprbuild
|
||||
buildPackages.lzip
|
||||
buildPackages.dos2unix
|
||||
buildPackages.re2c
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pkgs.gnatcoll-xref
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
./build.sh -j$NIX_BUILD_CORES
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
postInstall = (old.postInstall or "") + "\n" + ''
|
||||
|
|
|
|||
|
|
@ -2,260 +2,94 @@
|
|||
|
||||
self: with self; {
|
||||
|
||||
elisp-ffi = let
|
||||
rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9";
|
||||
in melpaBuild {
|
||||
pname = "elisp-ffi";
|
||||
version = "20170518.0";
|
||||
agda-input = callPackage ./manual-packages/agda-input { };
|
||||
|
||||
commit = rev;
|
||||
agda2-mode = callPackage ./manual-packages/agda2-mode { };
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elisp-ffi";
|
||||
inherit rev;
|
||||
sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94=";
|
||||
};
|
||||
bqn-mode = callPackage ./manual-packages/bqn-mode { };
|
||||
|
||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
cask = callPackage ./manual-packages/cask { };
|
||||
|
||||
buildInputs = [ pkgs.libffi ];
|
||||
control-lock = callPackage ./manual-packages/control-lock { };
|
||||
|
||||
preBuild = ''
|
||||
mv ffi.el elisp-ffi.el
|
||||
make
|
||||
'';
|
||||
ebuild-mode = callPackage ./manual-packages/ebuild-mode { };
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(elisp-ffi
|
||||
:repo "skeeto/elisp-ffi"
|
||||
:fetcher github)
|
||||
'';
|
||||
elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
|
||||
|
||||
meta = {
|
||||
description = "Emacs Lisp Foreign Function Interface";
|
||||
longDescription = ''
|
||||
This library provides an FFI for Emacs Lisp so that Emacs
|
||||
programs can invoke functions in native libraries. It works by
|
||||
driving a subprocess to do the heavy lifting, passing result
|
||||
values on to Emacs.
|
||||
'';
|
||||
license = lib.licenses.publicDomain;
|
||||
};
|
||||
emacspeak = callPackage ./manual-packages/emacspeak { };
|
||||
|
||||
ement = callPackage ./manual-packages/ement { };
|
||||
|
||||
ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { };
|
||||
|
||||
evil-markdown = callPackage ./manual-packages/evil-markdown { };
|
||||
|
||||
font-lock-plus = callPackage ./manual-packages/font-lock-plus { };
|
||||
|
||||
ghc-mod = callPackage ./manual-packages/elisp-ffi { };
|
||||
|
||||
git-undo = callPackage ./manual-packages/git-undo { };
|
||||
|
||||
haskell-unicode-input-method = callPackage ./manual-packages/haskell-unicode-input-method { };
|
||||
|
||||
header-file-mode = callPackage ./manual-packages/header-file-mode { };
|
||||
|
||||
helm-words = callPackage ./manual-packages/helm-words { };
|
||||
|
||||
idris2-mode = callPackage ./manual-packages/idris2-mode { };
|
||||
|
||||
isearch-plus = callPackage ./manual-packages/isearch-plus { };
|
||||
|
||||
isearch-prop = callPackage ./manual-packages/isearch-prop { };
|
||||
|
||||
jam-mode = callPackage ./manual-packages/jam-mode { };
|
||||
|
||||
llvm-mode = callPackage ./manual-packages/llvm-mode { };
|
||||
|
||||
matrix-client = callPackage ./manual-packages/matrix-client {
|
||||
_map = self.map;
|
||||
};
|
||||
|
||||
ghc-mod = melpaBuild {
|
||||
pname = "ghc";
|
||||
version = pkgs.haskellPackages.ghc-mod.version;
|
||||
nano-theme = callPackage ./manual-packages/nano-theme { };
|
||||
|
||||
src = pkgs.haskellPackages.ghc-mod.src;
|
||||
ott-mode = callPackage ./manual-packages/ott-mode { };
|
||||
|
||||
packageRequires = [ haskell-mode ];
|
||||
perl-completion = callPackage ./manual-packages/perl-completion { };
|
||||
|
||||
propagatedUserEnvPkgs = [ pkgs.haskellPackages.ghc-mod ];
|
||||
pod-mode = callPackage ./manual-packages/pod-mode { };
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
|
||||
'';
|
||||
power-mode = callPackage ./manual-packages/power-mode { };
|
||||
|
||||
fileSpecs = [ "elisp/*.el" ];
|
||||
|
||||
meta = {
|
||||
description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
};
|
||||
|
||||
haskell-unicode-input-method = let
|
||||
rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
|
||||
in melpaBuild {
|
||||
pname = "haskell-unicode-input-method";
|
||||
version = "20110905.2307";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "roelvandijk";
|
||||
repo = "emacs-haskell-unicode-input-method";
|
||||
inherit rev;
|
||||
sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
|
||||
};
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(haskell-unicode-input-method
|
||||
:repo "roelvandijk/emacs-haskell-unicode-input-method"
|
||||
:fetcher github)
|
||||
'';
|
||||
|
||||
packageRequires = [];
|
||||
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#haskell-unicode-input-method/";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
};
|
||||
|
||||
matrix-client = let
|
||||
rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";
|
||||
in melpaBuild
|
||||
{
|
||||
pname = "matrix-client";
|
||||
version = "0.3.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "alphapapa";
|
||||
repo = "matrix-client.el";
|
||||
inherit rev;
|
||||
sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix: avatar loading when imagemagick support is not available
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
|
||||
sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm";
|
||||
})
|
||||
];
|
||||
|
||||
packageRequires = [
|
||||
anaphora
|
||||
cl-lib
|
||||
self.map
|
||||
dash-functional
|
||||
esxml
|
||||
f
|
||||
ov
|
||||
tracking
|
||||
rainbow-identifiers
|
||||
dash
|
||||
s
|
||||
request
|
||||
frame-purpose
|
||||
a
|
||||
ht
|
||||
];
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(matrix-client
|
||||
:repo "alphapapa/matrix-client.el"
|
||||
:fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A chat client and API wrapper for Matrix.org";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
prisma-mode = let
|
||||
rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4";
|
||||
in melpaBuild {
|
||||
pname = "prisma-mode";
|
||||
version = "20211207.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
packageRequires = [ js2-mode ];
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "pimeys";
|
||||
repo = "emacs-prisma-mode";
|
||||
inherit rev;
|
||||
sha256 = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I=";
|
||||
};
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(prisma-mode
|
||||
:repo "pimeys/emacs-prisma-mode"
|
||||
:fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Major mode for Prisma Schema Language";
|
||||
license = lib.licenses.gpl2Only;
|
||||
};
|
||||
};
|
||||
|
||||
agda-input = callPackage ./agda-input { };
|
||||
|
||||
agda2-mode = callPackage ./agda2-mode { };
|
||||
|
||||
bqn-mode = callPackage ./bqn-mode { };
|
||||
|
||||
cask = callPackage ./cask { };
|
||||
|
||||
control-lock = callPackage ./control-lock { };
|
||||
|
||||
ebuild-mode = callPackage ./ebuild-mode { };
|
||||
|
||||
emacspeak = callPackage ./emacspeak { };
|
||||
|
||||
ement = callPackage ./ement { };
|
||||
|
||||
ess-R-object-popup = callPackage ./ess-R-object-popup { };
|
||||
|
||||
evil-markdown = callPackage ./evil-markdown { };
|
||||
|
||||
font-lock-plus = callPackage ./font-lock-plus { };
|
||||
|
||||
git-undo = callPackage ./git-undo { };
|
||||
|
||||
header-file-mode = callPackage ./header-file-mode { };
|
||||
|
||||
helm-words = callPackage ./helm-words { };
|
||||
|
||||
idris2-mode = callPackage ./idris2-mode { };
|
||||
|
||||
isearch-plus = callPackage ./isearch-plus { };
|
||||
|
||||
isearch-prop = callPackage ./isearch-prop { };
|
||||
|
||||
jam-mode = callPackage ./jam-mode { };
|
||||
|
||||
llvm-mode = callPackage ./llvm-mode { };
|
||||
|
||||
nano-theme = callPackage ./nano-theme { };
|
||||
|
||||
ott-mode = callPackage ./ott-mode { };
|
||||
|
||||
perl-completion = callPackage ./perl-completion { };
|
||||
|
||||
pod-mode = callPackage ./pod-mode { };
|
||||
|
||||
power-mode = callPackage ./power-mode { };
|
||||
prisma-mode = callPackage ./manual-packages/prisma-mode { };
|
||||
|
||||
structured-haskell-mode = self.shm;
|
||||
|
||||
sv-kalender = callPackage ./sv-kalender { };
|
||||
sv-kalender = callPackage ./manual-packages/sv-kalender { };
|
||||
|
||||
tree-sitter-langs = callPackage ./tree-sitter-langs { final = self; };
|
||||
tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; };
|
||||
|
||||
tsc = callPackage ./tsc { };
|
||||
tsc = callPackage ./manual-packages/tsc { };
|
||||
|
||||
urweb-mode = callPackage ./urweb-mode { };
|
||||
urweb-mode = callPackage ./manual-packages/urweb-mode { };
|
||||
|
||||
voicemacs = callPackage ./voicemacs { };
|
||||
voicemacs = callPackage ./manual-packages/voicemacs { };
|
||||
|
||||
yes-no = callPackage ./yes-no { };
|
||||
yes-no = callPackage ./manual-packages/yes-no { };
|
||||
|
||||
youtube-dl = callPackage ./youtube-dl { };
|
||||
youtube-dl = callPackage ./manual-packages/youtube-dl { };
|
||||
|
||||
# From old emacsPackages (pre emacsPackagesNg)
|
||||
cedille = callPackage ./cedille { cedille = pkgs.cedille; };
|
||||
color-theme-solarized = callPackage ./color-theme-solarized { };
|
||||
session-management-for-emacs = callPackage ./session-management-for-emacs { };
|
||||
hsc3-mode = callPackage ./hsc3 { };
|
||||
prolog-mode = callPackage ./prolog { };
|
||||
rect-mark = callPackage ./rect-mark { };
|
||||
sunrise-commander = callPackage ./sunrise-commander { };
|
||||
cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; };
|
||||
color-theme-solarized = callPackage ./manual-packages/color-theme-solarized { };
|
||||
hsc3-mode = callPackage ./manual-packages/hsc3 { };
|
||||
prolog-mode = callPackage ./manual-packages/prolog { };
|
||||
rect-mark = callPackage ./manual-packages/rect-mark { };
|
||||
session-management-for-emacs = callPackage ./manual-packages/session-management-for-emacs { };
|
||||
sunrise-commander = callPackage ./manual-packages/sunrise-commander { };
|
||||
|
||||
# camelCase aliases for some of the kebab-case expressions above
|
||||
colorThemeSolarized = color-theme-solarized;
|
||||
emacsSessionManagement = session-management-for-emacs;
|
||||
rectMark = rect-mark;
|
||||
sunriseCommander = sunrise-commander;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, melpaBuild
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libffi
|
||||
, writeText
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9";
|
||||
in melpaBuild {
|
||||
pname = "elisp-ffi";
|
||||
version = "20170518.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elisp-ffi";
|
||||
inherit rev;
|
||||
sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libffi ];
|
||||
|
||||
preBuild = ''
|
||||
mv ffi.el elisp-ffi.el
|
||||
make
|
||||
'';
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(elisp-ffi :repo "skeeto/elisp-ffi" :fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Emacs Lisp Foreign Function Interface";
|
||||
longDescription = ''
|
||||
This library provides an FFI for Emacs Lisp so that Emacs
|
||||
programs can invoke functions in native libraries. It works by
|
||||
driving a subprocess to do the heavy lifting, passing result
|
||||
values on to Emacs.
|
||||
'';
|
||||
license = lib.licenses.publicDomain;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, melpaBuild
|
||||
, haskellPackages
|
||||
, writeText
|
||||
}:
|
||||
|
||||
melpaBuild {
|
||||
pname = "ghc";
|
||||
|
||||
inherit (haskellPackages.ghc-mod) version src;
|
||||
|
||||
packageRequires = [ haskell-mode ];
|
||||
|
||||
propagatedUserEnvPkgs = [ haskellPackages.ghc-mod ];
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
|
||||
'';
|
||||
|
||||
fileSpecs = [ "elisp/*.el" ];
|
||||
|
||||
meta = {
|
||||
description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, melpaBuild
|
||||
, fetchFromGitHub
|
||||
, writeText
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
|
||||
in melpaBuild {
|
||||
pname = "haskell-unicode-input-method";
|
||||
version = "20110905.2307";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roelvandijk";
|
||||
repo = "emacs-haskell-unicode-input-method";
|
||||
inherit rev;
|
||||
sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
|
||||
};
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(haskell-unicode-input-method
|
||||
:repo "roelvandijk/emacs-haskell-unicode-input-method"
|
||||
:fetcher github)
|
||||
'';
|
||||
|
||||
packageRequires = [];
|
||||
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#haskell-unicode-input-method/";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
{ lib
|
||||
, melpaBuild
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, writeText
|
||||
# Emacs packages
|
||||
, _map
|
||||
, a
|
||||
, anaphora
|
||||
, cl-lib
|
||||
, dash
|
||||
, dash-functional
|
||||
, esxml
|
||||
, f
|
||||
, frame-purpose
|
||||
, ht
|
||||
, ov
|
||||
, rainbow-identifiers
|
||||
, request
|
||||
, s
|
||||
, tracking
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";
|
||||
in melpaBuild {
|
||||
pname = "matrix-client";
|
||||
version = "0.3.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alphapapa";
|
||||
repo = "matrix-client.el";
|
||||
inherit rev;
|
||||
sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix: avatar loading when imagemagick support is not available
|
||||
(fetchpatch {
|
||||
url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
|
||||
sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm";
|
||||
})
|
||||
];
|
||||
|
||||
packageRequires = [
|
||||
_map
|
||||
a
|
||||
anaphora
|
||||
cl-lib
|
||||
dash
|
||||
dash-functional
|
||||
esxml
|
||||
f
|
||||
frame-purpose
|
||||
ht
|
||||
ov
|
||||
rainbow-identifiers
|
||||
request
|
||||
s
|
||||
tracking
|
||||
];
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(matrix-client :repo "alphapapa/matrix-client.el" :fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A chat client and API wrapper for Matrix.org";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, melpaBuild
|
||||
, js2-mode
|
||||
, writeText
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4";
|
||||
in melpaBuild {
|
||||
pname = "prisma-mode";
|
||||
version = "20211207.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
packageRequires = [ js2-mode ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pimeys";
|
||||
repo = "emacs-prisma-mode";
|
||||
inherit rev;
|
||||
sha256 = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I=";
|
||||
};
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(prisma-mode :repo "pimeys/emacs-prisma-mode" :fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Major mode for Prisma Schema Language";
|
||||
license = lib.licenses.gpl2Only;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell ../../../../../../. -i python3 -p python3 -p nix
|
||||
#! nix-shell ../../../../../../../. -i python3 -p python3 -p nix
|
||||
|
||||
from os.path import (
|
||||
dirname,
|
||||
abspath,
|
||||
|
|
@ -10,10 +10,12 @@
|
|||
, libGL
|
||||
, libXrandr
|
||||
, libusb1
|
||||
, libXdmcp
|
||||
, libXext
|
||||
, openal
|
||||
, udev
|
||||
, libevdev
|
||||
, cubeb
|
||||
, curl
|
||||
, alsa-lib
|
||||
, miniupnpc
|
||||
|
|
@ -73,6 +75,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
cubeb
|
||||
curl
|
||||
ffmpeg
|
||||
pugixml
|
||||
|
|
@ -83,6 +86,7 @@ stdenv.mkDerivation rec {
|
|||
libusb1
|
||||
libiconv
|
||||
libpng
|
||||
libXdmcp
|
||||
hidapi
|
||||
miniupnpc
|
||||
enet
|
||||
|
|
@ -127,7 +131,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
qtWrapperArgs = lib.optionals stdenv.isLinux [
|
||||
"--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]}"
|
||||
# https://bugs.dolphin-emu.org/issues/11807
|
||||
# The .desktop file should already set this, but Dolphin may be launched in other ways
|
||||
"--set QT_QPA_PLATFORM xcb"
|
||||
|
|
|
|||
|
|
@ -1,27 +1,37 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit, wrapQtAppsHook, libglvnd }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libX11,
|
||||
procps,
|
||||
python3,
|
||||
libdwarf,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
libglvnd,
|
||||
gtest,
|
||||
brotli,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apitrace";
|
||||
version = "7.1-572-g${builtins.substring 0 8 src.rev}";
|
||||
version = "11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "11bwb0l8cr1bf9bj1s6cbmi77d5fy4qrphj9cgmcd8jpa862anp5";
|
||||
rev = "26966134f15d28f6b4a9a0a560017b3ba36d60bf";
|
||||
repo = "apitrace";
|
||||
owner = "apitrace";
|
||||
repo = "apitrace";
|
||||
rev = version;
|
||||
hash = "sha256-rvC6iVWNNxH11hzQvRTo+SQi9jEUCPWGSdJmKJe9SQ0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# glibc 2.34 compat
|
||||
# derived from https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb
|
||||
./glibc-2.34-compat.patch
|
||||
];
|
||||
|
||||
# LD_PRELOAD wrappers need to be statically linked to work against all kinds
|
||||
# of games -- so it's fine to use e.g. bundled snappy.
|
||||
buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ];
|
||||
buildInputs = [ libX11 procps python3 libdwarf qtbase gtest brotli ];
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
# Don't automatically wrap all binaries, I prefer to explicitly only wrap
|
||||
# `qapitrace`.
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp
|
||||
index 2eda082..0c0c8ee 100644
|
||||
--- a/wrappers/dlsym.cpp
|
||||
+++ b/wrappers/dlsym.cpp
|
||||
@@ -34,7 +34,7 @@
|
||||
#include "os.hpp"
|
||||
|
||||
|
||||
-#ifdef __GLIBC__
|
||||
+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34
|
||||
|
||||
|
||||
#include <dlfcn.h>
|
||||
38
pkgs/applications/misc/meerk40t/camera.nix
Normal file
38
pkgs/applications/misc/meerk40t/camera.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonPackage fetchPypi;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "meerk40t-camera";
|
||||
version = "0.1.9";
|
||||
format = "setuptools";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uGCBHdgWoorVX2XqMCg0YBweb00sQ9ZSbJe8rlGeovs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/meerk40t/d' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
opencv4
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"camera"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "MeerK40t camera plugin";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/meerk40t/meerk40t-camera";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, meerk40t-camera
|
||||
, python3
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
|
|
@ -7,38 +8,6 @@
|
|||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonApplication buildPythonPackage fetchPypi;
|
||||
|
||||
meerk40t-camera = buildPythonPackage rec {
|
||||
pname = "meerk40t-camera";
|
||||
version = "0.1.9";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uGCBHdgWoorVX2XqMCg0YBweb00sQ9ZSbJe8rlGeovs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/meerk40t/d' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
opencv4
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"camera"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "MeerK40t camera plugin";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/meerk40t/meerk40t-camera";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
};
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "MeerK40t";
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "109.0.5396.2",
|
||||
"sha256": "0a4pd365i8wj608n9d6624mf11491px1x0wv4673m3nkj1k8sqld",
|
||||
"sha256bin64": "1gk7wi20h11bwsfch67xazjk9grxj6ax6vjyz7ihrlajdahdaf0w",
|
||||
"version": "109.0.5410.0",
|
||||
"sha256": "00g8q0qzl8kyc9j60nsvvjkr2x9js2xvbkmwp77p8b6gg0pyymjn",
|
||||
"sha256bin64": "0ljhc5lqdy01apzyj96xzl931d904i37x62257s1h35w0j78mps0",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-10-28",
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeone";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubermatic";
|
||||
repo = "kubeone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8wYrDGykob1YLvtscQdL867vuRv8J83DC7AzvQVXVr8=";
|
||||
sha256 = "sha256-CjT6YKC6DJvs+LeKIzOl2Y6n0/yGv0nz8EfHqiSnIDo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "senpai";
|
||||
version = "unstable-2022-10-19";
|
||||
version = "unstable-2022-11-04";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~taiite";
|
||||
repo = "senpai";
|
||||
rev = "b3377c58ffb0bc07d222258ea578bdab723b2ec8";
|
||||
sha256 = "sha256-QPqnfGdQJh+XDXTcOCwx5KK85vEQuAv386a+qk68zDU=";
|
||||
rev = "3be87831281af1c91a6e406986f317936a0b98bc";
|
||||
sha256 = "sha256-v8r2q2H4I9FnsIOGv1zkC4xJ5E9cQavfILZ6mnbFbr8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+cdGRk/96Xu4IgtmZ8GbqWiKAxxwpAnuAkAnKX0CbmU=";
|
||||
vendorSha256 = "sha256-FBpk9TpAD5i3+brsVNWHNHJtZsHmShmWlldQrMs/VGU=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/senpai"
|
||||
|
|
|
|||
|
|
@ -17,9 +17,27 @@
|
|||
, llvmPackages
|
||||
, z3
|
||||
, fmt_8
|
||||
, suitesparse
|
||||
}:
|
||||
|
||||
let
|
||||
igraph' = igraph.overrideAttrs (old: rec {
|
||||
version = "0.9.10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "igraph";
|
||||
repo = "igraph";
|
||||
rev = version;
|
||||
hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk=";
|
||||
};
|
||||
postPatch = old.postPatch + lib.optionalString stdenv.isAarch64 ''
|
||||
# https://github.com/igraph/igraph/issues/1694
|
||||
substituteInPlace tests/CMakeLists.txt \
|
||||
--replace "igraph_scg_grouping3" "" \
|
||||
--replace "igraph_scg_semiprojectors2" ""
|
||||
'';
|
||||
buildInputs = old.buildInputs ++ [ suitesparse ];
|
||||
cmakeFlags = old.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ];
|
||||
});
|
||||
# no stable hal release yet with recent spdlog/fmt support, remove
|
||||
# once 4.0.0 is released - see https://github.com/emsec/hal/issues/452
|
||||
spdlog' = spdlog.override {
|
||||
|
|
@ -64,7 +82,7 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog' graphviz wrapQtAppsHook z3 ]
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph' spdlog' graphviz wrapQtAppsHook z3 ]
|
||||
++ (with python3Packages; [ python pybind11 ])
|
||||
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lean";
|
||||
version = "3.48.0";
|
||||
version = "3.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover-community";
|
||||
|
|
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
|||
# from. this is then used to check whether an olean file should be
|
||||
# rebuilt. don't use a tag as rev because this will get replaced into
|
||||
# src/githash.h.in in preConfigure.
|
||||
rev = "283f6ed8083ab4dd7c36300f31816c5cb793f2f7";
|
||||
sha256 = "sha256-0Ogv/24KNp1ZBDqiYTsGv5vDKD4fJBtoX7LWLu4QZe0=";
|
||||
rev = "acf633e01a8783a12060b0a1b7b5b5e15fd73e77";
|
||||
sha256 = "sha256-KF13DlGEl6aICSp/haczo54gjLZaOxyzFRdzvyyiu5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "st";
|
||||
version = "0.8.5";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-6mgyID7QL/dBgry4raqexFTI+YnnkjLLhZZl4vVEqzc=";
|
||||
url = "https://dl.suckless.org/st/st-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
configFile = lib.optionalString (conf != null)
|
||||
(writeText "config.def.h" conf);
|
||||
|
||||
postPatch = lib.optionalString (conf != null) "cp ${configFile} config.def.h"
|
||||
postPatch = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} config.def.h"
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace config.mk --replace "-lrt" ""
|
||||
'';
|
||||
|
|
@ -65,4 +65,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ andsild ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
# - Add plugin to it's own directory (because of future patches).
|
||||
|
||||
{
|
||||
input-overlay = qt6Packages.callPackage ./input-overlay.nix { };
|
||||
|
||||
looking-glass-obs = callPackage ./looking-glass-obs.nix { };
|
||||
|
||||
obs-backgroundremoval = callPackage ./obs-backgroundremoval { };
|
||||
|
|
|
|||
47
pkgs/applications/video/obs-studio/plugins/input-overlay.nix
Normal file
47
pkgs/applications/video/obs-studio/plugins/input-overlay.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ stdenv, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, obs-studio
|
||||
, libuiohook
|
||||
, qtbase
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, libxkbfile
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-input-overlay";
|
||||
version = "5.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "univrsal";
|
||||
repo = "input-overlay";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kpVAvQpBU8TxHAFcx/ok67++4MHh5saoRHJc5XpY4YQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
obs-studio libuiohook qtbase
|
||||
xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXtst xorg.libXext
|
||||
xorg.libXi xorg.libXt xorg.libXinerama libxkbcommon libxkbfile
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/lib $out/share
|
||||
mv $out/obs-plugins/64bit $out/lib/obs-plugins
|
||||
rm -rf $out/obs-plugins
|
||||
mv $out/data $out/share/obs
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Show keyboard, gamepad and mouse input on stream ";
|
||||
homepage = "https://github.com/univrsal/input-overlay";
|
||||
maintainers = with maintainers; [ glittershark ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,41 +1,35 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, btrfs-progs
|
||||
, gpgme
|
||||
, libassuan
|
||||
, lvm2
|
||||
, testers
|
||||
, podman-tui
|
||||
}:
|
||||
{ lib, stdenv, fetchFromGitHub, buildGoModule, testers, podman-tui }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9ZFyrRf4yMik4+TQYN+75fWuKHuI8hkaKJ6o5qWYb7E=";
|
||||
hash = "sha256-UhlhNmVPTOXVWpL4pxF5c6ZQj//pXrzZWlRUaKGSTSA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
buildInputs = [ gpgme libassuan ]
|
||||
++ lib.optionals stdenv.isLinux [ btrfs-progs lvm2 ];
|
||||
tags = [ "containers_image_openpgp" "remote" ]
|
||||
++ lib.optional stdenv.isDarwin "darwin";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
preCheck =
|
||||
let skippedTests = [
|
||||
"TestNetdialogs"
|
||||
]; in
|
||||
let
|
||||
skippedTests = [
|
||||
"TestDialogs"
|
||||
"TestNetdialogs"
|
||||
];
|
||||
in
|
||||
''
|
||||
export HOME=/home/$(whoami)
|
||||
export USER=$(whoami)
|
||||
export HOME=/home/$USER
|
||||
|
||||
# Disable flaky tests
|
||||
buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [ ] }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tabbed";
|
||||
version = "unstable-2018-03-10";
|
||||
version = "0.7";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.suckless.org/tabbed";
|
||||
rev = "b5f9ec647aae2d9a1d3bd586eb7523a4e0a329a3";
|
||||
sha256 = "0frj2yjaf0mfjwgyfappksfir52mx2xxd3cdg5533m5d88vbmxss";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Y1MgPwqMUoa2Rr4HmqjtPaQegUmQJWYkcbyFcJHAOBI=";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
|
@ -29,4 +29,4 @@ stdenv.mkDerivation {
|
|||
maintainers = with maintainers; [ vrthra ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,25 +7,25 @@
|
|||
let
|
||||
# make install will use dconf to find desktop background file uri.
|
||||
# consider adding an args to allow specify pictures manually.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20220510/Makefile#L38
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20221107/Makefile#L38
|
||||
fake-dconf = writeScriptBin "dconf" "echo -n";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gnome";
|
||||
version = "20220622";
|
||||
version = "20221107";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-fm1YOKI6TLkCnkkPZkp8I0xWkNrZt4sVktYZyD5foKU=";
|
||||
hash = "sha256-5V3ECbQe3/5bhHnMR1pzvehs1eh0u9U7E1voDiqo9cY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib fake-dconf ];
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
# make install will back up this file, it will fail if the file doesn't exist.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20220510/Makefile#L56
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20221107/Makefile#L56
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/gnome-shell/
|
||||
touch $out/share/gnome-shell/gnome-shell-theme.gresource
|
||||
|
|
|
|||
|
|
@ -7,11 +7,13 @@ mkCoqDerivation rec {
|
|||
domain = "gitlab.inria.fr";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.12" "8.16"; out = "4.6.0"; }
|
||||
{ case = range "8.8" "8.16"; out = "4.5.2"; }
|
||||
{ case = range "8.8" "8.12"; out = "4.0.0"; }
|
||||
{ case = range "8.7" "8.11"; out = "3.4.2"; }
|
||||
{ case = range "8.5" "8.6"; out = "3.3.0"; }
|
||||
] null;
|
||||
release."4.6.0".sha256 = "sha256-n9ECKnV0L6XYcIcbYyOJKwlbisz/RRbNW5YESHo07X0=";
|
||||
release."4.5.2".sha256 = "sha256-r0yE9pkC4EYlqsimxkdlCXevRcwKa3HGFZiUH+ueUY8=";
|
||||
release."4.5.1".sha256 = "sha256-5OxbSPdw/1FFENubulKSk6fEIEYSPCxfvMMgtgN6j6s=";
|
||||
release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko=";
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ let
|
|||
, phpdbgSupport ? true
|
||||
|
||||
# Misc flags
|
||||
, apxs2Support ? !stdenv.isDarwin
|
||||
, apxs2Support ? false
|
||||
, argon2Support ? true
|
||||
, cgotoSupport ? false
|
||||
, embedSupport ? false
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, libxcrypt
|
||||
, libgcrypt
|
||||
, cryptoSupport ? false
|
||||
, pythonSupport ? true
|
||||
, pythonSupport ? libxml2.pythonSupport
|
||||
, gnome
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation {
|
|||
configureFlags = [ "--disable-dependency-tracking" "--disable-traces" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
broken = true; # 2022-11-13
|
||||
description = "C APIs to exchange datas with the NFC daemon 'Neard'";
|
||||
license = licenses.lgpl2;
|
||||
homepage = "https://01.org/linux-nfc";
|
||||
|
|
|
|||
|
|
@ -7,18 +7,18 @@ let
|
|||
testData = fetchFromGitHub {
|
||||
owner = "nlohmann";
|
||||
repo = "json_test_data";
|
||||
rev = "v3.0.0";
|
||||
sha256 = "O6p2PFB7c2KE9VqWvmTaFywbW1hSzAP5V42EuemX+ls=";
|
||||
rev = "v3.1.0";
|
||||
hash = "sha256-bG34W63ew7haLnC82A3lS7bviPDnApLipaBjJAjLcVk=";
|
||||
};
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nlohmann_json";
|
||||
version = "3.10.5";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlohmann";
|
||||
repo = "json";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "DTsZrdB9GcaNkx7ZKxcgCA3A9ShM5icSF0xyGguJNbk=";
|
||||
hash = "sha256-SUdhIV7tjtacf5DkoWk9cnkfyMlrkg8ZU7XnPZd22Tw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -3,25 +3,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "urdfdom";
|
||||
version = "1.0.4";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ros";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0wambq06d7dvja25zcv4agc055q9rmf3xkrnxy8lsf4nic7ra2rr";
|
||||
hash = "sha256-9MJnify4zcDBSZVJZCN/XupN5xax+U4PLee54gVVw3Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix CMake saying console-bridge 1.0 is incompatible
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ros/urdfdom/commit/6faba176d41cf39114785a3e029013f941ed5a0e.patch";
|
||||
sha256 = "1pn9hcg5wkkc7y28sbkxvffqxgvazzsp3g1xmz6h055v4f9ikjbs";
|
||||
})
|
||||
# Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom/pull/142)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ros/urdfdom/commit/707c97c3d1f739ba0ab6e93e1bf7cd01d68a8c07.patch";
|
||||
sha256 = "10bv7sv7gfy6lj8z5bkw7v291y12fbrrxsiqxqjxg4i65rfg92ng";
|
||||
url = "https://github.com/ros/urdfdom/commit/cbe6884d267779463bb444be851f6404e692cc0a.patch";
|
||||
hash = "sha256-1gTRKIGqiSRion76bGecSfFJSBskYUJguUIa6ePIiX4=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ mkDerivation {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1.
|
||||
description = "Tool to check syntax of PHP files faster than serial check with fancier output";
|
||||
license = licenses.bsd2;
|
||||
homepage = "https://github.com/php-parallel-lint/PHP-Parallel-Lint";
|
||||
|
|
|
|||
|
|
@ -1,20 +1,29 @@
|
|||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, h2
|
||||
, lib
|
||||
, pyjwt
|
||||
, pyopenssl
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioapns";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2ce526910bc2514a84b8105abe80508526ceafc0097c89f86bbbc501f8666c99";
|
||||
sha256 = "sha256-3FMNIhIZrstPKTfHVmN+K28UR2G26HZ5S/JtXmaFk1c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
h2
|
||||
pyopenssl
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dinghy";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "nedbat";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-zhSSEI5h7ZCQeytAFbevowhITghaG4vu81C4pDb6xUg=";
|
||||
hash = "sha256-bfB1VVeIl1KzjY0oQ0jQ8M/fK5LZQqYU7AX201QX+Mk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gcal-sync";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "allenporter";
|
||||
repo = "gcal_sync";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sfGfF0kz37QX0Xjrtdl9XU9biVu7v8l6u/S27NeAW+k=";
|
||||
hash = "sha256-KvWLaGTCIjHZpCiex2quIGsl+IZsM2aEARxGJbcR8lc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,17 +10,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "googlemaps";
|
||||
version = "4.6.0";
|
||||
version = "4.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlemaps";
|
||||
repo = "google-maps-services-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pzCM1uZupqJgoogwacuuy1P8I9LF65w7ZS6vY10VgeU=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qn98b7oTU9/u0+EJ4OTOksLquJiWl/od9m498UuFiwo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-cov
|
||||
|
|
@ -34,11 +38,13 @@ buildPythonPackage rec {
|
|||
"test_transit_without_time"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "googlemaps" ];
|
||||
pythonImportsCheck = [
|
||||
"googlemaps"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/googlemaps/google-maps-services-python";
|
||||
description = "Python client library for Google Maps API Web Services";
|
||||
homepage = "https://github.com/googlemaps/google-maps-services-python";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ Scriptkiddi ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphql-subscription-manager";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "PyGraphqlWebsocketManager";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-q1Cywisxk51vavMz2EwcDQdsBozLJydaWKfuH1SdUFY=";
|
||||
hash = "sha256-6/REvY5QxsAPV41Pvg8vrJPYbDrGUrpOPn0vzIcCu0k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab_server";
|
||||
version = "2.16.2";
|
||||
version = "2.16.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BwB6Ogowv8ZCSyi3bfjWc4bMLV+fQohnc7GzxHPLmj8=";
|
||||
hash = "sha256-Y1oLF2qQHxk1HAIiGhJOWTF8R29REgBAm32GfospBcM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysensibo";
|
||||
version = "1.0.20";
|
||||
version = "1.0.21";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "andrey-git";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-L2NP4XS+dPlBr2h8tsGoa4G7tI9yiI4fwrhvQaKkexk=";
|
||||
hash = "sha256-YvriIG2G0NVlpzT91Ev13OJq8lNluqdEOTIQFQeWekI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.5.13";
|
||||
version = "0.5.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2fb7jt/wTDLFxRPzJ8i/JmlQvXBG9zjmE7nYBfmMis8=";
|
||||
hash = "sha256-YdCdB72f7IQsi8WKVmGlqAybcewisK1J7jfR5Irp6VE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-JCO+IxDQeB3CTMpGD8D+1O7Vj2pBxvvnP9M48vVUEsc=";
|
||||
cargoHash = "sha256-2WEptDHo2t6p8nzd00fPu/XQqq0gUlLAyuSraMfbHL0=";
|
||||
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
|
|
|
|||
|
|
@ -8,20 +8,20 @@ GEM
|
|||
artifactory (3.0.15)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.636.0)
|
||||
aws-sdk-core (3.154.0)
|
||||
aws-partitions (1.660.0)
|
||||
aws-sdk-core (3.167.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-kms (1.58.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kms (1.59.0)
|
||||
aws-sdk-core (~> 3, >= 3.165.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.114.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-s3 (1.117.1)
|
||||
aws-sdk-core (~> 3, >= 3.165.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
aws-sigv4 (1.5.1)
|
||||
aws-sigv4 (1.5.2)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
claide (1.1.0)
|
||||
|
|
@ -36,7 +36,7 @@ GEM
|
|||
unf (>= 0.0.5, < 1.0.0)
|
||||
dotenv (2.8.1)
|
||||
emoji_regex (3.2.3)
|
||||
excon (0.92.5)
|
||||
excon (0.94.0)
|
||||
faraday (1.10.2)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
|
|
@ -66,7 +66,7 @@ GEM
|
|||
faraday_middleware (1.2.0)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.2.6)
|
||||
fastlane (2.210.1)
|
||||
fastlane (2.211.0)
|
||||
CFPropertyList (>= 2.3, < 4.0.0)
|
||||
addressable (>= 2.8, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
|
|
@ -106,9 +106,9 @@ GEM
|
|||
xcpretty (~> 0.3.0)
|
||||
xcpretty-travis-formatter (>= 0.0.3)
|
||||
gh_inspector (1.1.3)
|
||||
google-apis-androidpublisher_v3 (0.27.0)
|
||||
google-apis-core (>= 0.7.2, < 2.a)
|
||||
google-apis-core (0.9.0)
|
||||
google-apis-androidpublisher_v3 (0.31.0)
|
||||
google-apis-core (>= 0.9.1, < 2.a)
|
||||
google-apis-core (0.9.1)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
httpclient (>= 2.8.1, < 3.a)
|
||||
|
|
@ -117,27 +117,27 @@ GEM
|
|||
retriable (>= 2.0, < 4.a)
|
||||
rexml
|
||||
webrick
|
||||
google-apis-iamcredentials_v1 (0.14.0)
|
||||
google-apis-core (>= 0.7.2, < 2.a)
|
||||
google-apis-playcustomapp_v1 (0.10.0)
|
||||
google-apis-core (>= 0.7, < 2.a)
|
||||
google-apis-storage_v1 (0.18.0)
|
||||
google-apis-core (>= 0.7, < 2.a)
|
||||
google-apis-iamcredentials_v1 (0.16.0)
|
||||
google-apis-core (>= 0.9.1, < 2.a)
|
||||
google-apis-playcustomapp_v1 (0.12.0)
|
||||
google-apis-core (>= 0.9.1, < 2.a)
|
||||
google-apis-storage_v1 (0.19.0)
|
||||
google-apis-core (>= 0.9.0, < 2.a)
|
||||
google-cloud-core (1.6.0)
|
||||
google-cloud-env (~> 1.0)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-env (1.6.0)
|
||||
faraday (>= 0.17.3, < 3.0)
|
||||
google-cloud-errors (1.3.0)
|
||||
google-cloud-storage (1.37.0)
|
||||
google-cloud-storage (1.44.0)
|
||||
addressable (~> 2.8)
|
||||
digest-crc (~> 0.4)
|
||||
google-apis-iamcredentials_v1 (~> 0.1)
|
||||
google-apis-storage_v1 (~> 0.1)
|
||||
google-apis-storage_v1 (~> 0.19.0)
|
||||
google-cloud-core (~> 1.6)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
mini_mime (~> 1.0)
|
||||
googleauth (1.2.0)
|
||||
googleauth (1.3.0)
|
||||
faraday (>= 0.17.3, < 3.a)
|
||||
jwt (>= 1.4, < 3.0)
|
||||
memoist (~> 0.16)
|
||||
|
|
@ -215,4 +215,4 @@ DEPENDENCIES
|
|||
fastlane
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.20
|
||||
2.3.24
|
||||
|
|
|
|||
|
|
@ -45,10 +45,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sbnj1i6mhdgkfsx8wxazp9628xb82yi1ckhww84p7fhhgyjf9x2";
|
||||
sha256 = "1ycbhr5329f13sjm1f3vc0iid3mmnxyg8230sp98p8jxh4c8bkwv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.636.0";
|
||||
version = "1.660.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
|
||||
|
|
@ -56,10 +56,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02wdk7gry6gs2xcbvgr3v8gkkama8alxn0z8f4lpdsna7qmkhr30";
|
||||
sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.154.0";
|
||||
version = "3.167.0";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
dependencies = ["aws-sdk-core" "aws-sigv4"];
|
||||
|
|
@ -67,10 +67,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p2dbmb1vl8vk2xchrrsp2sxa95ya5w7ll1jlw89yyhls3l2l1ag";
|
||||
sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.58.0";
|
||||
version = "1.59.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
|
||||
|
|
@ -78,10 +78,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf";
|
||||
sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.114.0";
|
||||
version = "1.117.1";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
dependencies = ["aws-eventstream"];
|
||||
|
|
@ -89,10 +89,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n";
|
||||
sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
};
|
||||
babosa = {
|
||||
groups = ["default"];
|
||||
|
|
@ -213,10 +213,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qc7l72y7wxlc3pi3paj84jc5jfb0yc1vsc0w6v029il3dd14b8r";
|
||||
sha256 = "094kbi32i56p08348b95amg9dz5c9prn5jywhkcghsd3d6kll981";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.92.5";
|
||||
version = "0.94.0";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
|
||||
|
|
@ -368,10 +368,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wxzcs81c5ji30hrz64884rg0w56v2nwjyiyc8daka578bg7s8d6";
|
||||
sha256 = "1h8w77nq8sbvqvv01sq3xynrizfg80yzas9wlbx3a18gqsvk4hjh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.210.1";
|
||||
version = "2.211.0";
|
||||
};
|
||||
gh_inspector = {
|
||||
groups = ["default"];
|
||||
|
|
@ -389,10 +389,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1z00izf9x4dcv97022vd0i7x32azsw2k893vrz3l86kazn0zgipf";
|
||||
sha256 = "14rndcs6jlq679cq760ww3grnqsq71kbq0sjsllgf9mngsxhcg7n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.27.0";
|
||||
version = "0.31.0";
|
||||
};
|
||||
google-apis-core = {
|
||||
dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
|
||||
|
|
@ -400,10 +400,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1w9m4zc5xswz2h7gj4jvnb1ivzb6lcsl75fnw8ip7qz6hzwfgrlc";
|
||||
sha256 = "0d5h7sm8asxg252dnkk91sq51ynk1m06i15an6s04ihsi5ja64n0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
};
|
||||
google-apis-iamcredentials_v1 = {
|
||||
dependencies = ["google-apis-core"];
|
||||
|
|
@ -411,10 +411,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xp49f1k9fnmch6qpmggrxfl103lk48457jkl8lzg5s79zw71g20";
|
||||
sha256 = "07d6c8pf4fam9bzkz5fjqypklclq774m0h7ahyxv0hn5zb3hkw4b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.14.0";
|
||||
version = "0.16.0";
|
||||
};
|
||||
google-apis-playcustomapp_v1 = {
|
||||
dependencies = ["google-apis-core"];
|
||||
|
|
@ -422,10 +422,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jgmfayhww7sy06pzf8r7bvxjix4jdazbyyy4mhp6ghv1s9r85w7";
|
||||
sha256 = "1kq1hfzg3i5i9fml7f6ffpihy340h23w2gcgqdkdhqgc5zd7nq0s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.0";
|
||||
version = "0.12.0";
|
||||
};
|
||||
google-apis-storage_v1 = {
|
||||
dependencies = ["google-apis-core"];
|
||||
|
|
@ -433,10 +433,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00jq03n0ff20rv4smjgx7ggv70crh2whpj5p6jmlb41nim267fvz";
|
||||
sha256 = "17qamcjnf22zvw1g169g8a2gkzdsxx4ij3a4ganihyrcf9r62asj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
};
|
||||
google-cloud-core = {
|
||||
dependencies = ["google-cloud-env" "google-cloud-errors"];
|
||||
|
|
@ -476,10 +476,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1csghy4dqh1zzwj1zkc2q8ldsj6m8y5dqs4cfzjjgb6ymkyarycc";
|
||||
sha256 = "1skhlpcykxxzw3050cwngdyc3n746wfx443w1w9chxwjbh2ix6i9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.37.0";
|
||||
version = "1.44.0";
|
||||
};
|
||||
googleauth = {
|
||||
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
|
||||
|
|
@ -487,10 +487,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "030bcdnffwndk8h270cmbndixb5h3ss860yifv6bkfys95s5fjpp";
|
||||
sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
};
|
||||
highline = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2022.08.23";
|
||||
version = "2022.09.01";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-YVi8c5c8lYpctXmOp478hVRp3wXegNxfBcrB0fTvBxE=";
|
||||
hash = "sha256-to9hbhW7t5On4PrQEm2CDrpexaMB4frbVQOdS4DGseg=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "monolith";
|
||||
version = "2.6.2";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Y2Z";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E+2D/oidqxRqKR70LN4uR1QkBa4oFfLiS8SoJkrgwtI=";
|
||||
sha256 = "sha256-pljMWAfmDQUxQEyFGVhXqLjRq6P7D+YUB/e1h66WnDE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Acmo0p+WihRg3dU3ptaFw6uf9OQegvPUCQ63b5Ucdmk=";
|
||||
cargoSha256 = "sha256-kFDyjiupjN1cuhzE16v6JP/yyXdtwL3srZVtSimnahA=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lisgd";
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~mil";
|
||||
repo = "lisgd";
|
||||
rev = version;
|
||||
hash = "sha256-ZzPdIwN4/G5Te51gJpbNcHVkG4Rplcaa8yHDJr58oyk=";
|
||||
hash = "sha256-NnZhOQ/I7wbGlWkSXFXEV96UfG+GPMz1VSiEc9TwI6Y=";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docui";
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
description = "TUI Client for Docker";
|
||||
homepage = "https://github.com/skanehira/docui";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ aethelz ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
50
pkgs/tools/misc/r3ctl/default.nix
Normal file
50
pkgs/tools/misc/r3ctl/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, qt5
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, qttools
|
||||
, qtwebsockets
|
||||
, qtmultimedia
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
qt5.mkDerivation rec {
|
||||
pname = "r3ctl";
|
||||
version = "a82cb5b3123224e706835407f21acea9dc7ab0f0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xfeedc0de64";
|
||||
repo = "r3ctl";
|
||||
rev = "a82cb5b3123224e706835407f21acea9dc7ab0f0";
|
||||
sha256 = "5/L8jvEDJGJzsuAxPrctSDS3d8lbFX/+f52OVyGQ/RY=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
qmake .
|
||||
make
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv bin $out
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
qtmultimedia
|
||||
qtwebsockets
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cmdline tool to control the r3 hackerspace lights";
|
||||
homepage = "https://github.com/0xfeedc0de64/r3ctl";
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wakatime";
|
||||
version = "1.55.2";
|
||||
version = "1.57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wakatime";
|
||||
repo = "wakatime-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Gp4whRxKhZfs0eFxTTrnrtqJAaWGX4ueKKoLUgbz4Ts=";
|
||||
sha256 = "sha256-3xeTkODG6CMDFjUrh89cFi9UlTikmWmxM3P3vg2pXEo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ANRcgeZYtcWGbK8c9KE8joo97d8LKvKA8/A+/rrjOoM=";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, nimPackages, fetchFromGitHub }:
|
||||
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "tridactly-native";
|
||||
pname = "tridactyl-native";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
let
|
||||
pkg_path = "$out/lib/ghidra";
|
||||
pname = "ghidra";
|
||||
version = "10.2";
|
||||
version = "10.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NationalSecurityAgency";
|
||||
repo = "Ghidra";
|
||||
rev = "Ghidra_${version}_build";
|
||||
sha256 = "sha256-b6xUSAZgyvpJFiG3/kl2s1vpq9n1etnoa7AJLF3NdZY=";
|
||||
sha256 = "sha256-xK6rSvI3L5wVcTBxJJndAVQMxjpsA5jMq0GeWNmCodI=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -1,30 +1,24 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ buildGoModule, fetchFromGitHub, lib, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jump";
|
||||
version = "0.41.0";
|
||||
version = "0.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gsamokovarov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nI4n1WxgdGGP822APBOLZ5lNkjwL1KfP5bKUxfvXdnE=";
|
||||
sha256 = "sha256-nlCuotEiAX2+xx7T8jWZo2p4LNLhWXDdcU6DxJprgx0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorSha256 = "sha256-nMUqZWdq//q/DNthvpKiYLq8f95O0QoItyX5w4vHzSA=";
|
||||
|
||||
doCheck = false;
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
outputs = [ "out" "man"];
|
||||
postInstall = ''
|
||||
install -D --mode=444 man/j.1 man/jump.1 -t $man/man/man1/
|
||||
|
||||
# generate completion scripts for jump
|
||||
export HOME="$NIX_BUILD_TOP"
|
||||
mkdir -p $out/share/{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
|
||||
$out/bin/jump shell bash > "$out/share/bash-completion/completions/jump"
|
||||
$out/bin/jump shell fish > $out/share/fish/vendor_completions.d/jump.fish
|
||||
$out/bin/jump shell zsh > $out/share/zsh/site-functions/_jump
|
||||
installManPage man/j.1 man/jump.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -36,6 +30,6 @@ buildGoModule rec {
|
|||
'';
|
||||
homepage = "https://github.com/gsamokovarov/jump";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -560,6 +560,8 @@ with pkgs;
|
|||
|
||||
riot-redis = callPackage ../development/tools/riot-redis { };
|
||||
|
||||
r3ctl = qt5.callPackage ../tools/misc/r3ctl { };
|
||||
|
||||
ptouch-print = callPackage ../misc/ptouch-print { };
|
||||
|
||||
demoit = callPackage ../servers/demoit { };
|
||||
|
|
@ -2128,7 +2130,7 @@ with pkgs;
|
|||
|
||||
apio = python3Packages.callPackage ../development/embedded/fpga/apio { };
|
||||
|
||||
apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {};
|
||||
apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {};
|
||||
|
||||
argagg = callPackage ../development/libraries/argagg { };
|
||||
|
||||
|
|
@ -28169,7 +28171,7 @@ with pkgs;
|
|||
|
||||
endeavour = callPackage ../applications/office/endeavour { };
|
||||
|
||||
enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };
|
||||
enhanced-ctorrent = callPackage ../applications/networking/p2p/enhanced-ctorrent { };
|
||||
|
||||
entangle = callPackage ../applications/video/entangle {
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
|
|
@ -29283,6 +29285,8 @@ with pkgs;
|
|||
|
||||
meerk40t = callPackage ../applications/misc/meerk40t { };
|
||||
|
||||
meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { };
|
||||
|
||||
musikcube = callPackage ../applications/audio/musikcube {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa SystemConfiguration;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue