mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 20:03:16 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c9a4937f2b
@ -97,6 +97,12 @@ git push origin $(git branch --show-current) --force-with-lease
|
||||
|
||||
Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
|
||||
|
||||
You can add a label such as `backport release-22.05` to a PR, so that merging it will
|
||||
automatically create a backport (via [a GitHub Action](.github/workflows/backport.yml)).
|
||||
This also works for PR's that have already been merged, and might take a couple of minutes to trigger.
|
||||
|
||||
You can also create the backport manually:
|
||||
|
||||
1. Take note of the commits in which the change was introduced into `master` branch.
|
||||
2. Check out the target _release branch_, e.g. `release-21.11`. Do not use a _channel branch_ like `nixos-21.11` or `nixpkgs-21.11-darwin`.
|
||||
3. Create a branch for your change, e.g. `git checkout -b backport`.
|
||||
|
||||
@ -92,8 +92,10 @@
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Please remove this line when you add the first item since
|
||||
docbook requires the section to be non-empty
|
||||
A new module was added for the Saleae Logic device family,
|
||||
providing the options
|
||||
<literal>hardware.saleae-logic.enable</literal> and
|
||||
<literal>hardware.saleae-logic.package</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
|
||||
@ -44,5 +44,6 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
## Other Notable Changes {#sec-release-22.11-notable-changes}
|
||||
|
||||
- Please remove this line when you add the first item since docbook requires the section to be non-empty
|
||||
* A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
25
nixos/modules/hardware/saleae-logic.nix
Normal file
25
nixos/modules/hardware/saleae-logic.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.hardware.saleae-logic;
|
||||
in
|
||||
{
|
||||
options.hardware.saleae-logic = {
|
||||
enable = lib.mkEnableOption "udev rules for Saleae Logic devices";
|
||||
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.saleae-logic-2;
|
||||
defaultText = lib.literalExpression "pkgs.saleae-logic-2";
|
||||
description = ''
|
||||
Saleae Logic package to use.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.udev.packages = [ cfg.package ];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ chivay ];
|
||||
}
|
||||
@ -73,6 +73,7 @@
|
||||
./hardware/printers.nix
|
||||
./hardware/raid/hpsa.nix
|
||||
./hardware/rtl-sdr.nix
|
||||
./hardware/saleae-logic.nix
|
||||
./hardware/steam-hardware.nix
|
||||
./hardware/system-76.nix
|
||||
./hardware/tuxedo-keyboard.nix
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
|
||||
let
|
||||
pname = "sparrow";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1wdibpbhv3g6qk42ddfc5vyqkkwprczy45w5wi115qg3g1rf1in7";
|
||||
sha256 = "0zk33w664fky3ir6cqm6walc80fjhg9s0hnrllrc2hrxrqnrn88p";
|
||||
};
|
||||
|
||||
launcher = writeScript "sparrow" ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "avrdudess";
|
||||
version = "2.13";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.13/AVRDUDESS-2.13-portable.zip";
|
||||
sha256 = "0fpvc19fb14ppqfb2yg821szmhyanxcp5chfldf8yh51f64zihv9";
|
||||
url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.14/AVRDUDESS-2.14-portable.zip";
|
||||
sha256 = "sha256-x3xcsJLBJVO8XdV4OUveZ4KLqN5z/z0FsNLbGHSNoHs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fluxctl";
|
||||
version = "1.25.0";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = "flux";
|
||||
rev = version;
|
||||
sha256 = "sha256-EFB8iAs7e4FigYnTvkh+dpZq6ymX7Qfy0cUDtUaPdmM=";
|
||||
sha256 = "sha256-l/BPnqa0j0yAdrl9BxFUKt94JwiNyPq1gKYuhGj/c8w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9RyTeGjp7mEpmWnQeK2uG1krO6+1sK6fsID6JVrejHw=";
|
||||
vendorSha256 = "sha256-PZriaKbgRKm7ssHOBmbzbma5LrRt0TsQiphSrtcT83k=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -22,8 +22,6 @@ buildGoModule rec {
|
||||
"-X github.com/cloudnativelabs/kube-router/pkg/version.BuildDate=Nix"
|
||||
];
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = kube-router;
|
||||
};
|
||||
|
||||
@ -17,7 +17,8 @@ buildGoModule rec {
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
# There too many integration tests.
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.16.0";
|
||||
version = "3.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cxx18dfXWm/0/9sGuc+LxfEHVc9VVfMEYbC9L4HKIm0=";
|
||||
sha256 = "sha256-WnUOHUGIALHd0Ne+WzturRxomznpgVjVLBM1wvVAA4M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ReQsNy4hfhB6+Megm1KywX2UkQMHkv3/RtNWdhwb4Zw=";
|
||||
vendorSha256 = "sha256-fjmKBRkXZQkN6fofy+H7DS76H+J0x6tRgv0fV/2rCwY=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ovg+oMlt3XzOxG9w/5Li3awMyRdIt1/JnIFfZktftkw=";
|
||||
sha256 = "sha256-PkU3QJvAK2b1KQC1o5md35iucjq+SYoKAGxqiojf4rw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0CA0HwFI86VfSyBNn0nlC1n4BVgOc9BLh1it7ReT8+Y=";
|
||||
cargoSha256 = "sha256-Jj2CK3nwktv2MU+EHXzQ/lKDUlC+4HkaItMTtoGF1Pw=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
||||
@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gmsh";
|
||||
version = "4.9.5";
|
||||
version = "4.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gmsh.info/src/gmsh-${version}-source.tgz";
|
||||
sha256 = "sha256-/9ZJAIRCCHGciNkaZsKBiJAjEyt6nigsUVSMufbzrUQ=";
|
||||
sha256 = "sha256-2SEQnmxBn2jVUH2WEu6BXUC1I5pdsXXygoXgzQ2/JRc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -14,13 +14,25 @@ buildGoModule rec {
|
||||
owner = "abiosoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g7q2DmtyArtW7Ii2XF5umXQ0+BlCSa1Q7VNNuIuX65k=";
|
||||
sha256 = "sha256-KYW3gxf21aWnuRHkysOjArzMSNH3m3XDoi6Sic3N+Po=";
|
||||
|
||||
# We need the git revision
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse HEAD > $out/.git-revision
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
vendorSha256 = "sha256-Z4+qwoX04VnLsUIYRfOowFLgcaA9w8oGRl77jzFigIc=";
|
||||
|
||||
preConfigure = ''
|
||||
ldflags="-X github.com/abiosoft/colima/config.appVersion=${version}
|
||||
-X github.com/abiosoft/colima/config.revision=$(cat .git-revision)"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/colima \
|
||||
--prefix PATH : ${lib.makeBinPath [ lima ]}
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-terminal";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
sha256 = "sha256-oZOnPAfvSXCreFHTIZYpJhOdtlDOHrAUMvGIjYU+TRU=";
|
||||
sha256 = "sha256-eCb6KB9fFPuYzNLUm/yYrh+0D60ISzasnv/myStImEI=";
|
||||
|
||||
nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ];
|
||||
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "folly";
|
||||
version = "2022.05.16.00";
|
||||
version = "2022.05.23.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "folly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JCA6NhsL2mVmpXVV5wmZhtjaYrvp39mvy1r8/nMYcuI=";
|
||||
sha256 = "sha256-ti/aqVg6b3ZPEI72AZNo/4NrtlI/mKQb39tlTw+3VG4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,18 +1,17 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planarity";
|
||||
version = "3.0.0.5";
|
||||
version = "3.0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graph-algorithms";
|
||||
repo = "edge-addition-planarity-suite";
|
||||
rev = "Version_${version}";
|
||||
sha256 = "01cm7ay1njkfsdnmnvh5zwc7wg7x189hq1vbfhh9p3ihrbnmqzh8";
|
||||
sha256 = "sha256-cUAh2MXCSmtxFtV6iTHgSRgsq/26DjWwxhWJH1+367A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -21,14 +20,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
patches = [
|
||||
# declare variables declared in headers as extern, not yet merged upstream
|
||||
(fetchpatch {
|
||||
url = "https://github.com/graph-algorithms/edge-addition-planarity-suite/pull/3.patch";
|
||||
sha256 = "1nqjc4clr326imz4jxqxcxv2hgh1sjgzll27k5cwkdin8lnmmil8";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite";
|
||||
description = "A library for implementing graph algorithms";
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildDunePackage
|
||||
, camlp-streams
|
||||
, ppx_cstruct
|
||||
, cstruct
|
||||
, re
|
||||
@ -9,17 +10,18 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tar";
|
||||
version = "1.1.0";
|
||||
version = "2.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirage";
|
||||
repo = "ocaml-tar";
|
||||
rev = "v${version}";
|
||||
sha256 = "14k24vn3q5jl0iyrynb5vwg80670qsv12fsmc6cdgh4zwdpjh7zs";
|
||||
sha256 = "1zr1ak164k1jm15xwqjf1iv77kdrrahak33wrxg7lifz9nnl0dms";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
camlp-streams
|
||||
ppx_cstruct
|
||||
cstruct
|
||||
re
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-python-hcl2";
|
||||
version = "0.3.41";
|
||||
version = "0.3.42";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TrQtG2MWc4prr8grEE1XifjjLq7GPe6JPRMgpNNGfPY=";
|
||||
hash = "sha256-s4O2xoNafYHFBToxkKzgJ5NjQH4M5D7PcpsmiAZqR/8=";
|
||||
};
|
||||
|
||||
# Nose is required during build process, so can not use `checkInputs`.
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-cacheops";
|
||||
version = "6.0";
|
||||
version = "6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "78e161ebd96a32e28e19ec7da31f2afed9e62a79726b8b5f0ed12dd16c2e5841";
|
||||
sha256 = "sha256-toTvOf1DQYnTy7fYVBfNlyr2NSiaAyRHmCRztKifcn0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, django
|
||||
, freezegun
|
||||
, psycopg2
|
||||
, pytest-django
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-model-utils";
|
||||
version = "4.2.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = "django-model-utils";
|
||||
rev = version;
|
||||
sha256 = "sha256-TLqvpP/ZaGGFdqnN+UHbhXv1K1YVYTYBkCiWCjYrFh8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
];
|
||||
|
||||
# requires postgres database
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
psycopg2
|
||||
pytest-django
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "model_utils" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jazzband/django-model-utils";
|
||||
description = "Django model mixins and utilities";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
43
pkgs/development/python-modules/webauthn/default.nix
Normal file
43
pkgs/development/python-modules/webauthn/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, asn1crypto
|
||||
, cbor2
|
||||
, pythonOlder
|
||||
, pydantic
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "webauthn";
|
||||
version = "1.5.2";
|
||||
disabled = pythonOlder "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "duo-labs";
|
||||
repo = "py_webauthn";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sjl65vx1VthVX6ED3lXXAcn2D5WzzGAINKBjCc10rcs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
cbor2
|
||||
pydantic
|
||||
pyopenssl
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "webauthn" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/duo-labs/py_webauthn";
|
||||
description = "Implementation of the WebAuthn API";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tarpaulin";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xd009642";
|
||||
repo = "tarpaulin";
|
||||
rev = version;
|
||||
sha256 = "sha256-LMHaRGZZqFUCbrChzlLA/gUArlGC5DUI2fc1bkLU2CA=";
|
||||
sha256 = "sha256-WobKZeO0U54mHj7hlkOH33TcOklWBJRWYSJBEt5sYII=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ curl Security ];
|
||||
|
||||
cargoSha256 = "sha256-ei+ilmrlJYmt08A+aV2Rc5pn5dkuEBgfm9kyLkfFe9A=";
|
||||
cargoSha256 = "sha256-LR4jU7V44f00ry0VEd3qFryZtnn/t0K/OZGnRproksE=";
|
||||
#checkFlags = [ "--test-threads" "1" ];
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "flyway";
|
||||
version = "8.5.9";
|
||||
version = "8.5.11";
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
|
||||
sha256 = "sha256-AOfCYWjn8XyyFdz6BbYOysEE1TADfIk8CyPBHsQJTDE=";
|
||||
sha256 = "sha256-qmDvubyWWBRTbspVDSACiklC6a8l5n4y88vz3VZFnV0=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-migrate";
|
||||
version = "4.15.1";
|
||||
version = "4.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang-migrate";
|
||||
repo = "migrate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t4F4jvXexxCqKINaaczeG/B2vLSG87/qZ+VQitfAF4Y=";
|
||||
sha256 = "sha256-nVR6zMG/a4VbGgR9a/6NqMNYwFTifAZW3F6rckvOEJM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qgjU8mUdk8S0VHmWiTK/5euwhRQ4y3o4oRxG2EHF+7E=";
|
||||
vendorSha256 = "sha256-lPNPl6fqBT3XLQie9z93j91FLtrMjKbHnXUQ6b4lDb4=";
|
||||
|
||||
subPackages = [ "cmd/migrate" ];
|
||||
|
||||
|
||||
@ -17,7 +17,9 @@ buildGoModule rec {
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
preCheck = ''
|
||||
buildFlagsArray+="-short"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go";
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopls";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "tools";
|
||||
rev = "gopls/v${version}";
|
||||
sha256 = "sha256-X5U06TEkf1vfCyV95wkg2qVd7I+8S8UPBgwacG0q85U=";
|
||||
sha256 = "sha256-3JI6jrWCOgfFefivSDWz3yets4CXnDsvE/iYYms+piU=";
|
||||
};
|
||||
|
||||
modRoot = "gopls";
|
||||
vendorSha256 = "sha256-p6biMwicaG5peIu6dp+Pzun8TeNWmgW2QpLIZWqnalg=";
|
||||
vendorSha256 = "sha256-7SkCRu4CGvb0TaL9BR2eeNjGNwViFh6TgtUUxiRjDxA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -23,6 +23,6 @@ buildGoModule rec {
|
||||
description = "Official language server for the Go language";
|
||||
homepage = "https://github.com/golang/tools/tree/master/gopls";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ mic92 SuperSandro2000 zimbatm ];
|
||||
maintainers = with maintainers; [ mic92 rski SuperSandro2000 zimbatm ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-bitbake";
|
||||
version = "0.3.15";
|
||||
version = "0.3.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meta-rust";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ffjkwaqvmyz374azrv6gna19z2fcg82is2k2n2gm50isbxw2aa5";
|
||||
sha256 = "sha256-+ovC4nZwHzf9hjfv2LcnTztM2m++tpC3mUSS/I0l6Ck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
cargoSha256 = "0mm6059wjh5p8923dwz55dpwi55gq2bcmpx7kn40pq5ppkiqjiw9";
|
||||
cargoSha256 = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "ytt";
|
||||
version = "0.40.1";
|
||||
version = "0.41.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-ytt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DtzdgEHgxoZRSvylq2vLzU1PAk1ETBDpBWFHcIW95r4=";
|
||||
sha256 = "sha256-JOmDEhisJh4sezxf/Whsf1W7rn4q7C3GqmINQ/A13J0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
@ -18,6 +18,6 @@ buildGoModule rec {
|
||||
description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values";
|
||||
homepage = "https://get-ytt.io";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ brodes ];
|
||||
maintainers = with maintainers; [ brodes techknowlogick ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,27 +1,22 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, sfml, fribidi, taglib }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mars";
|
||||
version = "0.7.5";
|
||||
version = "unstable-17.10.2021";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thelaui";
|
||||
repo = "M.A.R.S.";
|
||||
rev = "c855d044094a1d92317e38935d81ba938946132e";
|
||||
sha256 = "1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh";
|
||||
rev = "84664cda094efe6e49d9b1550e4f4f98c33eefa2";
|
||||
sha256 = "sha256-SWLP926SyVTjn+UT1DCaJSo4Ue0RbyzImVnlNJQksS0=";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libGLU libGL sfml fribidi taglib ];
|
||||
patches = [
|
||||
./unbind_fix.patch
|
||||
./fix-gluortho2d.patch
|
||||
];
|
||||
installPhase = ''
|
||||
cd ..
|
||||
find -name '*.svn' -exec rm -rf {} \;
|
||||
mkdir -p "$out/share/mars/"
|
||||
mkdir -p "$out/bin/"
|
||||
cp -rv data resources credits.txt license.txt "$out/share/mars/"
|
||||
cp -v mars "$out/bin/mars.bin"
|
||||
cp -v marsshooter "$out/bin/mars.bin"
|
||||
cat << EOF > "$out/bin/mars"
|
||||
#! ${stdenv.shell}
|
||||
cd "$out/share/mars/"
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
From 33d5affabf8ff84f2c028b9303c6a9e83cc824ad Mon Sep 17 00:00:00 2001
|
||||
From: James Cowgill <james410@cowgill.org.uk>
|
||||
Date: Sat, 9 May 2015 01:54:14 +0100
|
||||
Subject: [PATCH] Remove dependency on GLU - fixes build with SFML 2.3
|
||||
|
||||
---
|
||||
premake4.lua | 8 ++++----
|
||||
src/Shaders/postFX.cpp | 2 +-
|
||||
src/System/window.cpp | 12 ++++++------
|
||||
3 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/premake4.lua b/premake4.lua
|
||||
index 023dddd..5af4495 100755
|
||||
--- a/premake4.lua
|
||||
+++ b/premake4.lua
|
||||
@@ -11,11 +11,11 @@ project "mars"
|
||||
defines { "NDEBUG" }
|
||||
flags { "Optimize" }
|
||||
if os.get() == "windows" then
|
||||
- links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "glu32", "opengl32", "fribidi-0", "tag" }
|
||||
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "opengl32", "fribidi-0", "tag" }
|
||||
elseif os.get() == "macosx" then
|
||||
links { "sfml-graphics.framework", "sfml-audio.framework", "sfml-system.framework", "sfml-window.framework", "opengl.framework", "fribidi", "tag" }
|
||||
else
|
||||
- links { "GLU", "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
|
||||
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
|
||||
libdirs { "/usr/lib", "/usr/local/lib" }
|
||||
end
|
||||
|
||||
@@ -23,10 +23,10 @@ project "mars"
|
||||
defines { "_DEBUG", "DEBUG" }
|
||||
flags { "Symbols" }
|
||||
if os.get() == "windows" then
|
||||
- links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "glu32", "opengl32", "fribidi-0", "tag" }
|
||||
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "opengl32", "fribidi-0", "tag" }
|
||||
elseif os.get() == "macosx" then
|
||||
links { "sfml-graphics.framework", "sfml-audio.framework", "sfml-system.framework", "sfml-window.framework", "opengl.framework", "fribidi", "tag" }
|
||||
else
|
||||
- links { "GLU", "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
|
||||
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
|
||||
libdirs { "/usr/lib", "/usr/local/lib" }
|
||||
end
|
||||
diff --git a/src/Shaders/postFX.cpp b/src/Shaders/postFX.cpp
|
||||
index 987f411..f767a47 100644
|
||||
--- a/src/Shaders/postFX.cpp
|
||||
+++ b/src/Shaders/postFX.cpp
|
||||
@@ -78,7 +78,7 @@ namespace postFX {
|
||||
postFX_.loadFromFile(settings::C_dataPath + "shaders/bump.frag", sf::Shader::Fragment);
|
||||
bumpMap_.create(SPACE_X_RESOLUTION*0.5f, SPACE_Y_RESOLUTION*0.5f);
|
||||
glViewport(0,0,SPACE_X_RESOLUTION*0.5f,SPACE_Y_RESOLUTION*0.5f);
|
||||
- gluOrtho2D(0, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0);
|
||||
+ glOrtho(0, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0, -1, 1);
|
||||
glEnable(GL_BLEND);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
postFX_.setParameter("BumpMap", bumpMap_.getTexture());
|
||||
diff --git a/src/System/window.cpp b/src/System/window.cpp
|
||||
index e9a099a..8e12dcc 100644
|
||||
--- a/src/System/window.cpp
|
||||
+++ b/src/System/window.cpp
|
||||
@@ -222,7 +222,7 @@ namespace window {
|
||||
glLoadIdentity();
|
||||
|
||||
// Setup translation (according to left-upper corner)
|
||||
- gluOrtho2D(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f);
|
||||
+ glOrtho(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f, -1, 1);
|
||||
|
||||
// probably improves performance...
|
||||
glDisable(GL_LIGHTING);
|
||||
@@ -247,7 +247,7 @@ namespace window {
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
|
||||
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
|
||||
@@ -255,7 +255,7 @@ namespace window {
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
- gluOrtho2D(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f);
|
||||
+ glOrtho(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f, -1, 1);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
}
|
||||
@@ -270,7 +270,7 @@ namespace window {
|
||||
glLoadIdentity();
|
||||
setViewPort();
|
||||
|
||||
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
|
||||
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
|
||||
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
@@ -284,7 +284,7 @@ namespace window {
|
||||
glLoadIdentity();
|
||||
setViewPort();
|
||||
|
||||
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
|
||||
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
|
||||
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
@@ -294,7 +294,7 @@ namespace window {
|
||||
else {
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
|
||||
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
diff --git a/src/System/window.cpp b/src/System/window.cpp
|
||||
index e9a099a..e3f6de9 100644
|
||||
--- a/src/System/window.cpp
|
||||
+++ b/src/System/window.cpp
|
||||
@@ -308,12 +308,12 @@ namespace window {
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
|
||||
if (shader)
|
||||
- shader->bind();
|
||||
+ sf::Shader::bind(shader);
|
||||
|
||||
window_.draw(toBeDrawn, states);
|
||||
|
||||
if (shader)
|
||||
- shader->unbind();
|
||||
+ sf::Shader::bind(NULL);
|
||||
|
||||
window_.popGLStates();
|
||||
glPopMatrix();
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:
|
||||
{ lib, stdenv, fetchFromGitHub, kernel }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "digimend";
|
||||
version = "unstable-2019-06-18";
|
||||
version = "10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digimend";
|
||||
repo = "digimend-kernel-drivers";
|
||||
rev = "8b228a755e44106c11f9baaadb30ce668eede5d4";
|
||||
sha256 = "1l54j85540386a8aypqka7p5hy1b63cwmpsscv9rmmf10f78v8mm";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lifd6cx6aa6hcms4zn4hlla3alra08r0svj5x1l8nlsv0ydnl6i";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -16,14 +16,8 @@ stdenv.mkDerivation rec {
|
||||
sed 's/depmod /true /' -i Makefile
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Fix build on Linux kernel >= 5.4
|
||||
# https://github.com/DIGImend/digimend-kernel-drivers/pull/331
|
||||
(fetchpatch {
|
||||
url = "https://github.com/DIGImend/digimend-kernel-drivers/commit/fb8a2eb6a9198bb35aaccb81e22dd5ebe36124d1.patch";
|
||||
sha256 = "1j7l5hsk59gccydpf7n6xx1ki4rm6aka7k879a7ah5jn8p1ylgw9";
|
||||
})
|
||||
];
|
||||
# Fix build on Linux kernel >= 5.18
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ];
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
|
||||
@ -24,7 +24,9 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
# skips tests with external dependencies, e.g. on mysqld
|
||||
checkFlags = [ "-short" ];
|
||||
preCheck = ''
|
||||
buildFlagsArray+="-short"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prometheus exporter for MySQL server metrics";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rum";
|
||||
version = "1.3.9";
|
||||
version = "1.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postgrespro";
|
||||
repo = "rum";
|
||||
rev = version;
|
||||
sha256 = "sha256-xdCj9hzBg7VtAIHpIFpeeaK6U4aRrCsoQrPKdABSl+Y=";
|
||||
sha256 = "sha256-OuVyZ30loPycQkDwlL0289H/4RRPneibqgibgzqhWo4=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
@ -2,19 +2,23 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clair";
|
||||
version = "4.3.6";
|
||||
version = "4.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quay";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yKs/TPSu3WD34Z9fAys7ItWWcSKiUXhVWAqQXMnOrEw=";
|
||||
sha256 = "sha256-6nlVcuWAp9lWji4ruAZ//D6iEbL+zSjLDX9bYyRfTQ8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-C3xnBANsymSgI7l446CjJzEMY1gURGTxDNBBjNjHmaE=";
|
||||
vendorSha256 = "sha256-35rUeDi+7xSI2kSk9FvtubxhZq5LePNoXC66dIy6gs8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
subPackages = [ "cmd/clair" "cmd/clairctl" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/clair \
|
||||
--prefix PATH : "${lib.makeBinPath [ rpm xz ]}"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, docker-credential-gcr }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, testers, docker-credential-gcr }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-credential-gcr";
|
||||
@ -11,6 +11,18 @@ buildGoModule rec {
|
||||
sha256 = "sha256-1AUs8Gt2Qw8BJk2zwRcazVl+POkPSy9e1jW9Mk/0rx8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-TestGet_GCRCredentials.patch";
|
||||
url = "https://github.com/GoogleCloudPlatform/docker-credential-gcr/commit/a0c080e58bbfdeb0aa24e66551c4e8b0359bf178.patch";
|
||||
sha256 = "sha256-aXp/1kNaxqQDPszC7pO+qP7ZBWHjpVljUHiKFnnDWuM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -rf ./test
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-e7XNTizZYp/tS7KRvB9KxY3Yurphnm6Ehz4dHZNReK8=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
@ -21,8 +33,6 @@ buildGoModule rec {
|
||||
"-X github.com/GoogleCloudPlatform/docker-credential-gcr/config.Version=${version}"
|
||||
];
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = docker-credential-gcr;
|
||||
command = "docker-credential-gcr version";
|
||||
|
||||
@ -4,7 +4,10 @@
|
||||
, nixosTests
|
||||
|
||||
# Dependencies
|
||||
, bzip2
|
||||
, cmake
|
||||
, freetype
|
||||
, libGL
|
||||
, libjpeg_turbo
|
||||
, makeWrapper
|
||||
, mesa # for built-in 3D software rendering using swrast
|
||||
@ -14,21 +17,24 @@
|
||||
, openssl
|
||||
, pam
|
||||
, perl
|
||||
, python3
|
||||
, which
|
||||
, xkbcomp
|
||||
, xkeyboard_config
|
||||
, xorg
|
||||
, xterm
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "turbovnc";
|
||||
version = "2.2.7";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TurboVNC";
|
||||
repo = "turbovnc";
|
||||
rev = version;
|
||||
sha256 = "sha256-mEdatfTBx4nNmMTgv1Z+xefPFEiE2rCrsxyB7Dd03rg=";
|
||||
sha256 = "sha256-4/pfKb89ld32LvqTXjVpIJUCCDA+D7CLYMNFYytKVIE=";
|
||||
};
|
||||
|
||||
# TODO:
|
||||
@ -47,21 +53,40 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
makeWrapper
|
||||
openjdk_headless
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
freetype
|
||||
libGL # for -DTVNC_SYSTEMX11=1
|
||||
libjpeg_turbo
|
||||
openssl
|
||||
pam
|
||||
perl
|
||||
zlib
|
||||
] ++ (with xorg; [
|
||||
libfontenc # for -DTVNC_SYSTEMX11=1
|
||||
libSM
|
||||
libX11
|
||||
libXdamage # for -DTVNC_SYSTEMX11=1
|
||||
libXdmcp # for -DTVNC_SYSTEMX11=1
|
||||
libXext
|
||||
libXfont2 # for -DTVNC_SYSTEMX11=1
|
||||
libxkbfile # for -DTVNC_SYSTEMX11=1
|
||||
libXi
|
||||
mesa # for -DTVNC_SYSTEMX11=1
|
||||
pixman # for -DTVNC_SYSTEMX11=1
|
||||
xorgproto
|
||||
xtrans # for -DTVNC_SYSTEMX11=1
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "Xfont2" X11_Xfont2_LIB' 'set(X11_Xfont2_LIB ${xorg.libXfont2}/lib/libXfont2.so) #'
|
||||
substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "fontenc" X11_Fontenc_LIB' 'set(X11_Fontenc_LIB ${xorg.libfontenc}/lib/libfontenc.so) #'
|
||||
substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "pixman-1" X11_Pixman_LIB' 'set(X11_Pixman_LIB ${xorg.pixman}/lib/libpixman-1.so) #'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
# For the 3D software rendering built into TurboVNC, pass the path
|
||||
# to the swrast dri driver in Mesa.
|
||||
@ -73,6 +98,10 @@ stdenv.mkDerivation rec {
|
||||
"-DTJPEG_JNILIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so"
|
||||
"-DXKB_BASE_DIRECTORY=${xkeyboard_config}/share/X11/xkb"
|
||||
"-DXKB_BIN_DIRECTORY=${xkbcomp}/bin"
|
||||
# use system libs
|
||||
"-DTVNC_SYSTEMLIBS=1"
|
||||
"-DTVNC_SYSTEMX11=1"
|
||||
"-DTVNC_DLOPENSSL=0"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@ -85,16 +114,13 @@ stdenv.mkDerivation rec {
|
||||
# (This default is written by `vncserver` to `~/.vnc/xstartup.turbovnc`,
|
||||
# see https://github.com/TurboVNC/turbovnc/blob/ffdb57d9/unix/vncserver.in#L201.)
|
||||
# It checks for it using `which twm`.
|
||||
# vncserver needs also needs `xauth` and we add in `xterm` for convenience
|
||||
wrapProgram $out/bin/vncserver \
|
||||
--prefix PATH : ${lib.makeBinPath [ which xorg.twm ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ which xorg.twm xorg.xauth xterm ]}
|
||||
|
||||
# Patch /usr/bin/perl
|
||||
patchShebangs $out/bin/vncserver
|
||||
|
||||
# vncserver needs `xauth`
|
||||
wrapProgram $out/bin/vncserver \
|
||||
--prefix PATH : ${lib.makeBinPath (with xorg; [ xauth ])}
|
||||
|
||||
# The viewer is in Java and requires `JAVA_HOME` (which is a single
|
||||
# path, cannot be multiple separated paths).
|
||||
# For SSH support, `ssh` is required on `PATH`.
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "gcsfuse";
|
||||
version = "0.41.0";
|
||||
version = "0.41.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlecloudplatform";
|
||||
repo = "gcsfuse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vVmOEiP4oMvs8EmHAmp/xS1RMqs6ESDm4Ov9hAEeWPg=";
|
||||
sha256 = "sha256-5Kfd033SG1ldF+2QCZ01aa7ts0mA8uPXiLmqZIr94YQ=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
|
||||
|
||||
@ -15,7 +15,9 @@ buildGoModule rec {
|
||||
|
||||
vendorSha256 = "sha256-yxqLGDqdu9vX3ykHq7Kzf8oBH1ydltZkiWNWWM2l0Aw=";
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
preCheck = ''
|
||||
buildFlagsArray+="-short"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An authenticating proxy for Second Generation Google Cloud SQL databases";
|
||||
|
||||
@ -10,15 +10,15 @@ let
|
||||
|
||||
in buildGoModule rec {
|
||||
pname = "datadog-agent";
|
||||
version = "7.35.1";
|
||||
version = "7.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = version;
|
||||
sha256 = "sha256-TvkPw67HBeRkKbbA3O/JVBkEUds36eW4UwKnRvPwAXc=";
|
||||
sha256 = "sha256-pkbgYE58T9QzV7nCzvfBoTt6Ue8cCMUBSuCBeDtdkzo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-RmHxjJAMS+2MVoBJMD6FTQLhxDgzH3jtp87474i9ho8=";
|
||||
vendorSha256 = "sha256-SxdSoZtRAdl3evCpb+3BHWf/uPYJJKgw0CL9scwNfGA=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/agent"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.42.1";
|
||||
version = "0.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m4Xc5ZorsO6WcbHmJGROJ8SsPCm/KmFapQRQZTZIQKw=";
|
||||
sha256 = "sha256-rhhfXdtPxNnHqMgkLfm9ZMXWbKHMAPnFzeyMxt3LbeA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-release";
|
||||
version = "0.20.5";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "cargo-release";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3UuDo6lW+SG4XhqEKvpe/JeJXwEeYTA0i65yJAjDVHk=";
|
||||
sha256 = "sha256-QTHevbEifYsf/nCmkarbrHgijjlHragLieCpVZBfKGQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-/3gh3NdIuWl0xtbLahNRGBl/BGpVUmR7sHUIX3bttpQ=";
|
||||
cargoSha256 = "sha256-hEHEcB42mRn6pO5413wQbEWfJNBbiOSUuy9PGjP5EYw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
|
||||
sed -i '/\(chown\|chmod\)/d' GNUmakefile
|
||||
'';
|
||||
|
||||
buildInputs = [ bison pam ];
|
||||
nativeBuildInputs = [ bison ];
|
||||
buildInputs = [ pam ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Executes the given command as another user";
|
||||
|
||||
@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gpg-tui";
|
||||
version = "0.8.3";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "gpg-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lqV09FEZAw1ir2cJr8ABhbgSoZoWnxhbxyA1HAufLQA=";
|
||||
hash = "sha256-iIMpAAIw6djLNP9lnrHV7D198VcHspQP4OHcr2LNKOA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RMF4/WJRcpHuXKMvDYAGaJxUazcpkQCpv//u5XOd9Dg=";
|
||||
cargoHash = "sha256-xrv1tFzPReHDA+gr/RPCvSM7Sa7v8OKAEY+fSUjPT50=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gpgme # for gpgme-config
|
||||
@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Terminal user interface for GnuPG";
|
||||
homepage = "https://github.com/orhun/gpg-tui";
|
||||
changelog = "https://github.com/orhun/gpg-tui/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
||||
@ -2348,6 +2348,8 @@ in {
|
||||
|
||||
django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };
|
||||
|
||||
django-model-utils = callPackage ../development/python-modules/django-model-utils { };
|
||||
|
||||
django-modelcluster = callPackage ../development/python-modules/django_modelcluster { };
|
||||
|
||||
django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };
|
||||
@ -11021,6 +11023,8 @@ in {
|
||||
|
||||
webassets = callPackage ../development/python-modules/webassets { };
|
||||
|
||||
webauthn = callPackage ../development/python-modules/webauthn { };
|
||||
|
||||
web = callPackage ../development/python-modules/web { };
|
||||
|
||||
web-cache = callPackage ../development/python-modules/web-cache { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user