Merge master into staging-next
This commit is contained in:
commit
a43d6b1a9a
|
@ -117,7 +117,7 @@ in
|
|||
file_server
|
||||
}
|
||||
@for_backend {
|
||||
path /api/* /pictrs/* feeds/* nodeinfo/*
|
||||
path /api/* /pictrs/* /feeds/* /nodeinfo/*
|
||||
}
|
||||
handle @for_backend {
|
||||
reverse_proxy 127.0.0.1:${toString cfg.settings.port}
|
||||
|
|
|
@ -127,8 +127,28 @@ with lib;
|
|||
name = "proxmox-${cfg.filenameSuffix}";
|
||||
postVM = let
|
||||
# Build qemu with PVE's patch that adds support for the VMA format
|
||||
vma = pkgs.qemu_kvm.overrideAttrs ( super: rec {
|
||||
vma = (pkgs.qemu_kvm.override {
|
||||
alsaSupport = false;
|
||||
pulseSupport = false;
|
||||
sdlSupport = false;
|
||||
jackSupport = false;
|
||||
gtkSupport = false;
|
||||
vncSupport = false;
|
||||
smartcardSupport = false;
|
||||
spiceSupport = false;
|
||||
ncursesSupport = false;
|
||||
libiscsiSupport = false;
|
||||
tpmSupport = false;
|
||||
numaSupport = false;
|
||||
seccompSupport = false;
|
||||
guestAgentSupport = false;
|
||||
}).overrideAttrs ( super: rec {
|
||||
|
||||
version = "7.0.0";
|
||||
src = pkgs.fetchurl {
|
||||
url= "https://download.qemu.org/qemu-${version}.tar.xz";
|
||||
sha256 = "sha256-9rN1x5UfcoQCeYsLqrsthkeMpT1Eztvvq74cRr9G+Dk=";
|
||||
};
|
||||
patches = [
|
||||
(pkgs.fetchpatch {
|
||||
url =
|
||||
|
|
|
@ -23,6 +23,13 @@ in
|
|||
hostname = "http://${lemmyNodeName}";
|
||||
port = backendPort;
|
||||
database.createLocally = true;
|
||||
# Without setup, the /feeds/* and /nodeinfo/* API endpoints won't return 200
|
||||
setup = {
|
||||
admin_username = "mightyiam";
|
||||
admin_password = "ThisIsWhatIUseEverywhereTryIt";
|
||||
site_name = "Lemmy FTW";
|
||||
admin_email = "mightyiam@example.com";
|
||||
};
|
||||
};
|
||||
caddy.enable = true;
|
||||
};
|
||||
|
@ -76,7 +83,8 @@ in
|
|||
# No path can return 200 until after we upload an image to pict-rs
|
||||
assert_http_code("${lemmyNodeName}/pictrs/", 404)
|
||||
|
||||
# The paths `/feeds/*` and `/nodeinfo/*` are not tested because they seem to be misconfigured
|
||||
assert_http_code("${lemmyNodeName}/feeds/all.xml", 200)
|
||||
assert_http_code("${lemmyNodeName}/nodeinfo/2.0.json", 200)
|
||||
|
||||
assert_http_code("${lemmyNodeName}/some-other-made-up-path/", 404, "-X POST")
|
||||
assert_http_code("${lemmyNodeName}/some-other-path", 404, "-H 'Accept: application/activity+json'")
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.8.9.25";
|
||||
version = "0.8.9.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-bkZ+zgFtENQUjks9HwVcqHIREcKQ5XCt3AEh3QAyiEc=";
|
||||
sha256 = "sha256-RuQAbmzB8s+YmJLSbzJTQtpiYLr1oFtrxKF8P+MlHeU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
@ -1,17 +1,20 @@
|
|||
{ lib, stdenv, fetchurl, dune_2, ocamlPackages }:
|
||||
{ lib, stdenv, fetchFromGitLab, dune_2, ocamlPackages }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
pname = "acgtk";
|
||||
version = "1.5.2";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://acg.loria.fr/software/acg-1.5.2-20201204.tar.gz";
|
||||
sha256 = "09yax7dyw8kgwzlb69r9d20y7rrymzwi3bbq2dh0qdq01vjz2xwq";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "acg";
|
||||
repo = "dev/acgtk";
|
||||
rev = "8e630b6d91bad022bd1d1a075e7768034065c428";
|
||||
sha256 = "sha256-W/BDhbng5iYuiB7desMKvRtDFdhoaxiJNvNvtbLlA6E=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune_2 ] ++ (with ocamlPackages; [
|
||||
ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime yojson
|
||||
ocaml findlib ansiterminal cairo2 cmdliner_1_1 fmt logs menhir menhirLib mtime sedlex yojson
|
||||
]);
|
||||
|
||||
buildPhase = "dune build --profile=release";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-qt";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7H1nQLJBiuTj/GwojfOPpRbDseOHvLa94LK+bXvLhws=";
|
||||
sha256 = "sha256-zznLCTbHX7VDMgW3b709snxSEtoF8k4xJBk3MdgFPNk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ];
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"version": "15.3.2",
|
||||
"repo_hash": "sha256-MZ8sDfJh2sw+Tu5LPcH5JjznTSwfDj/3vmaGC+K8ZeY=",
|
||||
"version": "15.3.3",
|
||||
"repo_hash": "sha256-cgFy119/ZAUc/mBVAwZ5t5H2Z2+i5EJI9Q1KYtB2MJo=",
|
||||
"yarn_hash": "1s2xai0q16xhp3q68hf9mxh1v429h4n5qy1iizdi7a5cmg3p3ldq",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.3.2-ee",
|
||||
"rev": "v15.3.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.3.2",
|
||||
"GITALY_SERVER_VERSION": "15.3.3",
|
||||
"GITLAB_PAGES_VERSION": "1.62.0",
|
||||
"GITLAB_SHELL_VERSION": "14.10.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.3.2"
|
||||
"GITLAB_WORKHORSE_VERSION": "15.3.3"
|
||||
},
|
||||
"vendored_gems": [
|
||||
"devise-pbkdf2-encryptable",
|
||||
|
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.3.2";
|
||||
version = "15.3.3";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
@ -22,7 +22,7 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7OAB+oHY7OBCZ4rjiS+qQIPtpYRFS8xqOkUjgWj+Qp8=";
|
||||
sha256 = "sha256-JapesdZbEjGsiR9o1J/exkqlV6Y9a69PVVPS22AaJG0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aPCcTS5zflpjzb2L/oDOQotdL8cFsgKPa8b+lhCpbag=";
|
||||
|
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.3.2";
|
||||
version = "15.3.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "22.08.15";
|
||||
version = "22.09.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2Ay5wykXuXKwcGFvFKu6SIFKdWFMdBvHwgSrqNCszMM=";
|
||||
sha256 = "sha256-eRBso0oeL+EkOw6oINbuf9s07BtKc8132FK5QbAeA8s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "22.08.15";
|
||||
version = "22.09.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-VJsxZFzraCQPNr/zS7ElPk52Tq5YHrFxaQJMUuHcnLw=";
|
||||
sha256 = "sha256-BzwuaWaSBVIh9Vk3Y7uv0+9aivXNFhBGJJMoDPrpKh4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
@ -6,7 +6,7 @@ with lib; mkCoqDerivation {
|
|||
owner = "uwplse";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.7" "8.15"; out = "20211026"; }
|
||||
{ case = range "8.7" "8.16"; out = "20211026"; }
|
||||
{ case = range "8.7" "8.14"; out = "20210524"; }
|
||||
{ case = range "8.7" "8.13"; out = "20200131"; }
|
||||
{ case = "8.6"; out = "20181102"; }
|
||||
|
|
|
@ -6,6 +6,7 @@ mkCoqDerivation {
|
|||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."8.16.0".sha256 = "sha256-sE1w8q/60adNF9yMJQO70CEk3D8QUopvgiszdHt5Wsw=";
|
||||
release."8.15.1".sha256 = "sha256:0k2sl3ns897a5ll11bazgpv4ppgi1vmx4n89v2dnxabm5dglyglp";
|
||||
release."8.14.1".sha256 = "sha256:1w99jgm7mxwdxnalxhralmhmpwwbd52pbbifq0mx13ixkv6iqm1a";
|
||||
release."8.14.0".sha256 = "04x47ngb95m1h4jw2gl0v79s5im7qimcw7pafc34gkkf51pyhakp";
|
||||
|
@ -21,6 +22,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = "8.16"; out = "8.16.0"; }
|
||||
{ case = "8.15"; out = "8.15.1"; }
|
||||
{ case = "8.14"; out = "8.14.1"; }
|
||||
{ case = "8.13"; out = "8.13.2"; }
|
||||
|
|
|
@ -13,7 +13,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.13" "8.15"; out = "0.6"; }
|
||||
{ case = range "8.13" "8.16"; out = "0.6"; }
|
||||
{ case = range "8.11" "8.12"; out = "0.4"; }
|
||||
] null;
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.10" "8.15"; out = "1.7"; }
|
||||
{ case = range "8.10" "8.16"; out = "1.7"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp-ssreflect ];
|
||||
|
|
|
@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
|
|||
repo = "bits";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.10" "8.15"; out = "1.1.0"; }
|
||||
{ case = range "8.10" "8.16"; out = "1.1.0"; }
|
||||
{ case = range "8.7" "8.15"; out = "1.0.0"; }
|
||||
] null;
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ with lib;
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.13" "8.15") (isGe "1.13.0") ]; out = "1.1.1"; }
|
||||
{ cases = [ (range "8.13" "8.16") (isGe "1.13.0") ]; out = "1.1.1"; }
|
||||
{ cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; }
|
||||
{ cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; }
|
||||
{ cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; }
|
||||
|
|
|
@ -7,7 +7,7 @@ with lib; mkCoqDerivation {
|
|||
domain = "gitlab.inria.fr";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.8" "8.15"; out = "3.2.0"; }
|
||||
{ case = range "8.8" "8.16"; out = "3.2.0"; }
|
||||
{ case = range "8.8" "8.13"; out = "3.1.0"; }
|
||||
{ case = range "8.5" "8.9"; out = "3.0.2"; }
|
||||
] null;
|
||||
|
|
|
@ -9,7 +9,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.11" "8.15"; out = "0.1.0"; }
|
||||
{ case = range "8.11" "8.16"; out = "0.1.0"; }
|
||||
] null;
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
|
|
@ -10,7 +10,7 @@ with lib;
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [
|
||||
{ cases = [(range "8.11" "8.15") (isGe "1.12.0") ]; out = "0.3.1"; }
|
||||
{ cases = [(range "8.11" "8.16") (isGe "1.12.0") ]; out = "0.3.1"; }
|
||||
{ cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }
|
||||
{ cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }
|
||||
] null;
|
||||
|
|
|
@ -11,7 +11,7 @@ with lib; mkCoqDerivation rec {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [
|
||||
{ cases = [ (range "8.14" "8.15") (isGe "1.12.0") ]; out = "0.6"; }
|
||||
{ cases = [ (range "8.14" "8.16") (isGe "1.12.0") ]; out = "0.6"; }
|
||||
{ cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; }
|
||||
] null;
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.11" "8.15"; out = "8.13.0"; }
|
||||
{ case = range "8.11" "8.16"; out = "8.13.0"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ hydra-battles pocklington ];
|
||||
|
|
|
@ -12,7 +12,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.13" "8.15"; out = "0.9"; }
|
||||
{ case = range "8.13" "8.16"; out = "0.9"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ];
|
||||
|
|
|
@ -6,11 +6,13 @@ mkCoqDerivation rec {
|
|||
owner = "fbesson";
|
||||
domain = "gitlab.inria.fr";
|
||||
|
||||
release."8.16.0".sha256 = "sha256-4zAUYGlw/pBcLPv2GroIduIlvbfi1+Vy+TdY8KLCqO4=";
|
||||
release."8.15.0".sha256 = "sha256:10qpv4nx1p0wm9sas47yzsg9z22dhvizszfa21yff08a8fr0igya";
|
||||
release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9";
|
||||
release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A=";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isEq "8.16"; out = "8.16.0"; }
|
||||
{ case = isEq "8.15"; out = "8.15.0"; }
|
||||
{ case = isEq "8.14"; out = "8.14.0"; }
|
||||
{ case = isEq "8.13"; out = "8.13+no"; }
|
||||
|
|
|
@ -9,7 +9,7 @@ with lib; mkCoqDerivation {
|
|||
inherit version;
|
||||
defaultVersion = with versions;
|
||||
switch [ coq.version mathcomp-ssreflect.version ] [{
|
||||
cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.0.0";
|
||||
cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.0.0";
|
||||
}] null;
|
||||
release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1";
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.12" "8.15") (isGe "1.12") ]; out = "1.1"; }
|
||||
{ cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "1.1"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];
|
||||
|
|
|
@ -9,7 +9,7 @@ with lib; mkCoqDerivation rec {
|
|||
|
||||
defaultVersion = with versions;
|
||||
switch [ coq.coq-version mathcomp-algebra.version ] [
|
||||
{ cases = [ (range "8.13" "8.15") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; }
|
||||
{ cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; }
|
||||
] null;
|
||||
|
||||
release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k";
|
||||
|
|
|
@ -10,7 +10,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.10" "8.15"; out = "1.1.2"; }
|
||||
{ case = range "8.10" "8.16"; out = "1.1.2"; }
|
||||
] null;
|
||||
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version ] [
|
||||
{ cases = [ (range "8.13" "8.15") ]; out = "1.0"; }
|
||||
{ cases = [ (range "8.13" "8.16") ]; out = "1.0"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ coq-elpi ];
|
||||
|
|
58
pkgs/development/libraries/imtui/default.nix
Normal file
58
pkgs/development/libraries/imtui/default.nix
Normal file
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, imgui
|
||||
, ninja
|
||||
, withEmscripten ? false, emscripten
|
||||
, withCurl ? (!withEmscripten), curl
|
||||
, withNcurses ? (!withEmscripten), ncurses
|
||||
, static ? withEmscripten
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imtui";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eHQPDEfxKGLdiOi0lUUgqJcmme1XJLSPAafT223YK+U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
||||
buildInputs = lib.optional withEmscripten emscripten
|
||||
++ lib.optional withCurl curl
|
||||
++ lib.optional withNcurses ncurses;
|
||||
|
||||
postPatch = ''
|
||||
cp -r ${imgui}/include/imgui third-party/imgui
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DEMSCRIPTEN:BOOL=${if withEmscripten then "ON" else "OFF"}"
|
||||
"-DIMTUI_SUPPORT_CURL:BOOL=${if withCurl then "ON" else "OFF"}"
|
||||
"-DIMTUI_SUPPORT_NCURSES:BOOL=${if withNcurses then "ON" else "OFF"}"
|
||||
"-DBUILD_SHARED_LIBS:BOOL=${if (!static) then "ON" else "OFF"}"
|
||||
"-DIMTUI_BUILD_EXAMPLES:BOOL=OFF"
|
||||
"-DIMTUI_INSTALL_IMGUI_HEADERS:BOOL=OFF"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/include/imgui
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Immediate mode text-based user interface library";
|
||||
longDescription = ''
|
||||
ImTui is an immediate mode text-based user interface library. Supports 256
|
||||
ANSI colors and mouse/keyboard input.
|
||||
'';
|
||||
homepage = "https://imtui.ggerganov.com";
|
||||
changelog = "https://github.com/ggerganov/imtui/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
};
|
||||
}
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.27.2";
|
||||
version = "3.27.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
hash = "sha256-bsehvoX625Lr+5/ieYnIBUMUpkCv3mlDDCCf2UyXsMk=";
|
||||
hash = "sha256-qAkyminqLmO9ea6pwkE4gquJIbwj6cE90dd59wTQbtI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopvapi";
|
||||
version = "1.6.19";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
owner = "sander76";
|
||||
repo = "aio-powerview-api";
|
||||
# no tags on git, no sdist on pypi: https://github.com/sander76/aio-powerview-api/issues/12
|
||||
rev = "89711e2a0cb4640eb458767d289dcfa3acafb10f";
|
||||
sha256 = "18gbz9rcf183syvxvvhhl62af3b7463rlqxxs49w4m805hkvirdp";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-QXWne6rTL1RjHemJJEuWX6HB2F5VSe7NJtnCpaew/xI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiostream";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vxgmichel";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07if27z1h0mg236sj9lc8nl0bqy9sdrj83ls73mrc69h76bzg5xi";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-WOtscg02Dq5YNSAfq4pIyH3oUP/5G+cjBwKB6c+SUVA=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ];
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "atlassian-python-api";
|
||||
version = "3.26.0";
|
||||
version = "3.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "atlassian-api";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-S1+QKSxoBSIebsqhx4OgQAOhNw3P674m/V203ylXB+c=";
|
||||
sha256 = "sha256-a0c/IOy14Pq8IEUKNyOh0/Z/ERGfeeI5aXFL/WpLUxE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bimmer-connected";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "bimmerconnected";
|
||||
repo = "bimmer_connected";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DcjkS0tbNZkmU787c+ECW3UntEHeKzOThvbFS4ketzA=";
|
||||
hash = "sha256-3jCxncR7bD0DDAH6vt28eBal9cVI9liLbBCX0IJ2bQ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -3,14 +3,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bx-python";
|
||||
version = "0.8.13";
|
||||
version = "0.9.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bxlab";
|
||||
repo = "bx-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r3z02mvaswijalr42ikpa7crvliijy0aigsvp5m0frp05n4irf5";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Pi4hV3FatCXoXY3nNgqm5UfWYIrpP/v5PzzCi3gmIbE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "connexion";
|
||||
version = "2.14.0";
|
||||
version = "2.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
owner = "spec-first";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5+OZvJG68jZZsfOuOqsCUSPLV6vvjk9msJzjsCwo0jw=";
|
||||
hash = "sha256-8nWNFYW4DWAzIAsxgWPXOodlc2tuuGOktNo4N1G1oOc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "5.5.0";
|
||||
version = "5.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VwN/EkJ2LtbCqSelPVl33dD1MFSlypUXmyw4FnH0ee4=";
|
||||
hash = "sha256-fj3Qp5Z7mt+NnzZhaXDDW4T+ZP6g0nT/cIhI04dqW7Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "elastic-apm";
|
||||
version = "6.11.0";
|
||||
version = "6.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -36,8 +36,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "apm-agent-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZmvOyEkXp0PEDHWcuGT91mhXwV2E6SPlrWBY/sNiRmc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tAX96aOPuwtchLk5A1ANuZI5w5H9/yX3Zj9bRSyHv90=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HmCF1CNZOCdvuJv3qr3qAWIP9wYr6053FToQyJ1MpmQ=";
|
||||
hash = "sha256-3jsTNwxUZzkNxutYqK8lI37Cexrii6QydikW/TkUqbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gcal-sync";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "allenporter";
|
||||
repo = "gcal_sync";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-RwQOLeOGxT8FijDSrByhZC/T8pFRDfJbA1eAQ1l4qUU=";
|
||||
hash = "sha256-7eaAgGVPzBc2A57VAlLZvz+SYl8G7hv2iCDAOh8Gmoc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-websecurityscanner";
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PJ1qqLAAyTmOqfLDxV2IASX9nnHOQTfAwSAotC4qlLQ=";
|
||||
hash = "sha256-T+a154A4EakPGk7OL65mweveLBEL1ol3ZYYh2MTyxy8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphene";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -25,8 +25,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "graphql-python";
|
||||
repo = "graphene";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fKvaor9tOsJWXFMAH0/iDQi5NYJPec2sJevbQsKhQQ4=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-04ocm/Q/CDi5dRNhReuvr5nAiowMZUJrZol/wJOjG50=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphql-subscription-manager";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "PyGraphqlWebsocketManager";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5+KHPm/JuazObvuC2ip6hwQxvjJH/lDgukJMH49cuwg=";
|
||||
hash = "sha256-C/awtoADq46XMGd+KwTtd1qv257FXkr6YUc/yqCQvHA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2022.8.15";
|
||||
version = "2022.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-//qtDLU5wXE0ZrkxYI+rOgIu9cLwCbeuMtM57cE1CxA=";
|
||||
sha256 = "sha256-LFgbZIEtHAnLPb5JPU//tAXKsvSidqT/JsVIr5uoKNs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "http-message-signatures";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "pyauth";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CMF9p913P04Hx/221ck1e0AoAsP7aXkX2UKp4S1nnU0=";
|
||||
hash = "sha256-acTziJM5H5Td+eG/LNrlNwgpVvFDyl/tf6//YuE1XZk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "levenshtein";
|
||||
version = "0.20.2";
|
||||
version = "0.20.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "maxbachmann";
|
||||
repo = "Levenshtein";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zVYfErh9tts3yPgXqqeX6xp8o+gLd7nN64+Ml6YZfjE=";
|
||||
hash = "sha256-oPG7qAzsUPKfLxjriS4/1fFjRu+FkceP87h2vC0OTBE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "life360";
|
||||
version = "5.0.0";
|
||||
version = "5.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "pnbruckner";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cIyN69rDuP83jjjqJ0Zc1XN8fVMbfhHKfKJNDqi6gdc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/daZ/R3qhdPfvdGra0W0rEEXl6Bux5O8oTuEuCkO3bE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-smarttub";
|
||||
version = "0.0.32";
|
||||
version = "0.0.33";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "mdz";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-3qAs0vL6YGFDsMFC3KAhSc/axxVOll/SOswaJgVi9Hc=";
|
||||
sha256 = "sha256-BGG5SQfVxhp6ID2Ob+afm75cInVixSPD5012K4HwthU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "surepy";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -26,8 +26,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "benleb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yc+jXA4ndFhRZmFPz11HbVs9qaPFNa6WdwXj6hRyjw4=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-/fgNznsucjHPO44lK4tk5tDJHKjCJEbPtOO7YHmDcRQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wktutils";
|
||||
version = "1.1.5";
|
||||
version = "1.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "asfadmin";
|
||||
repo = "Discovery-WKTUtils";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nAmU51f7K2n69G/vlLTji9EpMU1ynUpj/bZVZsaDEwM=";
|
||||
hash = "sha256-PFeIMIFOff9ztdmIP7jcFzKkmhm01G0QnDm20AafUsg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalesmartalarmclient";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "domwillcode";
|
||||
repo = "yale-smart-alarm-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CWL1uvmUGLaa2Ho0Ka4wTWstebhe1nQr9R821mweE60=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Zpj1lLaxiTaYpcj1R/ktuVldl/r19r7fzNKvnSIDq80=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -43,13 +43,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-runner";
|
||||
version = "2.296.1";
|
||||
version = "2.296.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vE1x/wRzjcRR56jUgW8PVM2SzsG87IKXOZghloZBgYM=";
|
||||
hash = "sha256-Cpg17N4LXjMpKx9SB6Bq/1eKJH5B8yVDUwjxak7xykY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "go-bindata";
|
||||
version = "3.23.0";
|
||||
version = "3.24.0";
|
||||
|
||||
goPackagePath = "github.com/kevinburke/go-bindata";
|
||||
|
||||
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "kevinburke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pIEkD0HD/6JFOzkvEG9j9yQP7hLWvmXU3MiyvVFH2rY=";
|
||||
sha256 = "sha256-dEfD5oV2nXLVg+a7PlB6LqhEBosG7eTptqKKDWcQAss=";
|
||||
};
|
||||
|
||||
subPackages = [ "go-bindata" ];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ktlint";
|
||||
version = "0.47.0";
|
||||
version = "0.47.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
|
||||
sha256 = "sha256-NuNkEBjFWUkiFKud1sMFdYkO2z2EA03XPaylC0YxY4Q=";
|
||||
sha256 = "sha256-ozOtAXI2mlzZc66oPgLotpjAai2qxvMpJdoDBJqj3Oc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "8.37.1";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZiDrG1GkUple+Q+MoNQlHdbq3P8PeQFWvxMC9dh7VTM=";
|
||||
sha256 = "sha256-0f7rA/GxXgIeJ9hh/g+MpAPdPW8NzaVKLApYyrhlIVM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";
|
||||
|
|
|
@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "open-policy-agent";
|
||||
version = "0.43.0";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "opa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZxMeYWrUnNoCUgYrg/f3C19kGeN81boTfJRSpZZ/GL4=";
|
||||
sha256 = "sha256-N5OVGffUJXbRN3eJ5LQHWpyYxuA1/JEsro/yi+qHF14=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
29
pkgs/development/tools/rust/cargo-zigbuild/default.nix
Normal file
29
pkgs/development/tools/rust/cargo-zigbuild/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, makeWrapper, zig }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nBncU5rM3gS5e/Qs14U/ZwAkLFLdNuO2DhSQW+7xGQk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Zq+RG36aeNd8G+LSdiyLK8SYC0MckGUIBTvia4H9OJY=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cargo-zigbuild \
|
||||
--prefix PATH : ${zig}/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to compile Cargo projects with zig as the linker";
|
||||
homepage = "https://github.com/messense/cargo-zigbuild";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
87
pkgs/games/classicube/default.nix
Normal file
87
pkgs/games/classicube/default.nix
Normal file
|
@ -0,0 +1,87 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, dos2unix
|
||||
, makeWrapper
|
||||
, SDL2
|
||||
, libGL
|
||||
, curl
|
||||
, openal
|
||||
, liberation_ttf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ClassiCube";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UnknownShadow200";
|
||||
repo = "ClassiCube";
|
||||
rev = version;
|
||||
sha256 = "6a0f7b03ef3a7f74cf42ffa5b88ab1a7b7beb4d864871a1b700465343ae74bb6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dos2unix makeWrapper ];
|
||||
|
||||
prePatch = ''
|
||||
# The ClassiCube sources have DOS-style newlines
|
||||
# which causes problems with diff/patch.
|
||||
dos2unix 'src/Platform_Posix.c' 'src/Core.h'
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Fix hardcoded font paths
|
||||
./font-location.patch
|
||||
# ClassiCube doesn't compile with its X11 backend
|
||||
# because of issues with libXi.
|
||||
./use-sdl.patch
|
||||
# For some reason, the Makefile doesn't link
|
||||
# with libcurl and openal when ClassiCube requires them.
|
||||
# Also links with SDL2 instead of libX11 and libXi.
|
||||
./fix-linking.patch
|
||||
];
|
||||
|
||||
font_path = "${liberation_ttf}/share/fonts/truetype";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
# ClassiCube hardcodes locations of fonts.
|
||||
# This changes the hardcoded location
|
||||
# to the path of liberation_ttf instead
|
||||
substituteInPlace src/Platform_Posix.c \
|
||||
--replace '%NIXPKGS_FONT_PATH%' "${font_path}"
|
||||
# ClassiCube's Makefile hardcodes JOBS=1 for some reason,
|
||||
# even though it works perfectly well multi-threaded.
|
||||
substituteInPlace src/Makefile \
|
||||
--replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES"
|
||||
'';
|
||||
|
||||
buildInputs = [ SDL2 libGL curl openal liberation_ttf ];
|
||||
|
||||
preBuild = "cd src";
|
||||
|
||||
postBuild = "cd -";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
cp 'src/ClassiCube' "$out/bin"
|
||||
# ClassiCube puts downloaded resources
|
||||
# next to the location of the executable by default.
|
||||
# This doesn't work with Nix
|
||||
# as the location of the executable is read-only.
|
||||
# We wrap the program to make it put its resources
|
||||
# in ~/.local/share instead.
|
||||
wrapProgram "$out/bin/ClassiCube" \
|
||||
--run 'mkdir -p "$HOME/.local/share/ClassiCube"' \
|
||||
--add-flags '-d"$HOME/.local/share/ClassiCube"'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.classicube.net/";
|
||||
description = "A lightweight, custom Minecraft Classic/ClassiCube client with optional additions written from scratch in C";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ _360ied ];
|
||||
};
|
||||
}
|
13
pkgs/games/classicube/fix-linking.patch
Normal file
13
pkgs/games/classicube/fix-linking.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 83188ce..3439cdb 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -40,7 +40,7 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9
|
||||
endif
|
||||
|
||||
ifeq ($(PLAT),linux)
|
||||
-LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl
|
||||
+LIBS=-lSDL2 -lpthread -lGL -lm -ldl -lcurl -lopenal
|
||||
endif
|
||||
|
||||
ifeq ($(PLAT),sunos)
|
16
pkgs/games/classicube/font-location.patch
Normal file
16
pkgs/games/classicube/font-location.patch
Normal file
|
@ -0,0 +1,16 @@
|
|||
diff --git a/src/Platform_Posix.c b/src/Platform_Posix.c
|
||||
index bca992d..3540afa 100644
|
||||
--- a/src/Platform_Posix.c
|
||||
+++ b/src/Platform_Posix.c
|
||||
@@ -440,9 +440,8 @@ void Platform_LoadSysFonts(void) {
|
||||
String_FromConst("/Library/Fonts")
|
||||
};
|
||||
#else
|
||||
- static const cc_string dirs[2] = {
|
||||
- String_FromConst("/usr/share/fonts"),
|
||||
- String_FromConst("/usr/local/share/fonts")
|
||||
+ static const cc_string dirs[1] = {
|
||||
+ String_FromConst("%NIXPKGS_FONT_PATH%")
|
||||
};
|
||||
#endif
|
||||
for (i = 0; i < Array_Elems(dirs); i++) {
|
13
pkgs/games/classicube/use-sdl.patch
Normal file
13
pkgs/games/classicube/use-sdl.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/Core.h b/src/Core.h
|
||||
index e94a39e..96527d0 100644
|
||||
--- a/src/Core.h
|
||||
+++ b/src/Core.h
|
||||
@@ -170,7 +170,7 @@ Thus it is **NOT SAFE** to allocate a string on the stack. */
|
||||
#define CC_BUILD_LINUX
|
||||
#define CC_BUILD_POSIX
|
||||
#define CC_BUILD_GL
|
||||
-#define CC_BUILD_X11
|
||||
+#define CC_BUILD_SDL
|
||||
#define CC_BUILD_CURL
|
||||
#define CC_BUILD_OPENAL
|
||||
#if defined CC_BUILD_RPI
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "openttd-nml";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenTTD";
|
||||
repo = "nml";
|
||||
rev = version;
|
||||
hash = "sha256-AmJrPyzPMe2F8geJhhRpO8aj467n1wqldC9iuzElFnw=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tmipHRe6qXoSLNbc0OEKxBJZrmTX3DEiuSfQeWRj1sU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
@ -15,16 +15,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2022-09-01T23-53-36Z";
|
||||
version = "2022-09-07T22-25-02Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-ceiwLyhpXM6Ia21KPO0nlYMcmLg0aOuCV7Iqb+djJ7o=";
|
||||
sha256 = "sha256-zLnYORTCYuinZEeut5fC1XS1Kj7o4c1Y6GMioSvXII4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ziW1jxlyNiXoYP6z0Uea5XVxV5O094tmZNI0vHYofMk=";
|
||||
vendorSha256 = "sha256-DL2hIvwflZf+jH73hhFtqK4yNbMcCXIghSVlBiSzvLk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.28.2.6106-44a5bbd28";
|
||||
version = "1.28.2.6151-914ddd2b3";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "18wlw6fjmmq3k0g8rj6p87xsiqw12721s3njyr9qw1dmlzcwh1zg";
|
||||
sha256 = "sha256-aWRcPHwuZA/xM1QUx4rOUhh3ICvwCgDFrPgnVWB4aUE=";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "0ii00qav7yamy9bwqgfdrvvmzywm7zga28g9y19g7n6f4bjzb5vh";
|
||||
sha256 = "sha256-J8sQ/fLz00Tiy5ka+M9JIXbQUzIfGBvofiGX7stWf84=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "1.8-1021";
|
||||
version = "1.8-1105";
|
||||
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";
|
||||
hash = "sha256-obG6e/6AxNvUZkZzgS2QAxoSbJIM2pwuQDI0O2B90J8=";
|
||||
hash = "sha256-YijqoJ0JqAhaNQ7GNaOilEhbVqmd62Plp1ykjwQw3aw=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gyb";
|
||||
version = "1.62";
|
||||
version = "1.70";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GAM-team";
|
||||
repo = "got-your-back";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HaexQ0y5i9Q0xgjzAX6E2xeyeDvARo7/Gx3ytohRT7U=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Hgdjm59RcgUb2oi0JWP7VxowVk4v9zwqnsmKAGvrxHM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mqttui";
|
||||
version = "0.16.2";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdJoPaTo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u2KuB0cw0xCAc5uRgHNsQknTfLwQmO9CZjSJTdycEnc=";
|
||||
sha256 = "sha256-GoSIck/P6s6flmfz2JbHZLgQJXXpLaxShOhmghIIMNc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-asJvunklc0zcrkgirC6wznwKNKLFQ6sN/B1GukI/NCo=";
|
||||
cargoSha256 = "sha256-oxbHaSS9+J3KPvKDdi+tpl2BI/YdppyxqSyCSfSxjMY=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sockperf";
|
||||
version = "3.8";
|
||||
version = "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mellanox";
|
||||
repo = "sockperf";
|
||||
rev = version;
|
||||
sha256 = "sha256-S5ZSGctOOnMD+AqlSAkRHMW8O1Rt8/952fali0kv/EU=";
|
||||
sha256 = "sha256-dWhYCLZ5dzp0cSEzozlQyo2gGa6FASM93FvN2PuL34g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook doxygen ];
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "faraday-agent-dispatcher";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infobyte";
|
||||
repo = "faraday_agent_dispatcher";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dTXTR2H37FDfnpY4Ts6NoYAnJX52yqRZeD2Yf8S/kS8=";
|
||||
hash = "sha256-lsSpD3XJ6Yw9viRCRB7zhl/KTC6Nwle2vnZ9xWr4Ujo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmodsecurity";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpiderLabs";
|
||||
repo = "ModSecurity";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Xf+wtYg0ZKgP5qo891fCMML/7tgSM/fvBdrmsgJixY4=";
|
||||
sha256 = "sha256-Xqg7Y6i5pG1WGDLE7Zry+6ZN5o1LpmpOwEL67LlzIDk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -368,6 +368,8 @@ with pkgs;
|
|||
|
||||
chrysalis = callPackage ../applications/misc/chrysalis { };
|
||||
|
||||
classicube = callPackage ../games/classicube { };
|
||||
|
||||
clj-kondo = callPackage ../development/tools/clj-kondo { };
|
||||
|
||||
cloak = callPackage ../applications/misc/cloak {
|
||||
|
@ -14627,6 +14629,8 @@ with pkgs;
|
|||
|
||||
cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { };
|
||||
|
||||
cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { };
|
||||
|
||||
crate2nix = callPackage ../development/tools/rust/crate2nix { };
|
||||
|
||||
convco = callPackage ../development/tools/convco {
|
||||
|
@ -18869,6 +18873,8 @@ with pkgs;
|
|||
|
||||
imgui = callPackage ../development/libraries/imgui { };
|
||||
|
||||
imtui = callPackage ../development/libraries/imtui { };
|
||||
|
||||
imlib = callPackage ../development/libraries/imlib {
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue