Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
96cbf9e196
|
|
@ -1680,6 +1680,13 @@
|
|||
<literal>true</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
A module for declarative configuration of openconnect VPN
|
||||
profiles was added under
|
||||
<literal>networking.openconnect</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>element-desktop</literal> package now has an
|
||||
|
|
|
|||
|
|
@ -581,6 +581,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`
|
||||
is set to `true`.
|
||||
|
||||
- A module for declarative configuration of openconnect VPN profiles was added under `networking.openconnect`.
|
||||
|
||||
- The `element-desktop` package now has an `useKeytar` option (defaults to `true`),
|
||||
which allows disabling `keytar` and in turn `libsecret` usage
|
||||
(which binds to native credential managers / keychain libraries).
|
||||
|
|
|
|||
|
|
@ -853,6 +853,7 @@
|
|||
./services/networking/ofono.nix
|
||||
./services/networking/oidentd.nix
|
||||
./services/networking/onedrive.nix
|
||||
./services/networking/openconnect.nix
|
||||
./services/networking/openvpn.nix
|
||||
./services/networking/ostinato.nix
|
||||
./services/networking/owamp.nix
|
||||
|
|
|
|||
137
nixos/modules/services/networking/openconnect.nix
Normal file
137
nixos/modules/services/networking/openconnect.nix
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
{ config, lib, options, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.networking.openconnect;
|
||||
openconnect = cfg.package;
|
||||
pkcs11 = types.strMatching "pkcs11:.+" // {
|
||||
name = "pkcs11";
|
||||
description = "PKCS#11 URI";
|
||||
};
|
||||
interfaceOptions = {
|
||||
options = {
|
||||
gateway = mkOption {
|
||||
description = "Gateway server to connect to.";
|
||||
example = "gateway.example.com";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
protocol = mkOption {
|
||||
description = "Protocol to use.";
|
||||
example = "anyconnect";
|
||||
type =
|
||||
types.enum [ "anyconnect" "array" "nc" "pulse" "gp" "f5" "fortinet" ];
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
description = "Username to authenticate with.";
|
||||
example = "example-user";
|
||||
type = types.nullOr types.str;
|
||||
};
|
||||
|
||||
# Note: It does not make sense to provide a way to declaratively
|
||||
# set an authentication cookie, because they have to be requested
|
||||
# for every new connection and would only work once.
|
||||
passwordFile = mkOption {
|
||||
description = ''
|
||||
File containing the password to authenticate with. This
|
||||
is passed to <code>openconnect</code> via the
|
||||
<code>--passwd-on-stdin</code> option.
|
||||
'';
|
||||
default = null;
|
||||
example = "/var/lib/secrets/openconnect-passwd";
|
||||
type = types.nullOr types.path;
|
||||
};
|
||||
|
||||
certificate = mkOption {
|
||||
description = "Certificate to authenticate with.";
|
||||
default = null;
|
||||
example = "/var/lib/secrets/openconnect_certificate.pem";
|
||||
type = with types; nullOr (either path pkcs11);
|
||||
};
|
||||
|
||||
privateKey = mkOption {
|
||||
description = "Private key to authenticate with.";
|
||||
example = "/var/lib/secrets/openconnect_private_key.pem";
|
||||
default = null;
|
||||
type = with types; nullOr (either path pkcs11);
|
||||
};
|
||||
|
||||
extraOptions = mkOption {
|
||||
description = ''
|
||||
Extra config to be appended to the interface config. It should
|
||||
contain long-format options as would be accepted on the command
|
||||
line by <code>openconnect</code>
|
||||
(see https://www.infradead.org/openconnect/manual.html).
|
||||
Non-key-value options like <code>deflate</code> can be used by
|
||||
declaring them as booleans, i. e. <code>deflate = true;</code>.
|
||||
'';
|
||||
default = { };
|
||||
example = {
|
||||
compression = "stateless";
|
||||
|
||||
no-http-keepalive = true;
|
||||
no-dtls = true;
|
||||
};
|
||||
type = with types; attrsOf (either str bool);
|
||||
};
|
||||
};
|
||||
};
|
||||
generateExtraConfig = extra_cfg:
|
||||
strings.concatStringsSep "\n" (attrsets.mapAttrsToList
|
||||
(name: value: if (value == true) then name else "${name}=${value}")
|
||||
(attrsets.filterAttrs (_: value: value != false) extra_cfg));
|
||||
generateConfig = name: icfg:
|
||||
pkgs.writeText "config" ''
|
||||
interface=${name}
|
||||
${optionalString (icfg.user != null) "user=${icfg.user}"}
|
||||
${optionalString (icfg.passwordFile != null) "passwd-on-stdin"}
|
||||
${optionalString (icfg.certificate != null)
|
||||
"certificate=${icfg.certificate}"}
|
||||
${optionalString (icfg.privateKey != null) "sslkey=${icfg.privateKey}"}
|
||||
|
||||
${generateExtraConfig icfg.extraOptions}
|
||||
'';
|
||||
generateUnit = name: icfg: {
|
||||
description = "OpenConnect Interface - ${name}";
|
||||
requires = [ "network-online.target" ];
|
||||
after = [ "network.target" "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${openconnect}/bin/openconnect --config=${
|
||||
generateConfig name icfg
|
||||
} ${icfg.gateway}";
|
||||
StandardInput = "file:${icfg.passwordFile}";
|
||||
|
||||
ProtectHome = true;
|
||||
};
|
||||
};
|
||||
in {
|
||||
options.networking.openconnect = {
|
||||
package = mkPackageOption pkgs "openconnect" { };
|
||||
|
||||
interfaces = mkOption {
|
||||
description = "OpenConnect interfaces.";
|
||||
default = { };
|
||||
example = {
|
||||
openconnect0 = {
|
||||
gateway = "gateway.example.com";
|
||||
protocol = "anyconnect";
|
||||
user = "example-user";
|
||||
passwordFile = "/var/lib/secrets/openconnect-passwd";
|
||||
};
|
||||
};
|
||||
type = with types; attrsOf (submodule interfaceOptions);
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
systemd.services = mapAttrs' (name: value: {
|
||||
name = "openconnect-${name}";
|
||||
value = generateUnit name value;
|
||||
}) cfg.interfaces;
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ alyaeanyx ];
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "JMusicBot";
|
||||
version = "0.3.6";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar";
|
||||
sha256 = "sha256-Hc3dsOADC+jVZScY19OYDkHimntMjdw/BoB3EUS/d0k=";
|
||||
sha256 = "sha256-wzmrh9moY6oo3RqOy9Zl1X70BZlvbJkQmz8BaBIFtIM=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-26";
|
||||
version = "7.1.0-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
hash = "sha256-q1CL64cfyb5fN9aVYJfls+v0XRFd4jH+B8n+UJqPE1I=";
|
||||
hash = "sha256-46fJMOIGnK5aNIcG7+8mJdZDcSFyFmhmkLcuVlnupSU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
@ -64,9 +64,7 @@ stdenv.mkDerivation rec {
|
|||
++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ])
|
||||
++ lib.optional (librsvg != null) "--with-rsvg"
|
||||
++ lib.optional (liblqr1 != null) "--with-lqr"
|
||||
# libjxl is broken on aarch64 (see meta.broken in libjxl) for now,
|
||||
# let's disable it for now to unbreak the imagemagick build.
|
||||
++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl"
|
||||
++ lib.optional (libjxl != null ) "--with-jxl"
|
||||
++ lib.optionals (ghostscript != null)
|
||||
[
|
||||
"--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
|
||||
|
|
@ -92,11 +90,8 @@ stdenv.mkDerivation rec {
|
|||
libxml2
|
||||
libheif
|
||||
djvulibre
|
||||
libjxl
|
||||
]
|
||||
# libjxl is broken on aarch64 (see meta.broken in libjxl) for now,
|
||||
# let's disable it for now to unbreak the imagemagick build.
|
||||
++ lib.optionals (!stdenv.isAarch64)
|
||||
[ libjxl ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isMinGW)
|
||||
[ openexr librsvg openjpeg ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ for entry in feed.entries:
|
|||
else:
|
||||
print('chromium: TODO -> ' + version + '\n')
|
||||
print(url)
|
||||
if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0):
|
||||
zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content)
|
||||
if zero_days:
|
||||
if fixes := re.search(r'This update includes .+ security fixes\.', content):
|
||||
fixes = fixes.group(0)
|
||||
if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content):
|
||||
fixes += " " + zero_days.group(0)
|
||||
print('\n' + '\n'.join(textwrap.wrap(fixes, width=72)))
|
||||
if cve_list := re.findall(r'CVE-[^: ]+', content):
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "101.0.4951.15",
|
||||
"sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y",
|
||||
"sha256bin64": "0z2rx7mw9wg5ly8wmxkflk8f9gifq4cxqvi224v9dr11qqj8gwm2",
|
||||
"version": "101.0.4951.26",
|
||||
"sha256": "1wpdi5l0bic0z9ydvx5vj35z6fh21b3n8dsxyvcbm0rq4fca5zcg",
|
||||
"sha256bin64": "13mx2jxq5pjzp6dxvnzkfs83krhvpbw0pim7z4c7hhyphjc4fhzr",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-03-14",
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kdeltachat";
|
||||
version = "unstable-2022-01-02";
|
||||
version = "unstable-2022-03-20";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~link2xt";
|
||||
repo = "kdeltachat";
|
||||
rev = "ec545c8208c870c44312558f91c79e6ffce4444e";
|
||||
hash = "sha256-s/dJ2ahdUK7ODKsna+tl81e+VQLkCAELb/iEXf9WlIM=";
|
||||
rev = "8cce6d20b49e917929521a13caed30e81037c868";
|
||||
hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
109
pkgs/applications/science/engineering/brmodelo/default.nix
Normal file
109
pkgs/applications/science/engineering/brmodelo/default.nix
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, openjdk8
|
||||
, ant
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brmodelo";
|
||||
version = "3.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chcandido";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09qrhqhv264x8phnf3pnb0cwq75l7xdsj9xkwlvhry81nxz0d5v0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant makeWrapper copyDesktopItems ];
|
||||
|
||||
buildInputs = [ openjdk8 ];
|
||||
|
||||
patches = [
|
||||
# Fixes for building with Ant.
|
||||
# https://github.com/chcandido/brModelo/pull/22
|
||||
(fetchpatch {
|
||||
name = "fix-self-closing-element-not-allowed.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/0d712b74fd5d29d67be07480ed196da28a77893b.patch";
|
||||
sha256 = "sha256-yy03arE6xetotzyvpToi9o9crg3KnMRn1J70jDUvSXE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-tag-closing.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/e8530ff75f024cf6effe0408ed69985405e9709c.patch";
|
||||
sha256 = "sha256-MNuh/ORbaAkB5qDSlA/nPrXN+tqzz4oOglVyEtSangI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-bad-use-greater-than.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/498a6ef8129daff5a472b318f93c8f7f2897fc7f.patch";
|
||||
sha256 = "sha256-MmAwYUmx38DGRsiSxCWCObtpqxk0ykUQiDSC76bCpFc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-param-errors.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/8a508aaba0bcffe13a3f95cff495230beea36bc4.patch";
|
||||
sha256 = "sha256-qME9gZChSMzu1vs9HaosD+snb+jlOrQLY97meNoA8oU=";
|
||||
})
|
||||
|
||||
# Add SVG icons.
|
||||
# https://github.com/chcandido/brModelo/pull/23
|
||||
(fetchpatch {
|
||||
name = "add-brmodelo-logo-icons-svg.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/f260b82b664fad3325bbf3ebd7a15488d496946b.patch";
|
||||
sha256 = "sha256-UhgcWxsHkNFS1GgaRnmlZohjDR8JwHof2cIb3SBetYs=";
|
||||
})
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
ant
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "brmodelo";
|
||||
desktopName = "brModelo";
|
||||
genericName = "Entity-relationship diagramming tool";
|
||||
exec = "brmodelo";
|
||||
icon = "brmodelo";
|
||||
comment = meta.description;
|
||||
categories = [ "Development" "Education" "Database" "2DGraphics" "ComputerScience" "DataVisualization" "Engineering" "Java" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/bin $out/share/doc/${pname} $out/share/java
|
||||
|
||||
cp -rv ./dist/javadoc $out/share/doc/${pname}/
|
||||
|
||||
install -Dm755 ./dist/brModelo.jar -t $out/share/java/
|
||||
# NOTE: The standard Java GUI toolkit has a
|
||||
# hard-coded list of "non-reparenting" window managers,
|
||||
# which cause issues while running brModelo
|
||||
# in WMs that are not in that list (e.g. XMonad).
|
||||
# Solution/Workaround: set the environment variable
|
||||
# _JAVA_AWT_WM_NONREPARENTING=1.
|
||||
makeWrapper ${openjdk8}/bin/java $out/bin/brmodelo \
|
||||
--prefix _JAVA_AWT_WM_NONREPARENTING : 1 \
|
||||
--prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \
|
||||
--add-flags "-jar $out/share/java/brModelo.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for size in 16 24 32 48 64 128 256; do
|
||||
install -Dm644 ./src/imagens/icone_"$size"x"$size".svg \
|
||||
$out/share/icons/hicolor/"$size"x"$size"/apps/brmodelo.svg
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Entity-relationship diagram tool for making conceptual and logical database models";
|
||||
homepage = "https://github.com/chcandido/brModelo";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ yuu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,14 +3,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calc";
|
||||
version = "2.14.0.14";
|
||||
version = "2.14.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
|
||||
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
|
||||
];
|
||||
sha256 = "sha256-93J4NaED2XEsVxlY6STpwlS9FI8I60NIAZvDT45xxV0=";
|
||||
sha256 = "sha256-C1YWZS4x7htUWF3MhRLQIYChL4rdwJxASdPQjttUr0A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
23
pkgs/applications/virtualization/kvmtool/default.nix
Normal file
23
pkgs/applications/virtualization/kvmtool/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchgit, lib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "kvmtool";
|
||||
version = "unstable-2022-04-04";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git";
|
||||
rev = "5657dd3e48b41bc6db38fa657994bc0e030fd31f";
|
||||
sha256 = "1y1j44lk9957f2dmyrscbxl4zncp4ibvvcdj6bwylb8jsvmd5fs2";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight tool for hosting KVM guests";
|
||||
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -16,21 +16,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaru";
|
||||
version = "22.04.3.1";
|
||||
version = "unstable-2022-04-07"; # 22.04.3.1 is broken
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu";
|
||||
repo = "yaru";
|
||||
rev = version;
|
||||
sha256 = "sha256-nNI6Nm3ZpIJRTbIbe/P9cKofcthb6qWKjn81/ZpPo2g=";
|
||||
rev = "9bdbf66bf3718c6595c7a15ef4698ba471a36526";
|
||||
sha256 = "02f6m0jxnsczw3y7v7bqdihxa33sx2z93yn3j8w4z9r9fv2pn06b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
|
||||
|
||||
buildInputs = [ gtk3 gnome.gnome-themes-extra ];
|
||||
|
||||
propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ];
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "lasso";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz";
|
||||
sha256 = "138x8pmj4k1pbah32z14rd8ylyx4lgz70s93m39vd17f8sjz50lj";
|
||||
sha256 = "sha256-/8vVhR2YWGx+HK9DutZhZCEaO2HRK/hgoFmESP+fKzg=";
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ final: prev: let
|
|||
rec {
|
||||
fileVersion = "10.1";
|
||||
fullVersion = "7.6.5.32";
|
||||
hash = "sha256-YAJn8squ0v1Y6yFLpmnY6jXzlqfRm5SCLms2+fcIjCA=";
|
||||
hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM=";
|
||||
url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz";
|
||||
supportedCudaVersions = [ "10.1" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mInpqQsH6GUyakA+74c3xvGRQvIFJ1rBa4bqWlJ9ea0=";
|
||||
hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "astroquery";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "20002f84b61fb11ceeae408a4cd23b379490e174054ec777f946df8a3f06be1b";
|
||||
sha256 = "sha256-MHylVMtzSgypoi+G9e/+fkE6+ROuZeFXiXLYR7H+E+4=";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@ let
|
|||
inherit (cudaPackages) cudatoolkit cudnn cutensor nccl;
|
||||
in buildPythonPackage rec {
|
||||
pname = "cupy";
|
||||
version = "10.2.0";
|
||||
version = "10.3.1";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-5ovvA76QGOsOnVztMfDgLerks5nJrKR08rLc+ArmWA8=";
|
||||
sha256 = "sha256-c8BOKI1AWU+zN8lhliRus55PUAgvFm+TlxKToYn7jWc=";
|
||||
};
|
||||
|
||||
# See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphql-subscription-manager";
|
||||
version = "0.5.6";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "PyGraphqlWebsocketManager";
|
||||
rev = version;
|
||||
hash = "sha256-nieKl25yDc3FHnMqwn6FNzWKd8sas3rTlBonYbJc1tg=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5+KHPm/JuazObvuC2ip6hwQxvjJH/lDgukJMH49cuwg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchPypi
|
||||
, ipykernel
|
||||
, ipywidgets
|
||||
, matplotlib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -16,7 +17,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
|
||||
propagatedBuildInputs = [ ipykernel ipywidgets ];
|
||||
propagatedBuildInputs = [ ipykernel ipywidgets matplotlib ];
|
||||
|
||||
# There are no unit tests in repository
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "jsbeautifier";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PskybkfTilQ5W97/h2lWakcnWOcLnhG6fMVs/spqm/Y=";
|
||||
hash = "sha256-1tV2J8+ezYzZAbnsetSogSeo3t6RAXf6SyGedtAvm9c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.17.3";
|
||||
version = "0.17.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1wSVmH7woTR2ebHS5FfWHLqwbY04rxtPx/0A/HY+N8s=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Znhtw4VQ7r26rluLa5I+b3TMJ+Wyog7uaUReHORHOgU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyathena";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyAthena";
|
||||
inherit version;
|
||||
sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA=";
|
||||
sha256 = "sha256-vjoK6lEitvd5vqSEE/ael8q00O05lquKIviFK/bPlVQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynina";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyNINA";
|
||||
inherit version;
|
||||
sha256 = "sha256-7sceYmzOmXJMKaIdGmXMuCAum0aJeVTxx1w/jZy5Eig=";
|
||||
sha256 = "sha256-U8/SzkkZJLRBpTQx8NRpFWUlckn4Jr0n9cHR4/plyb0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, unzip, openjdk11, gradle }:
|
||||
{ lib, stdenv, fetchzip, openjdk11, gradle, makeWrapper, maven }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin-language-server";
|
||||
version = "1.3.0";
|
||||
src = fetchurl {
|
||||
src = fetchzip {
|
||||
url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip";
|
||||
sha256 = "sha256-yyqI+87vtggSeAfb3OEftalknqbTDEQ5gTJwB/EMIlY=";
|
||||
hash = "sha256-nqrZoSntomNLUMTni/yoiVhDOJFSFmZeGze8IJhITu0=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
@ -17,14 +17,19 @@ stdenv.mkDerivation rec {
|
|||
cp -r bin/* $out/bin
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ unzip gradle ];
|
||||
nativeBuildInputs = [ gradle makeWrapper ];
|
||||
buildInputs = [ openjdk11 gradle ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk11} --prefix PATH : ${lib.strings.makeBinPath [ openjdk11 maven ] }
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "kotlin language server";
|
||||
longDescription = ''
|
||||
About Kotlin code completion, linting and more for any editor/IDE
|
||||
using the Language Server Protocol Topics'';
|
||||
maintainers = with lib.maintainers; [ vtuan10 ];
|
||||
homepage = "https://github.com/fwcd/kotlin-language-server";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -19,15 +19,24 @@ let
|
|||
genericName = "Jedi Academy";
|
||||
categories = [ "Game" ];
|
||||
};
|
||||
josp = makeDesktopItem rec {
|
||||
name = "josp";
|
||||
exec = name;
|
||||
icon = "OpenJK_Icon_128";
|
||||
comment = "Open Source Jedi Outcast game released by Raven Software";
|
||||
desktopName = "Jedi Outcast (Single Player)";
|
||||
genericName = "Jedi Outcast";
|
||||
categories = [ "Game" ];
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "OpenJK";
|
||||
version = "2020-07-03";
|
||||
version = "unstable-2022-01-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JACoders";
|
||||
repo = "OpenJK";
|
||||
rev = "0a336ce4dffe6505e3f754b59732402a1db95752";
|
||||
sha256 = "1xagbz42hi3ivs208mnay2dbgh90pmwwbar2p1yfhj3zl3cghcs8";
|
||||
rev = "235fb9e1a9c4537a603b2e54e444327d20d198a3";
|
||||
sha256 = "sha256-DqP6wnu5sE7lQJGEdsEPOc6FIaJjqxt5ANKZ5eiabC4=";
|
||||
};
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
|
@ -35,22 +44,39 @@ in stdenv.mkDerivation {
|
|||
nativeBuildInputs = [ makeWrapper cmake ];
|
||||
buildInputs = [ libjpeg zlib libpng libGL SDL2 ];
|
||||
|
||||
outputs = [ "out" "openjo" "openja" ];
|
||||
|
||||
# move from $out/JediAcademy to $out/opt/JediAcademy
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$out/opt")
|
||||
'';
|
||||
cmakeFlags = ["-DBuildJK2SPEngine:BOOL=ON"
|
||||
"-DBuildJK2SPGame:BOOL=ON"
|
||||
"-DBuildJK2SPRdVanilla:BOOL=ON"];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/128x128/apps
|
||||
prefix=$out/opt/JediAcademy
|
||||
mkdir -p $out/bin $openja/bin $openjo/bin
|
||||
mkdir -p $openja/share/applications $openjo/share/applications
|
||||
mkdir -p $openja/share/icons/hicolor/128x128/apps $openjo/share/icons/hicolor/128x128/apps
|
||||
mkdir -p $openja/opt $openjo/opt
|
||||
mv $out/opt/JediAcademy $openja/opt/
|
||||
mv $out/opt/JediOutcast $openjo/opt/
|
||||
jaPrefix=$openja/opt/JediAcademy
|
||||
joPrefix=$openjo/opt/JediOutcast
|
||||
|
||||
makeWrapper $prefix/openjk.* $out/bin/jamp --run "cd $prefix"
|
||||
makeWrapper $prefix/openjk_sp.* $out/bin/jasp --run "cd $prefix"
|
||||
makeWrapper $prefix/openjkded.* $out/bin/openjkded --run "cd $prefix"
|
||||
makeWrapper $jaPrefix/openjk.* $openja/bin/jamp --run "cd $jaPrefix"
|
||||
makeWrapper $jaPrefix/openjk_sp.* $openja/bin/jasp --run "cd $jaPrefix"
|
||||
makeWrapper $jaPrefix/openjkded.* $openja/bin/openjkded --run "cd $jaPrefix"
|
||||
makeWrapper $joPrefix/openjo_sp.* $openjo/bin/josp --run "cd $joPrefix"
|
||||
|
||||
cp $src/shared/icons/OpenJK_Icon_128.png $out/share/icons/hicolor/128x128/apps
|
||||
ln -s ${jamp}/share/applications/* $out/share/applications
|
||||
ln -s ${jasp}/share/applications/* $out/share/applications
|
||||
cp $src/shared/icons/OpenJK_Icon_128.png $openjo/share/icons/hicolor/128x128/apps
|
||||
cp $src/shared/icons/OpenJK_Icon_128.png $openja/share/icons/hicolor/128x128/apps
|
||||
ln -s ${jamp}/share/applications/* $openja/share/applications
|
||||
ln -s ${jasp}/share/applications/* $openja/share/applications
|
||||
ln -s ${josp}/share/applications/* $openjo/share/applications
|
||||
ln -s $openja/bin/* $out/bin
|
||||
ln -s $openjo/bin/* $out/bin
|
||||
rm -rf $out/opt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -58,6 +84,6 @@ in stdenv.mkDerivation {
|
|||
homepage = "https://github.com/JACoders/OpenJK";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ tgunnoe ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.274";
|
||||
version = "4.14.275";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1bbz1w5l7im7dspq6g6iy5vahsxcaa1b2ykrw49m3pw8rf7m6hib";
|
||||
sha256 = "1yaq5qhl694ygx17x998syg79yx72l3n9vzfkyf0g3idzdh9j2hh";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.109";
|
||||
version = "5.10.110";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1p0k46isy2wzzms801lrnb59f1nb9mhywjj7fnkrwrj9nbn25yqq";
|
||||
sha256 = "14sn906f1bd87ngq1g2hx458v42d4nlzr36ba4alhcsl6836mvyv";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.32";
|
||||
version = "5.15.33";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -15,6 +15,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "11nz2w6hgwy6va6sxf4ic1s4kv24zbpssgjxsq6n321h4bxcsqql";
|
||||
sha256 = "1i590npi00w5d1znmamkm3sb293k5k4xd37miwnvz7hg17k1f2n3";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.16.18";
|
||||
version = "5.16.19";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "096f80m2czj8khvil7s037pqdf1s6pklqn5d9419jqkz7v70piry";
|
||||
sha256 = "0zlvsnbmcx4l8a5cqciwaabm1267q5zn4ah3gfhxi0jvigx2qvfs";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.17.1";
|
||||
version = "5.17.2";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "092cx18va108lb27kxx2b00ma3l9g22nmkk81034apx26bacbmbw";
|
||||
sha256 = "168b7zzw72k6hxbw0q402vvfir79qki9bjvxxvfi7s6g6y20z8id";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.106-rt64"; # updated by ./update-rt.sh
|
||||
version = "5.10.109-rt65"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -18,14 +18,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6";
|
||||
sha256 = "1p0k46isy2wzzms801lrnb59f1nb9mhywjj7fnkrwrj9nbn25yqq";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0z5gyi1vyjyd05vyccmk9yfgvm5v1lc8vbfywahx495xzpp9i8xb";
|
||||
sha256 = "0w7bs5kmwvbyfy5js218ys42s8i51m8v0mbkfhiynlpm3iph357q";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.4.182-rt71"; # updated by ./update-rt.sh
|
||||
version = "5.4.182-rt72"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -21,7 +21,7 @@ in buildLinux (args // {
|
|||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1lxj63v37bhdgynr8ffyd5g8vp5a79dnzi6fng7jsjapfriywzqh";
|
||||
sha256 = "175ls411yr6c8gvmpfpyl00l0saaz9bdshjdf6ybxbpi9fmamypk";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
# NB: This is needed for the postBuild step
|
||||
nativeBuildInputs = [ (python2.withPackages ( p: with p; [ cffi ] )) ];
|
||||
|
||||
buildInputs = [ (python2.withPackages (p: with p; [ cffi pyserial greenlet jinja2 ])) ];
|
||||
buildInputs = [ (python2.withPackages (p: with p; [ cffi pyserial greenlet jinja2 numpy ])) ];
|
||||
|
||||
# we need to run this to prebuild the chelper.
|
||||
postBuild = "python2 ./chelper/__init__.py";
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.23.0";
|
||||
version = "2.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RGl6Fgm9FVaZQMWHl93RwHvrScz69VgbIyDBqMh3PVo=";
|
||||
sha256 = "sha256-TZT37W4A09t7okPFfcOJOQEAKAchH1FJ+LRftdHZQsM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chamber";
|
||||
version = "2.10.8";
|
||||
version = "2.10.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "segmentio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rU9xywEa9E1VG1CaRGHzjXTL+0erlgP1thDTYBz+oLM=";
|
||||
sha256 = "sha256-rOOpwLoEiTS41VIPvqoq8yGP4GOOCOJNFfLLxt9mfvM=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://pmt.sourceforge.net/pngcrush";
|
||||
description = "Verifies the integrity of PNG, JNG and MNG files";
|
||||
license = licenses.free;
|
||||
platforms = with platforms; [ unix ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ starcraft66 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ buildGoModule, fetchFromGitHub, lib, stdenv }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goawk";
|
||||
version = "1.16.0";
|
||||
|
|
@ -12,8 +13,18 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
|
||||
# checks do not pass at the moment
|
||||
doCheck = false;
|
||||
postPatch = ''
|
||||
substituteInPlace goawk_test.go \
|
||||
--replace "TestCommandLine" "SkipCommandLine" \
|
||||
--replace "TestDevStdout" "SkipDevStdout" \
|
||||
--replace "TestFILENAME" "SkipFILENAME" \
|
||||
--replace "TestWildcards" "SkipWildcards"
|
||||
|
||||
substituteInPlace interp/interp_test.go \
|
||||
--replace "TestShellCommand" "SkipShellCommand"
|
||||
'';
|
||||
|
||||
doCheck = (stdenv.system != "aarch64-darwin");
|
||||
|
||||
meta = with lib; {
|
||||
description = "A POSIX-compliant AWK interpreter written in Go";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,21 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, nix-update-script, nixosTests }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "rootlesskit";
|
||||
version = "0.11.1";
|
||||
goPackagePath = "github.com/rootless-containers/rootlesskit";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rootless-containers";
|
||||
repo = "rootlesskit";
|
||||
rev = "v${version}";
|
||||
sha256 = "15k0503077ang9ywvmhpr1l7ax0v3wla0x8n6lqpmd71w0j2zm5r";
|
||||
hash = "sha256-Tml6zTc9l3O8qB+NSKlClWl5lj1rkiDHwI5exxBL83A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CpDPa1LAinvXCnVYbn9ZXuEjyHHlDU4bzZ2R+ctoCzQ=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { attrPath = pname; };
|
||||
tests = nixosTests.docker-rootless;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wl-mirror";
|
||||
version = "0.9.2";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ferdi265";
|
||||
repo = "wl-mirror";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W/8DApyd7KtrOrP7Qj6oPKXxLrVzHDuIMOdg+k5ngr4=";
|
||||
hash = "sha256-ygzSLbzn4P/BdYbqUDduUGwSbRHeU/OBYOX2uznVy1g=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -9060,11 +9060,7 @@ with pkgs;
|
|||
|
||||
pm2 = nodePackages.pm2;
|
||||
|
||||
pngcheck = callPackage ../tools/graphics/pngcheck {
|
||||
zlib = zlib.override {
|
||||
static = true;
|
||||
};
|
||||
};
|
||||
pngcheck = callPackage ../tools/graphics/pngcheck { };
|
||||
|
||||
pngcrush = callPackage ../tools/graphics/pngcrush { };
|
||||
|
||||
|
|
@ -14557,6 +14553,12 @@ with pkgs;
|
|||
# FHS sys dirs presumably only have stuff for the build platform
|
||||
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
|
||||
};
|
||||
binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils {
|
||||
autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook;
|
||||
# FHS sys dirs presumably only have stuff for the build platform
|
||||
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
|
||||
withAllTargets = true;
|
||||
};
|
||||
binutils = wrapBintoolsWith {
|
||||
bintools = binutils-unwrapped;
|
||||
};
|
||||
|
|
@ -25596,6 +25598,8 @@ with pkgs;
|
|||
|
||||
kerbrute = callPackage ../tools/security/kerbrute { };
|
||||
|
||||
kvmtool = callPackage ../applications/virtualization/kvmtool { };
|
||||
|
||||
exrdisplay = callPackage ../applications/graphics/exrdisplay { };
|
||||
|
||||
exrtools = callPackage ../applications/graphics/exrtools { };
|
||||
|
|
@ -32816,6 +32820,10 @@ with pkgs;
|
|||
|
||||
lingeling = callPackage ../applications/science/logic/lingeling {};
|
||||
|
||||
### SCIENCE / ENGINEERING
|
||||
|
||||
brmodelo = callPackage ../applications/science/engineering/brmodelo { };
|
||||
|
||||
### SCIENCE / ELECTRONICS
|
||||
|
||||
adms = callPackage ../applications/science/electronics/adms { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue