Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-01-05 00:02:27 +00:00 committed by GitHub
commit 1e290d634f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
72 changed files with 6641 additions and 487 deletions

View File

@ -7525,6 +7525,16 @@
githubId = 362833;
name = "Hongchang Wu";
};
honnip = {
name = "Jung seungwoo";
email = "me@honnip.page";
matrix = "@honnip:matrix.org";
github = "honnip";
githubId = 108175486;
keys = [{
fingerprint = "E4DD 51F7 FA3F DCF1 BAF6 A72C 576E 43EF 8482 E415";
}];
};
hoppla20 = {
email = "privat@vincentcui.de";
github = "hoppla20";

View File

@ -19,6 +19,14 @@ in
Enabled Fcitx5 addons.
'';
};
waylandFrontend = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Use the Wayland input method frontend.
See [Using Fcitx 5 on Wayland](https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland).
'';
};
quickPhrase = mkOption {
type = with types; attrsOf str;
default = { };
@ -118,10 +126,11 @@ in
];
environment.variables = {
GTK_IM_MODULE = "fcitx";
QT_IM_MODULE = "fcitx";
XMODIFIERS = "@im=fcitx";
QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
} // lib.optionalAttrs (!cfg.waylandFrontend) {
GTK_IM_MODULE = "fcitx";
QT_IM_MODULE = "fcitx";
} // lib.optionalAttrs cfg.ignoreUserConfig {
SKIP_FCITX_USER_PATH = "1";
};

View File

@ -11,6 +11,7 @@
let
cfg = config.boot.bootspec;
children = lib.mapAttrs (childName: childConfig: childConfig.configuration.system.build.toplevel) config.specialisation;
hasAtLeastOneInitrdSecret = lib.length (lib.attrNames config.boot.initrd.secrets) > 0;
schemas = {
v1 = rec {
filename = "boot.json";
@ -27,6 +28,7 @@ let
label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})";
} // lib.optionalAttrs config.boot.initrd.enable {
initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
} // lib.optionalAttrs hasAtLeastOneInitrdSecret {
initrdSecrets = "${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets";
};
}));

View File

@ -20,13 +20,13 @@ from dataclasses import dataclass
class BootSpec:
init: str
initrd: str
initrdSecrets: str
kernel: str
kernelParams: List[str]
label: str
system: str
toplevel: str
specialisations: Dict[str, "BootSpec"]
initrdSecrets: str | None = None
@ -131,9 +131,8 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None
specialisation=" (%s)" % specialisation if specialisation else "")
try:
subprocess.check_call([bootspec.initrdSecrets, "@efiSysMountPoint@%s" % (initrd)])
except FileNotFoundError:
pass
if bootspec.initrdSecrets is not None:
subprocess.check_call([bootspec.initrdSecrets, "@efiSysMountPoint@%s" % (initrd)])
except subprocess.CalledProcessError:
if current:
print("failed to create initrd secrets!", file=sys.stderr)

View File

@ -112,10 +112,39 @@ in
bootspec = json.loads(machine.succeed("jq -r '.\"org.nixos.bootspec.v1\"' /run/current-system/boot.json"))
assert all(key in bootspec for key in ('initrd', 'initrdSecrets')), "Bootspec should contain initrd or initrdSecrets field when initrd is enabled"
assert 'initrd' in bootspec, "Bootspec should contain initrd field when initrd is enabled"
assert 'initrdSecrets' not in bootspec, "Bootspec should not contain initrdSecrets when there's no initrdSecrets"
'';
};
# Check that initrd secrets create corresponding entries in bootspec.
initrd-secrets = makeTest {
name = "bootspec-with-initrd-secrets";
meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
nodes.machine = {
imports = [ standard ];
environment.systemPackages = [ pkgs.jq ];
# It's probably the case, but we want to make it explicit here.
boot.initrd.enable = true;
boot.initrd.secrets."/some/example" = pkgs.writeText "example-secret" "test";
};
testScript = ''
import json
machine.start()
machine.wait_for_unit("multi-user.target")
machine.succeed("test -e /run/current-system/boot.json")
bootspec = json.loads(machine.succeed("jq -r '.\"org.nixos.bootspec.v1\"' /run/current-system/boot.json"))
assert 'initrdSecrets' in bootspec, "Bootspec should contain an 'initrdSecrets' field given there's an initrd secret"
'';
};
# Check that specialisations create corresponding entries in bootspec.
specialisation = makeTest {
name = "bootspec-with-specialisation";

View File

@ -13,11 +13,11 @@
let
platform_major = "4";
platform_minor = "29";
platform_minor = "30";
year = "2023";
month = "09"; #release month
buildmonth = "09"; #sometimes differs from release month
timestamp = "${year}${buildmonth}031000";
month = "12"; #release month
buildmonth = "12"; #sometimes differs from release month
timestamp = "${year}${buildmonth}010110";
gtk = gtk3;
arch = if stdenv.hostPlatform.isx86_64 then
"x86_64"
@ -43,8 +43,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha256-r9ZDt1D7Wt0Gp2JvW4Qwkw0Rj8F4IhUiNpVgm8FDdbY=";
aarch64 = "sha256-fyIvDY9jQfLwwNL4iaLb80X2eWaYqkLqtMd09yOQGo4=";
x86_64 = "sha256-a5GqbghNlyvU/S36NcFSel1GRf/vZp01aaCxAswqyng=";
aarch64 = "sha256-w2bzolYBA4bf4kfcPza0LDLViKqXQkbZR07STN94nrY=";
}.${arch};
};
};
@ -58,8 +58,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-dsl-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha256-xdvEt26ovcT65Jy+ePEAHHMAyICBQwJser2uL9VrwrA=";
aarch64 = "sha256-GPgD29d81YFtHtqqb66io1BwbNuHTqVZYrY4Oh4MojQ=";
x86_64 = "sha256-U9CMwcDZP1ptnc+C7gTfTOcyppe7r6RtgPp65b3A7Qk=";
aarch64 = "sha256-wuh6IZtRPDNJAVcfukFjZfuOVJgfj2zI616YNDnRgWM=";
}.${arch};
};
};
@ -73,8 +73,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha256-eO+fnoN0jZCURwmy6M0Okb9U4R3z8u1gzfm2mGp+Chc=";
aarch64 = "sha256-gN0wu7QOyVslvWum9SIkptADtQoX47UPentEupJBnQ8=";
x86_64 = "sha256-h1d0LTBKBKcYxeLr0QEK7VG3q8cKeHQPaKzoPU6qlkI=";
aarch64 = "sha256-nCkNNmL924I8Q6wjAmik7d3K4T4j0/Biyr4d9Y0KfSg=";
}.${arch};
};
};
@ -88,8 +88,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha256-+0yzlB89v8KrhDfo5oqT0NKY/3hPk+Pkp2yGQ0silEg=";
aarch64 = "sha256-CvzDldzcmLzL7z9ZRxHQblmvkzza4wQYeDIZf6V6uXk=";
x86_64 = "sha256-FbcSbDFyjx2uG0T844cBwAdaBZc2k/c4aogsCVYI7+E=";
aarch64 = "sha256-COQipICwcM7+gbpiD/G31bsW+9NDz8wt+HyY6FFkKos=";
}.${arch};
};
};
@ -120,8 +120,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha256-Qp9yKSNWVPH8SX1D4PMfSv3XqiKAQCVXWFcSyQaMFmA=";
aarch64 = "sha256-cp8/BiewoNt4txhHmpiBTSXZ2sXXPu6zxuAYi24DF9I=";
x86_64 = "sha256-3UfaIwUpgD+VWB7Ar5by78zldqmrlg9csINkre+m8i0=";
aarch64 = "sha256-5wIlnTItwEstUHitlVPIxY7ayvxV4yI/8ID8WQ3mnDI=";
}.${arch};
};
};
@ -135,8 +135,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha256-TX8LbbBxRGWJ7lmf3tfK+Eux54dSapCsP7OmLfDw4Do=";
aarch64 = "sha256-AltrVmCuSTAoRgVsw98oNiR1HPpbYovz3UNGRXQgiVs=";
x86_64 = "sha256-Cf2jrNjakRteGO/W18oneE9EDM3VLyi/lIafgffprUc=";
aarch64 = "sha256-j0i1k3fHQ/+P5y6aRKUZM8uBQJOLweDtkjneqlx/kuQ=";
}.${arch};
};
};
@ -150,8 +150,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha256-kMEeY27Q97+5/pbl3of93p43dMXE1NQmuESCsK5sK3g=";
aarch64 = "sha256-sf+l/BjJ1VAyrc94oJUKYEInG7wEivbYEhpEXLi4C+w=";
x86_64 = "sha256-pN+x63J8+GhGmfsdzLknJXWCnvhS8VeLizmyqWM8XUA=";
aarch64 = "sha256-QVW2nx5P6mkj4oJ1qHs5D2TZBuBuxayhiJHh0VgAghU=";
}.${arch};
};
};
@ -165,8 +165,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha256-K9+Up4nDXZCBKxzj2LX7F9ioPocHnxPdpHMQuc5oehs=";
aarch64 = "sha256-ibB3D+0UuX2c+Cbr0L5r8Rh6BfpmOyXNnSk13m2Q7Zk=";
x86_64 = "sha256-Qj9Omc3+HP3twF0evhkRKE8PH/i4+eGtnkfjUu9+lY4=";
aarch64 = "sha256-DqkwHyEbttFBA9HM3GdqxxZNjCiKf6gS7KNQYIUBAGE=";
}.${arch};
};
};
@ -180,8 +180,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
x86_64 = "sha256-J+8UbkDiG9F+mDBZwr4HVGJWqeSBGMsl3EIRtA7+fK0=";
aarch64 = "sha256-+oYY37fBjEi2GJCZVaCsUyWwAhsPPD6nAstUDGmywwo=";
x86_64 = "sha256-zhQU7hSF3KWJ0Q2TRzvGhL76Mxhhh/HS/wT/ahkFHXk=";
aarch64 = "sha256-XSqWx1V0XjtuYbZlRcJf7Xu1yL1VazT5Z/BcGkkXzb8=";
}.${arch};
};
};

View File

@ -255,12 +255,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
# find current version at https://github.com/eclipse-cdt/cdt/releases
version = "11.3.0";
version = "11.4.0";
src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
hash = "sha256-jmHiIohn8Ol0QhTCOVRStIAKmMzOPcQ5i5QNz6hKQ4M=";
hash = "sha256-39AoB5cKRQMFpRaOlrTEsyEKZYVqdTp1tMtlaDjjZ84=";
};
meta = with lib; {

View File

@ -2059,12 +2059,12 @@ final: prev:
codeium-vim = buildVimPlugin {
pname = "codeium.vim";
version = "2023-12-26";
version = "2024-01-03";
src = fetchFromGitHub {
owner = "Exafunction";
repo = "codeium.vim";
rev = "a31ff444697497438cd2569200ddb4af846cae65";
sha256 = "0bxyi5jhbjyjya98w6qm5nnvahbdpv9h1vmkr7h5mhn7i74nq2kh";
rev = "4063291e335e74e9ee2be04beb47d40b376312fa";
sha256 = "sha256-kRwkgDQq0x4JusuUww5X/lXoJF/gHeZ57FOndNGS4Go=";
};
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
};

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkg-config, yelp-tools
, intltool, itstool, makeWrapper, pkg-config, yelp-tools, qrencode
}:
stdenv.mkDerivation rec {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [
barcode gtk3 gtk-doc yelp-tools
gnome.gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool
itstool libxml2 librsvg libe-book libtool qrencode
];
preFixup = ''

View File

@ -1,21 +0,0 @@
diff -Naur calcoo-2.1.0-old/build.xml calcoo-2.1.0-new/build.xml
--- calcoo-2.1.0-old/build.xml 1969-12-31 21:00:01.000000000 -0300
+++ calcoo-2.1.0-new/build.xml 2022-04-16 15:41:59.763861191 -0300
@@ -16,7 +16,7 @@
<!-- Create the build directory structure used by compile -->
<mkdir dir="${build}"/>
<!-- Compile the java code from ${src} into ${build} -->
- <javac srcdir="${src}" destdir="${build}" includeantruntime="false"/>
+ <javac srcdir="${src}" destdir="${build}" includeantruntime="false" encoding="iso-8859-1"/>
</target>
<target name="copyresource" depends="compile">
@@ -31,7 +31,7 @@
<target name="testcompile">
<mkdir dir="${testbuild}"/>
<!-- Compile the java code from ${testsrc} into ${testbuild} -->
- <javac srcdir="${testsrc}" destdir="${testbuild}" includeantruntime="false">
+ <javac srcdir="${testsrc}" destdir="${testbuild}" includeantruntime="false" encoding="iso-8859-1">
<classpath>
<pathelement location="${junitpath}\junit.jar"/>
<pathelement location="${junitpath}\hamcrest-core.jar"/>

View File

@ -2,57 +2,55 @@
, stdenv
, fetchzip
, ant
, canonicalize-jars-hook
, jdk
, makeWrapper
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "calcoo";
version = "2.1.0";
src = fetchzip {
url = "mirror://sourceforge/project/calcoo/calcoo/${version}/${pname}-${version}.zip";
url = "mirror://sourceforge/calcoo/calcoo-${finalAttrs.version}.zip";
hash = "sha256-Bdavj7RaI5CkWiOJY+TPRIRfNelfW5qdl/74J1KZPI0=";
};
patches = [
# Sets javac encoding option on build.xml
./0001-javac-encoding.diff
];
nativeBuildInputs = [
ant
canonicalize-jars-hook
jdk
makeWrapper
];
dontConfigure = true;
env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=iso-8859-1";
buildPhase = ''
runHook preBuild
ant
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/${pname}
mv dist/lib/calcoo.jar $out/share/${pname}
install -Dm644 dist/lib/calcoo.jar -t $out/share/calcoo
makeWrapper ${jdk}/bin/java $out/bin/calcoo \
--add-flags "-jar $out/share/${pname}/calcoo.jar"
--add-flags "-jar $out/share/calcoo/calcoo.jar"
runHook postInstall
'';
meta = with lib; {
homepage = "https://calcoo.sourceforge.net/";
meta = {
changelog = "https://calcoo.sourceforge.net/changelog.html";
description = "RPN and algebraic scientific calculator";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
homepage = "https://calcoo.sourceforge.net/";
license = lib.licenses.gpl2Plus;
mainProgram = "calcoo";
maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (jdk.meta) platforms;
};
}
})

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "calcure";
version = "2.8.2";
version = "3.0.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "anufrievroman";
repo = "calcure";
rev = version;
hash = "sha256-CWuyBjIhEYb3zOIXT0+pVs9fFahMi04yq2sJjDMwKTI=";
hash = "sha256-rs3TCZjMndeh2N7e+U62baLs+XqWK1Mk7KVnypSnWPg=";
};
nativeBuildInputs = [
@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
jdatetime
holidays
icalendar
ics
attrs
];

View File

@ -1,11 +1,11 @@
{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }:
stdenv.mkDerivation rec {
version = "5.5.2";
version = "5.5.3";
pname = "keystore-explorer";
src = fetchzip {
url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-${lib.replaceStrings ["."] [""] version}.zip";
sha256 = "sha256-mDi/TSYumCg2hAnMOI2QpdAOSlDMpdJPqzatFotAqUk=";
sha256 = "sha256-oShVfmien4HMpAfSa9rPr18wLu7RN8ZWEZEUtiBHyBs=";
};
# glib is necessary so file dialogs don't hang.

View File

@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "pairdrop";
version = "1.7.6";
version = "1.10.3";
src = fetchFromGitHub {
owner = "schlagmichdoch";
repo = "PairDrop";
rev = "v${version}";
hash = "sha256-AOFATOCLf2KigeqoUzIfNngyeDesNrThRzxFvqtsXBs=";
hash = "sha256-0trhkaxDWk5zlHN/Mtk/RNeeIeXyOg2QcnSO1kTsNqE=";
};
npmDepsHash = "sha256-3nKjmC5eizoV/mrKDBhsSlVQxEHyIsWR6KHFwZhBugI=";
npmDepsHash = "sha256-CjRTHH/2Hz5RZ83/4p//Q2L/CB48yRXSB08QxRox2bI=";
dontNpmBuild = true;

View File

@ -1,74 +0,0 @@
{ lib
, buildGoModule
, fetchFromGitHub
, git
, stdenv
, testers
, crc
, runtimeShell
, coreutils
}:
let
openShiftVersion = "4.12.5";
okdVersion = "4.12.0-0.okd-2023-02-18-033438";
podmanVersion = "4.3.1";
writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
gitHash = "sha256-zk/26cG2Rt3jpbhKgprtq2vx7pIQVi7cPUA90uoQa80=";
in
buildGoModule rec {
version = "2.15.0";
pname = "crc";
gitCommit = "72256c3cb00ac01519b26658dd5cfb0dd09b37a1";
modRoot = "cmd/crc";
src = fetchFromGitHub {
owner = "crc-org";
repo = "crc";
rev = "v${version}";
hash = gitHash;
};
vendorHash = null;
nativeBuildInputs = [ git ];
postPatch = ''
substituteInPlace pkg/crc/oc/oc_linux_test.go \
--replace "/bin/echo" "${coreutils}/bin/echo"
substituteInPlace Makefile \
--replace "/bin/bash" "${runtimeShell}"
'';
tags = [ "containers_image_openpgp" ];
ldflags = [
"-X github.com/crc-org/crc/pkg/crc/version.crcVersion=${version}"
"-X github.com/crc-org/crc/pkg/crc/version.ocpVersion=${openShiftVersion}"
"-X github.com/crc-org/crc/pkg/crc/version.okdVersion=${okdVersion}"
"-X github.com/crc-org/crc/pkg/crc/version.podmanVersion=${podmanVersion}"
"-X github.com/crc-org/crc/pkg/crc/version.commitSha=${builtins.substring 0 8 gitCommit}"
"-X github.com/crc-org/crc/pkg/crc/segment.WriteKey=${writeKey}"
];
preBuild = ''
export HOME=$(mktemp -d)
'';
passthru.tests.version = testers.testVersion {
package = crc;
command = ''
export HOME=$(mktemp -d)
crc version
'';
};
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Manages a local OpenShift 4.x cluster or a Podman VM optimized for testing and development purposes";
homepage = "https://crc.dev";
license = licenses.asl20;
maintainers = with maintainers; [ matthewpi shikanime tricktron ];
};
}

View File

@ -0,0 +1,10 @@
{
traefik-crd = {
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz";
sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq";
};
traefik = {
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz";
sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89";
};
}

View File

@ -0,0 +1,14 @@
{
k3sVersion = "1.29.0+k3s1";
k3sCommit = "3190a5faa28d7a0d428c756d67adcab7eb11e6a5";
k3sRepoSha256 = "1g75a7kz9nnv0vagzhggkw0zqigykimdwsmibgssa8vyjpg7idda";
k3sVendorHash = "sha256-iHmPVjYR/ZLH9UZ5yNEApyuGQsEwtxVbQw7Pu7WrpaQ=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.3.0-k3s1";
k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av";
containerdVersion = "1.7.11-k3s2";
containerdSha256 = "0279sil02wz7310xhrgmdbc0r2qibj9lafy0i9k24jdrh74icmib";
criCtlVersion = "1.29.0-k3s1";
}

View File

@ -25,4 +25,9 @@ in
k3s_1_28 = common ((import ./1_28/versions.nix) // {
updateScript = [ ./update-script.sh "28" ];
}) extraArgs;
# 1_29 can be built with the same builder as 1_26
k3s_1_29 = common ((import ./1_29/versions.nix) // {
updateScript = [ ./update-script.sh "29" ];
}) extraArgs;
}

View File

@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "wavebox";
version = "10.119.8-2";
version = "10.120.10-2";
src = fetchurl {
url = "https://download.wavebox.app/stable/linux/tar/Wavebox_${version}.tar.gz";
sha256 = "sha256-5xgDY/tLa1ZjlVH9ytcHa2ryw4GuvACevPfb9uFfvPE=";
sha256 = "sha256-9kA3nJUNlNHbWYkIy0iEnWCrmIYTjULdMAGGnO4JCkg=";
};
# don't remove runtime deps

View File

@ -19,14 +19,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "23.12.5";
version = "24.1.1";
in
stdenv.mkDerivation {
inherit pname appname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-nPlaKbtG6ncHI9I/qHUFRtc98lWkz7C/VXFX/JkXhDo=";
hash = "sha256-yCsYIi1StZOYutDAWS04u3DccrPB+2oqaynnH4GBEPc=";
};
nativeBuildInputs = [

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "phd2";
version = "2.6.12";
version = "2.6.13";
src = fetchFromGitHub {
owner = "OpenPHDGuiding";
repo = "phd2";
rev = "v${version}";
sha256 = "sha256-vq6qhwL8mB5ET/9qFWDZHxqL+RDXRly+CwbRz/wuyZg=";
sha256 = "sha256-GnT/tyk975caqESBSu4mdX5IWGi5O+RljLSd+CwoGWo=";
};
nativeBuildInputs = [

View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "dataexplorer";
version = "3.8.0";
version = "3.8.3";
src = fetchurl {
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz";
sha256 = "sha256-ZluT/jCjcOrlh2nqe0j56shmtGqfm11BCnsp6mWDXkQ=";
sha256 = "sha256-vU9klb6Mweg8yxnClsIdelG4uW92if64SJ7UHumYYbs=";
};
nativeBuildInputs = [ ant makeWrapper ];

View File

@ -20,16 +20,16 @@
rustPlatform.buildRustPackage rec {
pname = "jujutsu";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "martinvonz";
repo = "jj";
rev = "v${version}";
hash = "sha256-9m8GmVIZgHETkemzElXOfVxaZlzJwZaT2sJcTU7vZ2g=";
hash = "sha256-UFe4hVzn/jN22KtTuTcyNpseJdgIkmh9/eAJdSObfYU=";
};
cargoHash = "sha256-g1gdFGj0nzczR2yyjCdjpCGtFlmX7yrdAQIa3sQRATg=";
cargoHash = "sha256-WY8egnsyCuTLHd2Jnw+RLNd2LUOorHlnHVGLxtR5exQ=";
cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors
useNextest = true; # nextest is the upstream integration framework

View File

@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
sourceRoot = "IINA.app";
installPhase = ''
mkdir -p "$out/Applications/IINA.app"
mkdir -p $out/{bin,Applications/IINA.app}
cp -R . "$out/Applications/IINA.app"
ln -s "$out/Applications/IINA.app/Contents/MacOS/iina-cli" "$out/bin/iina"
'';
passthru.updateScript = nix-update-script { };

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "virter";
version = "0.25.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "LINBIT";
repo = "virter";
rev = "v${version}";
hash = "sha256-NIZBaPYFFH3MG2M7rF39TW8sLVR44SA37ZU3gOPwAFU=";
hash = "sha256-Ae7lQveslZ4XqMmnC5mkZOk/8WSLXpmeRjkYUkIaasg=";
};
vendorHash = "sha256-cVOxRrsDdtlDSJ3WRDNk8nqt7ztz4GSRIf6FDDBxvPc=";
vendorHash = "sha256-7aWrY9EMTaJrNd0MTFIMfyUJ67I0LtndqNH0INo/OfA=";
ldflags = [
"-s"

View File

@ -1,4 +1,4 @@
{ lib, stdenvNoCC, pijul }:
{ lib, stdenvNoCC, pijul, cacert }:
lib.makeOverridable (
{ url
@ -17,7 +17,8 @@ if change != null && state != null then
else
stdenvNoCC.mkDerivation {
inherit name;
nativeBuildInputs = [ pijul ];
nativeBuildInputs = [ pijul cacert ];
strictDeps = true;
dontUnpack = true;
dontConfigure = true;
@ -52,5 +53,7 @@ else
lib.fakeSha256;
inherit url change state channel;
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
}
)

View File

@ -0,0 +1,73 @@
{ lib
, buildGoModule
, fetchFromGitHub
, testers
, crc
, coreutils
}:
let
openShiftVersion = "4.14.3";
okdVersion = "4.14.0-0.okd-2023-12-01-225814";
microshiftVersion = "4.14.3";
podmanVersion = "4.4.4";
writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
gitCommit = "b6532a3c38f2c81143153fed022bc4ebf3f2f508";
gitHash = "sha256-LH1vjWVzSeSswnMibn4YVjV2glauQGDXP+6i9kGzzU4=";
in
buildGoModule rec {
version = "2.30.0";
pname = "crc";
src = fetchFromGitHub {
owner = "crc-org";
repo = "crc";
rev = "v${version}";
hash = gitHash;
};
vendorHash = null;
postPatch = ''
substituteInPlace pkg/crc/oc/oc_linux_test.go \
--replace "/bin/echo" "${coreutils}/bin/echo"
'';
subPackages = [
"cmd/crc"
];
tags = [ "containers_image_openpgp" ];
ldflags = [
"-X github.com/crc-org/crc/v2/pkg/crc/version.crcVersion=${version}"
"-X github.com/crc-org/crc/v2/pkg/crc/version.ocpVersion=${openShiftVersion}"
"-X github.com/crc-org/crc/v2/pkg/crc/version.okdVersion=${okdVersion}"
"-X github.com/crc-org/crc/v2/pkg/crc/version.podmanVersion=${podmanVersion}"
"-X github.com/crc-org/crc/v2/pkg/crc/version.microshiftVersion=${microshiftVersion}"
"-X github.com/crc-org/crc/v2/pkg/crc/version.commitSha=${builtins.substring 0 8 gitCommit}"
"-X github.com/crc-org/crc/v2/pkg/crc/segment.WriteKey=${writeKey}"
];
preCheck = ''
export HOME=$(mktemp -d)
'';
passthru.tests.version = testers.testVersion {
package = crc;
command = ''
export HOME=$(mktemp -d)
crc version
'';
};
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Manage a local OpenShift 4.x cluster, Microshift or a Podman VM optimized for testing and development purposes";
homepage = "https://crc.dev/crc/getting_started/getting_started/introducing/";
changelog = "https://github.com/crc-org/crc/releases/tag/v${version}";
license = licenses.asl20;
mainProgram = "crc";
maintainers = with maintainers; [ matthewpi shikanime tricktron ];
};
}

View File

@ -40,26 +40,32 @@ OKD_VERSION=$(grep 'OKD_VERSION' ${FILE_MAKEFILE} |
PODMAN_VERSION=$(grep 'PODMAN_VERSION' ${FILE_MAKEFILE} |
head -n1 | awk '{print $3}')
WRITE_KEY=$(grep '$(REPOPATH)/pkg/crc/segment.WriteKey' ${FILE_MAKEFILE} |
MICROSHIFT_VERSION=$(grep 'MICROSHIFT_VERSION' ${FILE_MAKEFILE} |
head -n1 | awk '{print $3}')
WRITE_KEY=$(grep 'pkg/crc/segment.WriteKey' ${FILE_MAKEFILE} |
head -n1 | awk '{print $4}' | sed -e 's/$(REPOPATH)\/pkg\/crc\/segment.WriteKey=//g')
sed -i "s|version = \".*\"|version = \"${CRC_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
${NIXPKGS_CRC_FOLDER}/package.nix
sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
${NIXPKGS_CRC_FOLDER}/package.nix
sed -i "s|gitHash = \".*\"|gitHash = \"${CRC_GIT_HASH}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
${NIXPKGS_CRC_FOLDER}/package.nix
sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
${NIXPKGS_CRC_FOLDER}/package.nix
sed -i "s|okdVersion = \".*\"|okdVersion = \"${OKD_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
${NIXPKGS_CRC_FOLDER}/package.nix
sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
${NIXPKGS_CRC_FOLDER}/package.nix
sed -i "s|microshiftVersion = \".*\"|microshiftVersion = \"${MICROSHIFT_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/package.nix
sed -i "s|writeKey = \".*\"|writeKey = \"${WRITE_KEY:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
${NIXPKGS_CRC_FOLDER}/package.nix

View File

@ -0,0 +1,47 @@
{ lib
, buildGoModule
, fetchFromGitHub
, makeBinaryWrapper
, libfido2
, dbus
, pinentry
, nix-update-script
}:
buildGoModule rec {
pname = "goldwarden";
version = "0.2.7";
src = fetchFromGitHub {
owner = "quexten";
repo = "goldwarden";
rev = "v${version}";
hash = "sha256-OXJovoJ2+YIMqzoG6J2LlxUC5DMZRAdEl+ZEv6PDXlI=";
};
vendorHash = "sha256-1Px60+f23qoP5eEOUC3WG5vKJYjbD3bPOrDyBpXlMT0=";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [makeBinaryWrapper];
buildInputs = [libfido2];
postInstall = ''
wrapProgram $out/bin/goldwarden \
--suffix PATH : ${lib.makeBinPath [dbus pinentry]}
install -Dm644 $src/resources/com.quexten.goldwarden.policy -t $out/share/polkit-1/actions
'';
passthru.updateScript = nix-update-script {};
meta = with lib; {
description = "A feature-packed Bitwarden compatible desktop integration";
homepage = "https://github.com/quexten/goldwarden";
license = licenses.mit;
maintainers = with maintainers; [ arthsmn ];
mainProgram = "goldwarden";
platforms = platforms.linux; # Support for other platforms is not yet ready, see https://github.com/quexten/goldwarden/issues/4
};
}

5796
pkgs/by-name/ki/kiwitalk/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,134 @@
{ lib
, fetchFromGitHub
, copyDesktopItems
, stdenv
, stdenvNoCC
, rustc
, rustPlatform
, cargo
, cargo-tauri
, openssl
, libayatana-appindicator
, webkitgtk
, pkg-config
, makeDesktopItem
, jq
, moreutils
, nodePackages
, cacert
}:
stdenv.mkDerivation rec {
pname = "kiwitalk";
version = "0.5.1";
src = fetchFromGitHub {
owner = "KiwiTalk";
repo = "KiwiTalk";
rev = "v${version}";
hash = "sha256-Th8q+Zbc102fIk2v7O3OOeSriUV/ydz60QwxzmS7AY8=";
};
postPatch = ''
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
'';
pnpm-deps = stdenvNoCC.mkDerivation {
pname = "${pname}-pnpm-deps";
inherit src version;
nativeBuildInputs = [
jq
moreutils
nodePackages.pnpm
cacert
];
installPhase = ''
export HOME=$(mktemp -d)
pnpm config set store-dir $out
# This version of the package has different versions of esbuild as a dependency.
# You can use the command below to get esbuild binaries for a specific platform and calculate hashes for that platforms. (linux, darwin for os, and x86, arm64, ia32 for cpu)
# cat package.json | jq '.pnpm.supportedArchitectures += { "os": ["linux"], "cpu": ["arm64"] }' | sponge package.json
pnpm install --frozen-lockfile --ignore-script
# Remove timestamp and sort the json files.
rm -rf $out/v3/tmp
for f in $(find $out -name "*.json"); do
sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
jq --sort-keys . $f | sponge $f
done
'';
dontBuild = true;
dontFixup = true;
outputHashMode = "recursive";
outputHash = {
x86_64-linux = "sha256-LJPjWNpVfdUu8F5BMhAzpTo/h6ax7lxY2EESHj5P390=";
aarch64-linux = "sha256-N1K4pV5rbWmO/KonvYegzBoWa6TYQIqhQyxH/sWjOJQ=";
i686-linux = "sha256-/Q7VZahYhLdKVFB25CanROYxD2etQOcRg+4bXZUMqTc=";
x86_64-darwin = "sha256-9biFAbFD7Bva7KPKztgCvcaoX8E6AlJBKkjlDQdP6Zw=";
aarch64-darwin = "sha256-to5Y0R9tm9b7jUQAK3eBylLhpu+w5oDd63FbBCBAvd8=";
}.${stdenv.system} or (throw "Unsupported platform");
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"tauri-plugin-log-0.0.0" = "sha256-8BrFf7vheMJIaZD0oXpi8V4hmUJFzHJmkcRtPL1/J48=";
"tauri-plugin-single-instance-0.0.0" = "sha256-8BrFf7vheMJIaZD0oXpi8V4hmUJFzHJmkcRtPL1/J48=";
};
};
nativeBuildInputs = [
rustPlatform.cargoSetupHook
cargo
rustc
cargo-tauri
nodePackages.pnpm
copyDesktopItems
pkg-config
];
buildInputs = [
openssl
libayatana-appindicator
webkitgtk
];
preBuild = ''
export HOME=$(mktemp -d)
pnpm config set store-dir ${pnpm-deps}
pnpm install --offline --frozen-lockfile --ignore-script
pnpm rebuild
cargo tauri build -b deb
'';
preInstall = ''
mv target/release/bundle/deb/*/data/usr/ $out
# delete the generated desktop entry
rm -r $out/share/applications
'';
desktopItems = [
(makeDesktopItem {
name = "KiwiTalk";
exec = "kiwi-talk";
icon = "kiwi-talk";
desktopName = "KiwiTalk";
comment = "An UNOFFICIAL cross-platform KakaoTalk client";
categories = [ "Network" "InstantMessaging" ];
terminal = false;
})
];
meta = with lib; {
description = "An UNOFFICIAL cross-platform KakaoTalk client written in TypeScript & Rust (SolidJS, tauri)";
homepage = "https://github.com/KiwiTalk/KiwiTalk";
maintainers = with maintainers; [ honnip ];
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "kiwi-talk";
};
}

View File

@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
hash = "sha256-OIbJ+J5LX6SPv5tuAiY66v/edeM7nFPHj90GXV6zaxw=";
};
mvnHash = "sha256-pzMjkkdkbVqVxZPW2I0YWPl5/l6+SyNkhd6gkm9Uoyc=";
mvnHash = "sha256-Cl7P2i4VFJ/yk7700u62YPcacfKkhBztFvcDkYBfZEA=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -26,13 +26,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "labwc";
version = "0.6.6";
version = "0.7.0";
src = fetchFromGitHub {
owner = "labwc";
repo = "labwc";
rev = finalAttrs.version;
hash = "sha256-ahupqI4mLrgQQjzdfLeQATc2iXQ0V6Sz5f6Yv1koLL0=";
hash = "sha256-/z2Wo9zhuEVIpk8jHYwg2JbBqkX7tfDP2KTZ9yzj454=";
};
nativeBuildInputs = [

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "kode-mono";
version = "1.018";
version = "1.201";
src = fetchzip {
url = "https://github.com/isaozler/kode-mono/releases/download/${finalAttrs.version}/kode-mono-fonts.zip";
hash = "sha256-ITz37lO0+bQd156WKBT8bcz8571kMiJGKepGCCVxaJU=";
hash = "sha256-ssrs79Rg4izFCI2j6jHkFvBLcMgwIm3NAQzeX7QRMTE=";
stripRoot = false;
};

View File

@ -4,23 +4,26 @@
, meson
, ninja
, fetchurl
, apacheHttpd
, apacheHttpdPackages
, pkg-config
, glib
, libxml2
, systemd
, wrapGAppsHook
, wrapGAppsNoGuiHook
, itstool
, mod_dnssd
, gnome
}:
stdenv.mkDerivation rec {
let
inherit (apacheHttpdPackages) apacheHttpd mod_dnssd;
in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-user-share";
version = "43.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major version}/gnome-user-share-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz";
sha256 = "DfMGqgVYMT81Pvf1G/onwDYoGtxFZ34c+/p8n4YVOM4=";
};
@ -43,7 +46,7 @@ stdenv.mkDerivation rec {
gettext
itstool
libxml2
wrapGAppsHook
wrapGAppsNoGuiHook
];
buildInputs = [
@ -55,16 +58,16 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
packageName = "gnome-user-share";
attrPath = "gnome.gnome-user-share";
};
};
meta = with lib; {
homepage = "https://help.gnome.org/users/gnome-user-share/3.8";
homepage = "https://gitlab.gnome.org/GNOME/gnome-user-share";
description = "Service that exports the contents of the Public folder in your home directory on the local network";
maintainers = teams.gnome.members;
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
})

View File

@ -1,39 +1,37 @@
{ stdenv
, lib
{ lib
, stdenv
, writeShellScriptBin
, fetchurl
, ant
, jre
, jdk
, jre
, makeWrapper
, canonicalize-jars-hook
}:
stdenv.mkDerivation rec {
let
fakeHostname = writeShellScriptBin "hostname" ''
echo nix-builder.localdomain
'';
in
stdenv.mkDerivation (finalAttrs: {
pname = "abcl";
version = "1.9.2";
src = fetchurl {
url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
sha256 = "sha256-Ti9Lj4Xi2V2V5b282foXrWExoX4vzxK8Gf+5e0i8HTg=";
url = "https://common-lisp.net/project/armedbear/releases/${finalAttrs.version}/abcl-src-${finalAttrs.version}.tar.gz";
hash = "sha256-Ti9Lj4Xi2V2V5b282foXrWExoX4vzxK8Gf+5e0i8HTg=";
};
configurePhase = ''
runHook preConfigure
mkdir nix-tools
export PATH="$PWD/nix-tools:$PATH"
echo "echo nix-builder.localdomain" > nix-tools/hostname
chmod a+x nix-tools/*
hostname
runHook postConfigure
'';
buildInputs = [ jre ];
# note for the future:
# if you use makeBinaryWrapper, you will trade bash for glibc, the closure will be slightly larger
nativeBuildInputs = [ makeWrapper ant jdk ];
nativeBuildInputs = [
ant
jdk
fakeHostname
makeWrapper
canonicalize-jars-hook
];
buildPhase = ''
runHook preBuild
@ -46,13 +44,12 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p "$out"/{bin,share/doc/abcl,lib/abcl}
mkdir -p "$out"/{share/doc/abcl,lib/abcl}
cp -r README COPYING CHANGES examples/ "$out/share/doc/abcl/"
cp -r dist/*.jar contrib/ "$out/lib/abcl/"
makeWrapper ${jre}/bin/java $out/bin/abcl \
--prefix CLASSPATH : $out/lib/abcl/abcl.jar \
--prefix CLASSPATH : $out/lib/abcl/abcl-contrib.jar \
--add-flags "-classpath $out/lib/abcl/\*" \
${lib.optionalString (lib.versionAtLeast jre.version "17")
# Fix for https://github.com/armedbear/abcl/issues/484
"--add-flags --add-opens=java.base/java.util.jar=ALL-UNNAMED \\"
@ -66,9 +63,10 @@ stdenv.mkDerivation rec {
meta = {
description = "A JVM-based Common Lisp implementation";
license = lib.licenses.gpl3 ;
homepage = "https://common-lisp.net/project/armedbear/";
license = lib.licenses.gpl2Classpath;
mainProgram = "abcl";
maintainers = lib.teams.lisp.members;
platforms = lib.platforms.darwin ++ lib.platforms.linux;
homepage = "https://common-lisp.net/project/armedbear/";
};
}
})

View File

@ -35,14 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
"PREFIX=$(out)"
"C_COMPILER=$(CC)"
"CXX_COMPILER=$(CXX)"
"TARGET_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
] ++ (lib.optionals stdenv.isDarwin [
"XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
"LINKER_OPTIONS=-headerpad_max_install_names"
"POSTINSTALL_PROGRAM=install_name_tool"
]) ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"HOSTSYSTEM=${stdenv.hostPlatform.config}"
"TARGET_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
]);
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nng";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "nanomsg";
repo = "nng";
rev = "v${version}";
hash = "sha256-Kq8QxPU6SiTk0Ev2IJoktSPjVOlAS4/e1PQvw2+e8UA=";
hash = "sha256-QnT27Xej8bu2wj2v1uwAAJt4DrQlgMsGOvj8ZLpx57A=";
};
nativeBuildInputs = [ cmake ninja ]

View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "basemap";
version = "1.3.8";
version = "1.3.9";
format = "setuptools";
src = fetchFromGitHub {
owner = "matplotlib";
repo = "basemap";
rev = "refs/tags/v${version}";
hash = "sha256-QH/pC1WIa0XQaDbAhYwKbCeCyxUprJbNyRfguiLjlHI=";
hash = "sha256-bfwug/BonTJYnMpeo07V3epH18BQ20qdUwmYEb3/GgQ=";
};
sourceRoot = "${src.name}/packages/basemap";

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "dropmqttapi";
version = "1.0.2";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "ChandlerSystems";
repo = "dropmqttapi";
rev = "refs/tags/v${version}";
hash = "sha256-5UnjIv57b4JV/vFyQpe+AS4e/fiE2y7ynZx5g6+oSyQ=";
};
nativeBuildInputs = [
setuptools
];
# Module has no test
doCheck = false;
pythonImportsCheck = [
"dropmqttapi"
];
meta = with lib; {
description = "Python MQTT API for DROP water management products";
homepage = "https://github.com/ChandlerSystems/dropmqttapi";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "frozendict";
version = "2.3.10";
version = "2.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Marco-Sulla";
repo = "python-frozendict";
rev = "refs/tags/v${version}";
hash = "sha256-GUpCN5CsCJGuIfdsmgZHQvByA145RLI1l7aVEueqjDM=";
hash = "sha256-mC5udKWez1s9JiVthtzCwEUPLheJpxRmcL3KdRiYP18=";
};
# build C version if it exists

View File

@ -9,25 +9,31 @@
, pytestCheckHook
, betamax
, betamax-matchers
, hatchling
, fetchpatch
}:
buildPythonPackage rec {
pname = "github3.py";
version = "3.2.0";
format = "setuptools";
version = "4.0.1";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-Cbcr4Ul9NGsJaM3oNgoNavedwgbQFJpjzT7IbGXDd8w=";
hash = "sha256-MNVxB2dT78OJ7cf5qu8zik/LJLVNiWjV85sTQvRd3TY=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
pyjwt
python-dateutil
requests
uritemplate
python-dateutil
pyjwt
]
++ pyjwt.optional-dependencies.crypto;
@ -37,6 +43,14 @@ buildPythonPackage rec {
betamax-matchers
];
patches = [
(fetchpatch {
# disable tests with "AttributeError: 'MockHTTPResponse' object has no attribute 'close'", due to betamax
url = "https://github.com/sigmavirus24/github3.py/commit/9d6124c09b0997b5e83579549bcf22b3e901d7e5.patch";
hash = "sha256-8Z4vN7iKl/sOcEJptsH5jsqijZgvL6jS7kymZ8+m6bY=";
})
];
# Solves "__main__.py: error: unrecognized arguments: -nauto"
preCheck = ''
rm tox.ini

View File

@ -2,9 +2,7 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, fetchpatch
, setuptools
, pybind11
, numpy
, pytestCheckHook
, absl-py
@ -12,8 +10,8 @@
buildPythonPackage rec {
pname = "ml-dtypes";
version = "0.3.1";
format = "pyproject";
version = "0.3.2";
pyproject = true;
disabled = pythonOlder "3.9";
@ -21,33 +19,23 @@ buildPythonPackage rec {
owner = "jax-ml";
repo = "ml_dtypes";
rev = "refs/tags/v${version}";
hash = "sha256-tuqB5itrAkT2b76rgRAJaOeng4V83TzPu400DPYrdKU=";
hash = "sha256-epWunA5FULmCuTABl3uckFuNaSEpqJxtp0n0loCb6Q0=";
# Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521),
# the attempts to use the nixpkgs packaged eigen dependency have failed.
# Hence, we rely on the bundled eigen library.
fetchSubmodules = true;
};
patches = [
# See https://github.com/jax-ml/ml_dtypes/issues/106.
(fetchpatch {
url = "https://github.com/jax-ml/ml_dtypes/commit/c082a2df6bc0686b35c4b4a303fd1990485e181f.patch";
hash = "sha256-aVJy9vT00b98xOrJCdbCHSZBI3uyjafmN88Z2rjBS48=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace "numpy~=1.21.2" "numpy" \
--replace "numpy~=1.23.3" "numpy" \
--replace "numpy~=1.26.0" "numpy" \
--replace "pybind11~=2.11.1" "pybind11" \
--replace "setuptools~=68.1.0" "setuptools"
'';
nativeBuildInputs = [
setuptools
pybind11
];
propagatedBuildInputs = [
@ -72,6 +60,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A stand-alone implementation of several NumPy dtype extensions used in machine learning libraries";
homepage = "https://github.com/jax-ml/ml_dtypes";
changelog = "https://github.com/jax-ml/ml_dtypes/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ GaetanLepage samuela ];
};

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "vulcan-api";
version = "2.3.0";
version = "2.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "kapi2289";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-5Tj611p4wYn7GjoCtCTRhUZkKyAJglHcci76ciVFWik=";
hash = "sha256-QmKtnvJOMLiiaoLfcULnwpSCuP3wSYQVjcKVuBVNyec=";
};
pythonRemoveDeps = [

View File

@ -10,11 +10,11 @@ assert jdk != null;
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "apache-maven";
version = "3.9.5";
version = "3.9.6";
src = fetchurl {
url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz";
hash = "sha256-X9JysQUEH+geLkL2OZdl4BX8STjvN1O6SvnwEZ2E73w=";
hash = "sha256-bu3SyuNibWrTpcnuMkvSZYU9ZCl/B/AzQwdVvQ4MOks=";
};
sourceRoot = ".";

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}";
version = "2.21.0";
version = "2.22.0";
src = fetchFromGitHub {
owner = "harness";
repo = "drone";
rev = "v${version}";
sha256 = "sha256-ywKRibJxOVYQ7SNef38eUk1QkVnCoFbIMIGPCw2Woek=";
sha256 = "sha256-haxxILbM3REdSK4h4LN+HhRvl3VK9Ozf2NfnLTL5T3A=";
};
vendorHash = "sha256-nryEdqRKXyum9Vrna3aqhhYekjvNIvct8gqbKEBR9iE=";
vendorHash = "sha256-n4KbKkqAnHDIsXs8A/FE+rCkSKQKr5fv7npJ/X6t0mk=";
tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ];

View File

@ -1,14 +1,14 @@
{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }:
let
pname = "fastddsgen";
version = "2.5.1";
version = "3.2.0";
src = fetchFromGitHub {
owner = "eProsima";
repo = "Fast-DDS-Gen";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-3x99FfdxSfqa2+BNZ3lZQzRgjwGhbm5PKezoS6fs5Ts=";
hash = "sha256-NG4Ndc2eJjXA3bKWuwifgHX1kWtC5wWiiDKinlG2up0=";
};
gradle = gradle_7;
@ -35,7 +35,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-ZGWTK665wIX/Biz4JDrbaU4EZNqT7Q8o6DSpziUd/SM=";
outputHash = "sha256-YkVRp6TXI7/5O+u0DDYiCq7DITfGJ4lT/L4hT90JOL8=";
};
in
stdenv.mkDerivation {

View File

@ -28,7 +28,7 @@ mavenJdk8.buildMavenPackage rec {
sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY=";
};
mvnHash = "sha256-+297ttqBT4Q4NyNIvTYTtiDrB1dfmuu9iWmAxxBZiW8=";
mvnHash = "sha256-Qbx1cNKFtSEnzhFImtCz2psYts2yhTDKzjmBBZavWwU=";
nativeBuildInputs = [ jdk8 makeWrapper ];

View File

@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.gnu.org/software/gperf/";
platforms = lib.platforms.unix;
mainProgram = "gperf";
};
}

View File

@ -25,8 +25,8 @@ maven'.buildMavenPackage rec {
buildDate = "2022-10-07T00:00:00+01:00"; # v20.0.0 release date
mvnParameters = "-Dmaven.test.skip -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
mvnHash = selectSystem {
x86_64-linux = "sha256-3SFCQ+hyQPtAEx1jSbe/Qtq4dYkfVvU/Kmekzv53o3U=";
aarch64-linux = "sha256-AZ1NXzSRyT77W+EjLIb7eWxf7Ztu6XuKjSImRg1lNcw=";
x86_64-linux = "sha256-QwxA3lKVkRG5CV2GIwfVFPOj112pHr7bDlZJD6KwrHc=";
aarch64-linux = "sha256-cO5nHSvv2saBuAjq47A+GW9vFWEM+ysXyZgI0Oe/F70=";
};
nativeBuildInputs = [ copyDesktopItems makeWrapper glib wrapGAppsHook ];

View File

@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
version = "1.0.20";
version = "1.0.21";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
hash = "sha256-rwBU4jdD4sTB3wTS3uh1Fq88IW+LB/S/srMAMPJsQ1M=";
hash = "sha256-PqQWBoSRfCs4uPNCTdgxkrsfvkJcA7KADbqrij+J6Ks=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
hash = "sha256-kzg4pT4e6evvyPhkC3wmwWsRvSpVCM45jgn+yvEvTaI=";
hash = "sha256-tQ2ShcOlh0Zqsw6hHXxq5M0W562Fp3u6VfW6uRgsCIQ=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
hash = "sha256-nIE5/h+9ShoOywA7isHW+X+J6rQF2oBgnNI7rh0ZNu0=";
hash = "sha256-u+ExrmaZIfzItS0NgeMKzrrI+2ViImvz2hSlr1yYlOI=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
hash = "sha256-NISClwFmDflxx09gWgo2Cpx/QXxoq4iDcYuXUT1FTn8=";
hash = "sha256-MrIR77IE4OdSVIeU+xp3PPuM/TFvd7nD9YyX+efLnU0=";
};
};
updateScript = writeShellScript "update-bun" ''

View File

@ -30,10 +30,13 @@
, textToSpeechSupport ? stdenv.isLinux
, controllerSupport ? stdenv.isLinux
# The flag `withWaylandGLFW` enables runtime-checking of `WAYLAND_DISPLAY`;
# if the option is enabled, a patched version of GLFW will be added to
# `LD_LIBRARY_PATH` so that the launcher can use the correct one
# depending on the desktop environment used.
# Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH`
# when launched on wayland, allowing for the game to be run natively.
# Make sure to enable "Use system installation of GLFW" in instance settings
# for this to take effect
#
# Warning: This build of glfw may be unstable, and the launcher
# itself can take slightly longer to start
, withWaylandGLFW ? false
, jdks ? [ jdk17 jdk8 ]
@ -44,14 +47,6 @@
assert lib.assertMsg (withWaylandGLFW -> stdenv.isLinux) "withWaylandGLFW is only available on Linux";
let
# By default, this package uses a binary wrapper for `wrapQtAppsHook`.
# Enabling `shellWrapper` will add `makeWrapper` to `nativeBuildInputs`,
# causing `wrapQtAppsHook` to output a shell wrapper instead.
# This is needed for checking environment variables at runtime
# and modifying others if necessary (see above option for example).
# Warning: This can make the program start slower, by about four milliseconds.
shellWrapper = withWaylandGLFW;
prismlauncher' = prismlauncher-unwrapped.override {
inherit msaClientID gamemodeSupport;
};
@ -65,7 +60,9 @@ symlinkJoin {
nativeBuildInputs = [
wrapQtAppsHook
]
++ lib.optional shellWrapper makeWrapper;
# purposefully using a shell wrapper here for variable expansion
# see https://github.com/NixOS/nixpkgs/issues/172583
++ lib.optional withWaylandGLFW makeWrapper;
buildInputs = [
qtbase

View File

@ -19,7 +19,7 @@ maven.buildMavenPackage rec {
rev = version;
hash = "sha256-lovDkEvzclZCBu/Ha8h0j595NZ4ejefEOX7lNmzb8I8=";
};
mvnHash = "sha256-iGnoAZcJvaVoACi9ozG/f+A8tjvDuwn22bMRyuUU5Jg=";
mvnHash = "sha256-bsJlsIXIIVzZyVgEF/SN+GgpZt6v0u800arO1c5QYHk=";
desktop = makeDesktopItem {
name = "RuneLite";

View File

@ -10,15 +10,15 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-SwlEbkhTjlnECK3Z3MYzHOQQvU1byipPM7whPQaJiDk=";
arm64-linux_hash = "sha256-gFlB/GaEXJIFXLG2zf/r6iqa8Uw98bjeAezc5UCXUz4=";
x64-osx_hash = "sha256-2ypOaHGsK4KEZAZzVEZuMRxcn16hINMQDyw92eSKy7g=";
arm64-osx_hash = "sha256-1tO7XYy0AoGOAgO+HkBb6Z2BIsBGDZ59rIy93CT7Fxg=";
x64-linux_hash = "sha256-RXvpKTIXDOcPUyRa07+8N4xkav23t8aWAshhPEK5pCI=";
arm64-linux_hash = "sha256-zAwlyW6uU+3/XQk2HxA/ClvF/EozxMnlH/6C2cx99bU=";
x64-osx_hash = "sha256-j7cvUyDMxf+9ry9pMSO+xfjBgoqeOhda3pnzHA2RDw4=";
arm64-osx_hash = "sha256-v8SuAWlyBT7bIFRkQDJ5E2y7uxckfdW5cCG/nJ+27cg=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "radarr";
version = "5.1.3.8246";
version = "5.2.6.8376";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

View File

@ -41,7 +41,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
"synstructure",
]
@ -53,7 +53,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -96,11 +96,11 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
[[package]]
name = "bindgen"
version = "0.60.1"
version = "0.66.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
dependencies = [
"bitflags",
"bitflags 2.4.1",
"cexpr",
"clang-sys",
"lazy_static",
@ -111,6 +111,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
"syn 2.0.39",
]
[[package]]
@ -119,6 +120,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
[[package]]
name = "block-buffer"
version = "0.7.3"
@ -142,25 +149,27 @@ dependencies = [
[[package]]
name = "boring"
version = "2.1.0"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c713ad6d8d7a681a43870ac37b89efd2a08015ceb4b256d82707509c1f0b6bb"
checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece"
dependencies = [
"bitflags",
"bitflags 2.4.1",
"boring-sys",
"foreign-types",
"lazy_static",
"libc",
"once_cell",
]
[[package]]
name = "boring-sys"
version = "2.1.0"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7663d3069437a5ccdb2b5f4f481c8b80446daea10fa8503844e89ac65fcdc363"
checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481"
dependencies = [
"bindgen",
"cmake",
"fs_extra",
"fslock",
]
[[package]]
@ -201,7 +210,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
"syn",
"syn 1.0.107",
"tempfile",
"toml",
]
@ -255,7 +264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
dependencies = [
"atty",
"bitflags",
"bitflags 1.3.2",
"clap_lex",
"indexmap",
"strsim",
@ -397,7 +406,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -427,7 +436,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -507,7 +516,7 @@ checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -516,6 +525,22 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
[[package]]
name = "fs_extra"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "fslock"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "generic-array"
version = "0.12.4"
@ -888,7 +913,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -941,7 +966,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -1045,7 +1070,7 @@ version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"crc32fast",
"flate2",
"miniz_oxide",
@ -1068,18 +1093,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.49"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.23"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2",
]
@ -1168,7 +1193,7 @@ dependencies = [
name = "rdp-client"
version = "0.1.0"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"byteorder",
"cbindgen",
"env_logger",
@ -1191,7 +1216,7 @@ dependencies = [
[[package]]
name = "rdp-rs"
version = "0.1.0"
source = "git+https://github.com/gravitational/rdp-rs?rev=75eb6a30b83e7152ee6213964b5ac6e783304840#75eb6a30b83e7152ee6213964b5ac6e783304840"
source = "git+https://github.com/gravitational/rdp-rs?rev=0ddb504e10051aaa8f0de57580a973d2853a5b7d#0ddb504e10051aaa8f0de57580a973d2853a5b7d"
dependencies = [
"boring",
"bufstream",
@ -1219,7 +1244,7 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags",
"bitflags 1.3.2",
]
[[package]]
@ -1239,15 +1264,6 @@ version = "0.6.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
[[package]]
name = "remove_dir_all"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
dependencies = [
"winapi",
]
[[package]]
name = "ring"
version = "0.16.20"
@ -1334,7 +1350,7 @@ version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
@ -1399,7 +1415,7 @@ checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -1505,6 +1521,17 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "synstructure"
version = "0.12.6"
@ -1513,22 +1540,21 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
"unicode-xid",
]
[[package]]
name = "tempfile"
version = "3.3.0"
version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
dependencies = [
"cfg-if",
"fastrand",
"libc",
"redox_syscall",
"remove_dir_all",
"winapi",
"rustix",
"windows-sys",
]
[[package]]
@ -1563,7 +1589,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -1689,7 +1715,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
"wasm-bindgen-shared",
]
@ -1711,7 +1737,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]

View File

@ -1,19 +1,17 @@
{ callPackage, ... }@args:
callPackage ../generic.nix ({
version = "12.4.23";
hash = "sha256-kCHRBa9rdwfcb98XG/08ZaJmI1NhEiSCoXuH8/3xJlk=";
vendorHash = "sha256-yOvQQHjtDSLqQZcw2OIOy6CDqwYSgMpL2Rxlk2u//OE=";
yarnHash = "sha256-beHCg9qUSisYMJ/9eeqWmbc9+V9YGgXBheZSFpbqoPY=";
version = "12.4.32";
hash = "sha256-dYriqQwrc3tfLv+/G/W8n+4cLbPUq7lq1/kGH/GIsHs=";
vendorHash = "sha256-1z1Aocxi34/6Kuwj30LWjEq+LrZThG6ZzrMb0Qtok8w=";
yarnHash = "sha256-Sr9T2TmrysMQs6A00rHU1IZjslu8jyYkVnYE6AmBmLA=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";
"rdp-rs-0.1.0" = "sha256-4NbAsEmyUdmBcHuzx+SLQCGKICC4V4FX4GTK2SzyHC0=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh.patch
# https://github.com/NixOS/nixpkgs/issues/132652
../test.patch
];
} // builtins.removeAttrs args [ "callPackage" ])

View File

@ -41,7 +41,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
"synstructure",
]
@ -53,7 +53,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -96,11 +96,11 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
[[package]]
name = "bindgen"
version = "0.60.1"
version = "0.66.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.1",
"cexpr",
"clang-sys",
"lazy_static",
@ -111,6 +111,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
"syn 2.0.39",
]
[[package]]
@ -121,9 +122,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.1.0"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3"
checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
[[package]]
name = "block-buffer"
@ -148,25 +149,27 @@ dependencies = [
[[package]]
name = "boring"
version = "2.1.0"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c713ad6d8d7a681a43870ac37b89efd2a08015ceb4b256d82707509c1f0b6bb"
checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.1",
"boring-sys",
"foreign-types",
"lazy_static",
"libc",
"once_cell",
]
[[package]]
name = "boring-sys"
version = "2.1.0"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7663d3069437a5ccdb2b5f4f481c8b80446daea10fa8503844e89ac65fcdc363"
checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481"
dependencies = [
"bindgen",
"cmake",
"fs_extra",
"fslock",
]
[[package]]
@ -207,7 +210,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
"syn",
"syn 1.0.107",
"tempfile",
"toml",
]
@ -403,7 +406,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -433,7 +436,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -522,7 +525,7 @@ checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -531,6 +534,22 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
[[package]]
name = "fs_extra"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "fslock"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "generic-array"
version = "0.12.4"
@ -919,7 +938,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -972,7 +991,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -1100,18 +1119,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.49"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.23"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2",
]
@ -1200,7 +1219,7 @@ dependencies = [
name = "rdp-client"
version = "0.1.0"
dependencies = [
"bitflags 2.1.0",
"bitflags 2.4.1",
"byteorder",
"cbindgen",
"env_logger",
@ -1223,7 +1242,7 @@ dependencies = [
[[package]]
name = "rdp-rs"
version = "0.1.0"
source = "git+https://github.com/gravitational/rdp-rs?rev=75eb6a30b83e7152ee6213964b5ac6e783304840#75eb6a30b83e7152ee6213964b5ac6e783304840"
source = "git+https://github.com/gravitational/rdp-rs?rev=0ddb504e10051aaa8f0de57580a973d2853a5b7d#0ddb504e10051aaa8f0de57580a973d2853a5b7d"
dependencies = [
"boring",
"bufstream",
@ -1435,7 +1454,7 @@ checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -1547,6 +1566,17 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "synstructure"
version = "0.12.6"
@ -1555,7 +1585,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
"unicode-xid",
]
@ -1604,7 +1634,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -1730,7 +1760,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
"wasm-bindgen-shared",
]
@ -1752,7 +1782,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]

View File

@ -1,19 +1,17 @@
{ callPackage, ... }@args:
callPackage ../generic.nix ({
version = "13.4.5";
hash = "sha256-uZolRnESFP65Xgvr29laEok2kBbm7G2qY9j8yKRrUdo=";
vendorHash = "sha256-Bkr6R9P2YTqvTEQkHvVdsRmWp6pv3Qg0WaQ+pERclWc=";
yarnHash = "sha256-60k4LRHpX4rYXZZ0CC44PqzL3PDu8PadV0kwXatnByI=";
version = "13.4.14";
hash = "sha256-g11D5lekI3pUpKf5CLUuNjejs0gN/bEemHkCj3akha0=";
vendorHash = "sha256-wQywm41qnv/ryZwwyIg+La1Z7qAw2I/fUI3kLgHlq9Q=";
yarnHash = "sha256-E9T+7aXVoERdUnVEL4va2fcMnv1jsL9Js/R2LZo4hu4=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";
"rdp-rs-0.1.0" = "sha256-4NbAsEmyUdmBcHuzx+SLQCGKICC4V4FX4GTK2SzyHC0=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh.patch
# https://github.com/NixOS/nixpkgs/issues/132652
../test.patch
];
} // builtins.removeAttrs args [ "callPackage" ])

View File

@ -96,11 +96,11 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
[[package]]
name = "bindgen"
version = "0.60.1"
version = "0.66.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.0",
"cexpr",
"clang-sys",
"lazy_static",
@ -111,6 +111,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
"syn 2.0.23",
]
[[package]]
@ -148,25 +149,27 @@ dependencies = [
[[package]]
name = "boring"
version = "2.1.0"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c713ad6d8d7a681a43870ac37b89efd2a08015ceb4b256d82707509c1f0b6bb"
checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.0",
"boring-sys",
"foreign-types",
"lazy_static",
"libc",
"once_cell",
]
[[package]]
name = "boring-sys"
version = "2.1.0"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7663d3069437a5ccdb2b5f4f481c8b80446daea10fa8503844e89ac65fcdc363"
checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481"
dependencies = [
"bindgen",
"cmake",
"fs_extra",
"fslock",
]
[[package]]
@ -528,6 +531,22 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
[[package]]
name = "fs_extra"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "fslock"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "generic-array"
version = "0.12.4"
@ -1214,7 +1233,7 @@ dependencies = [
[[package]]
name = "rdp-rs"
version = "0.1.0"
source = "git+https://github.com/gravitational/rdp-rs?rev=75eb6a30b83e7152ee6213964b5ac6e783304840#75eb6a30b83e7152ee6213964b5ac6e783304840"
source = "git+https://github.com/gravitational/rdp-rs?rev=0ddb504e10051aaa8f0de57580a973d2853a5b7d#0ddb504e10051aaa8f0de57580a973d2853a5b7d"
dependencies = [
"boring",
"bufstream",

View File

@ -1,13 +1,13 @@
{ callPackage, ... }@args:
callPackage ../generic.nix ({
version = "14.1.1";
hash = "sha256-xdJBl5imHuo1IP0ja33eaaE4i/sSP3kg/wQwehC1Hao=";
vendorHash = "sha256-+kCns/xHUfUOW2xBk6CaPZYWe/vcEguz2/4lqaJEbFc=";
yarnHash = "sha256-fWBMeat1bSIEMSADn8oDVfQtnUBojjy5ZCdVhw8PGMs=";
version = "14.3.0";
hash = "sha256-yTbJeHCmPlelq7BrZQRY3XyNQiovV7NQ1tNh2NfYGbk=";
vendorHash = "sha256-ySe5YkBMt+1tF/8PWctfAkK/e03cqp5P1aJ2ANz7pLo=";
yarnHash = "sha256-m934P+KygGiCzr5fDsNTlmZ1T9JxA6P8zTimocQyVi0=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";
"rdp-rs-0.1.0" = "sha256-4NbAsEmyUdmBcHuzx+SLQCGKICC4V4FX4GTK2SzyHC0=";
};
};
extPatches = [

View File

@ -1,13 +0,0 @@
diff --git a/tool/tsh/resolve_default_addr_test.go b/tool/tsh/resolve_default_addr_test.go
index d5976f156..aec5199aa 100644
--- a/tool/tsh/resolve_default_addr_test.go
+++ b/tool/tsh/resolve_default_addr_test.go
@@ -237,7 +237,7 @@ func TestResolveDefaultAddrTimeoutBeforeAllRacersLaunched(t *testing.T) {
blockingHandler, doneCh := newWaitForeverHandler()
- servers := make([]*httptest.Server, 1000)
+ servers := make([]*httptest.Server, 100)
for i := 0; i < len(servers); i++ {
servers[i] = makeTestServer(t, blockingHandler)
}

View File

@ -1,10 +1,10 @@
diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go
index 57379c40f..cb4d7b84c 100644
index f73b0a4e46..6848286781 100644
--- a/tool/tsh/tsh.go
+++ b/tool/tsh/tsh.go
@@ -514,10 +514,11 @@ func Run(args []string, opts ...cliOption) error {
}
}
@@ -1065,10 +1065,11 @@ func Run(ctx context.Context, args []string, opts ...cliOption) error {
var err error
- cf.executablePath, err = os.Executable()
+ tempBinaryPath, err := os.Executable()
@ -13,5 +13,5 @@ index 57379c40f..cb4d7b84c 100644
}
+ cf.executablePath = path.Dir(tempBinaryPath) + "/tsh"
if err := client.ValidateAgentKeyOption(cf.AddKeysToAgent); err != nil {
return trace.Wrap(err)
// configs
setEnvFlags(&cf)

View File

@ -13,7 +13,7 @@ mavenWithJdk.buildMavenPackage rec {
hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU=";
};
mvnHash = "sha256-8i3OVSy8RUGVoQzwADszVvNYe50f4nsJie1y7tsOK4U=";
mvnHash = "sha256-zqXbLnLmTZHzwH+vgGASR7Jsz1t173DmQMIe2R6B6Ic=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -1,30 +1,55 @@
{ lib, stdenv, fetchFromGitHub, jdk8, ant, makeWrapper, jre8 }:
{ lib
, stdenv
, fetchFromGitHub
, ant
, jdk8
, jre8
, makeWrapper
, canonicalize-jars-hook
}:
let jdk = jdk8; jre = jre8; in
stdenv.mkDerivation rec {
let
jdk = jdk8;
jre = jre8;
in
stdenv.mkDerivation (finalAttrs: {
pname = "ili2c";
version = "5.1.1";
version = "5.1.1"; # There are newer versions, but they use gradle
nativeBuildInputs = [ ant jdk makeWrapper ];
nativeBuildInputs = [
ant
jdk
makeWrapper
canonicalize-jars-hook
];
src = fetchFromGitHub {
owner = "claeis";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-FHhx+f253+UdbFjd2fOlUY1tpQ6pA2aVu9CBSwUVoKQ=";
repo = "ili2c";
rev = "ili2c-${finalAttrs.version}";
hash = "sha256-FHhx+f253+UdbFjd2fOlUY1tpQ6pA2aVu9CBSwUVoKQ=";
};
buildPhase = "ant jar";
patches = [
# avoids modifying Version.properties file because that would insert the current timestamp into the file
./dont-use-build-timestamp.patch
];
installPhase =
''
mkdir -p $out/share/${pname}
cp $build/build/source/build/jar/ili2c.jar $out/share/${pname}
buildPhase = ''
runHook preBuild
ant jar
runHook postBuild
'';
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/ili2c \
--add-flags "-jar $out/share/${pname}/ili2c.jar"
'';
installPhase = ''
runHook preInstall
install -Dm644 build/jar/ili2c.jar -t $out/share/ili2c
makeWrapper ${jre}/bin/java $out/bin/ili2c \
--add-flags "-jar $out/share/ili2c/ili2c.jar"
runHook postInstall
'';
meta = with lib; {
description = "The INTERLIS Compiler";
@ -34,11 +59,11 @@ stdenv.mkDerivation rec {
homepage = "https://www.interlis.ch/downloads/ili2c";
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # source bundles dependencies as jars
binaryBytecode # source bundles dependencies as jars
];
license = licenses.lgpl21Plus;
maintainers = [ maintainers.das-g ];
platforms = platforms.linux;
mainProgram = "ili2c";
};
}
})

View File

@ -0,0 +1,29 @@
diff --git a/build.xml b/build.xml
index d0493d8..50d4286 100644
--- a/build.xml
+++ b/build.xml
@@ -221,11 +221,6 @@
</jar>
</target>
<target depends="init,compile-core,copyres" name="jar-core">
- <propertyfile file="${versionfile}">
- <!-- <entry key="versionMicro" type="int" value="1" operation="+"/> -->
- <entry key="versionDate" type="date" value="now" pattern="yyyyMMdd"/>
- </propertyfile>
-
<jar jarfile="${build}/jar/${ant.project.name}-core.jar">
<!-- fileset dir="${build}/classes" excludes="ch/interlis/ili2c/tests/**/*.class" includes="ch/interlis/models/**/*.class,ch/interlis/ili2c/parser/**/*.class,ch/interlis/ili2c/generator/**/*.class,ch/interlis/ili2c/modelscan/**/*.class,ch/interlis/ili2c/metamodel/**/*.class,ch/interlis/ili2c/config/**/*.class,ch/interlis/ili2c/CompilerLogEvent.class,ch/interlis/ili2c/Ili2cException.class,ch/interlis/ili2c/Ili2cFailure.class,ch/interlis/ili2c/gui/UserSettings.class,ch/interlis/ilirepository/ReposManager.class,ch/interlis/ilirepository/impl/RepositoryAccessException.class,ch/interlis/ilirepository/Dataset.class"/-->
<fileset dir="${build}/classes-core" excludes="ch/interlis/ili2c/tests/**/*.class" />
diff --git a/src-core/ch/interlis/ili2c/metamodel/TransferDescription.java b/src-core/ch/interlis/ili2c/metamodel/TransferDescription.java
index 9e165af..86d8f89 100644
--- a/src-core/ch/interlis/ili2c/metamodel/TransferDescription.java
+++ b/src-core/ch/interlis/ili2c/metamodel/TransferDescription.java
@@ -219,7 +219,7 @@ public static final String MIMETYPE_XTF = "application/interlis+xml;version=2.3"
ret.append(branch);
ret.append('-');
}
- ret.append(resVersion.getString("versionDate"));
+ ret.append("nixpkgs");
version = ret.toString();
}
return version;

View File

@ -1,42 +0,0 @@
{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:
let this = stdenv.mkDerivation rec {
version = "6.0.0-2022-03-18"; # Also update the fetchurl link
pname = "openapi-generator-cli";
jarfilename = "${pname}-${version}.jar";
nativeBuildInputs = [
makeWrapper
];
src = fetchurl {
url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/openapi-generator-cli-6.0.0-20220318.042704-93.jar";
sha256 = "1h126kpbnpbrsnjrxb09hzb796dwl4g58d6wrh1hhv8svwy5p0bl";
};
dontUnpack = true;
installPhase = ''
runHook preInstall
install -D "$src" "$out/share/java/${jarfilename}"
makeWrapper ${jre}/bin/java $out/bin/${pname} \
--add-flags "-jar $out/share/java/${jarfilename}"
runHook postInstall
'';
meta = with lib; {
description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
homepage = "https://github.com/OpenAPITools/openapi-generator";
license = licenses.asl20;
maintainers = [ maintainers.shou ];
};
passthru.tests.example = callPackage ./example.nix {
openapi-generator-cli = this;
};
};
in this

View File

@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
};
mvnHash = "sha256-1zn980QP48fWvm45HR1yDHdyzHYPkl/P0RpII+Zu+xc=";
mvnHash = "sha256-yqMAEjaNHxm/c/cbApiMjkN7V6Gx/crs1LPbD0k0cgk=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -4,16 +4,16 @@
, runtimeShell, gsettings-desktop-schemas }:
let
versionSuffix = "20230726175256.4464bfb32d";
versionSuffix = "20240101011938.ae7e4a1c15";
in
stdenv.mkDerivation rec {
pname = "keybase-gui";
version = "6.2.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
version = "6.2.4"; # Find latest version and versionSuffix from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
hash = "sha256-X3BJksdddTdxeUqVjzcq3cDRGRqmaYE7Z+eXtHoqbkg=";
hash = "sha256-XyGb9F83z8+OSjxOaO5k+h2qIY78ofS/ZfTXki54E5Q=";
};
nativeBuildInputs = [

View File

@ -721,6 +721,7 @@ mapAliases ({
opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
openafs_1_8 = openafs; # Added 2022-08-22
openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02
openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10
opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18
openconnect_head = openconnect_unstable; # Added 2022-03-29

View File

@ -568,8 +568,6 @@ with pkgs;
coost = callPackage ../development/libraries/coost { };
crc = callPackage ../applications/networking/cluster/crc { };
confetty = callPackage ../applications/misc/confetty { };
confy = callPackage ../applications/misc/confy { };
@ -11567,7 +11565,6 @@ with pkgs;
ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { };
openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };
openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; };
openboard = libsForQt5.callPackage ../applications/graphics/openboard { };
@ -12866,9 +12863,7 @@ with pkgs;
lua = lua5_4;
};
rpm-ostree = callPackage ../tools/misc/rpm-ostree {
gperf = gperf_3_0;
};
rpm-ostree = callPackage ../tools/misc/rpm-ostree { };
rpm2targz = callPackage ../tools/archivers/rpm2targz { };
@ -32987,6 +32982,8 @@ with pkgs;
inherit (callPackage ../applications/networking/cluster/k3s {
buildGoModule = buildGo120Module;
}) k3s_1_26 k3s_1_27 k3s_1_28;
inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_29;
k3s = k3s_1_27;
k3sup = callPackage ../applications/networking/cluster/k3sup { };
@ -33275,7 +33272,7 @@ with pkgs;
lame = callPackage ../development/libraries/lame { };
labwc = callPackage ../by-name/la/labwc/package.nix {
wlroots = wlroots_0_16;
wlroots = wlroots_0_17;
};
larswm = callPackage ../applications/window-managers/larswm { };

View File

@ -175,6 +175,7 @@ mapAliases ({
GeoIP = geoip; # added 2023-02-19
gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
github3_py = github3-py; # added 2024-01-04
GitPython = gitpython; # added 2022-10-28
glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
glasgow = throw "glasgow has been promoted to a top-level attribute"; # added 2023-02-05

View File

@ -3410,6 +3410,8 @@ self: super: with self; {
dropbox = callPackage ../development/python-modules/dropbox { };
dropmqttapi = callPackage ../development/python-modules/dropmqttapi { };
ds-store = callPackage ../development/python-modules/ds-store { };
ds4drv = callPackage ../development/python-modules/ds4drv { };
@ -4592,7 +4594,7 @@ self: super: with self; {
github-webhook = callPackage ../development/python-modules/github-webhook { };
github3_py = callPackage ../development/python-modules/github3_py { };
github3-py = callPackage ../development/python-modules/github3-py { };
gitignore-parser = callPackage ../development/python-modules/gitignore-parser { };