Merge master into staging-next
This commit is contained in:
commit
3135db28cb
25 changed files with 186 additions and 105 deletions
|
@ -554,6 +554,7 @@ in
|
|||
vikunja = handleTest ./vikunja.nix {};
|
||||
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
|
||||
vscodium = discoverTests (import ./vscodium.nix);
|
||||
vsftpd = handleTest ./vsftpd.nix {};
|
||||
wasabibackend = handleTest ./wasabibackend.nix {};
|
||||
wiki-js = handleTest ./wiki-js.nix {};
|
||||
wine = handleTest ./wine.nix {};
|
||||
|
|
42
nixos/tests/vsftpd.nix
Normal file
42
nixos/tests/vsftpd.nix
Normal file
|
@ -0,0 +1,42 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "vsftpd";
|
||||
|
||||
nodes = {
|
||||
server = {
|
||||
services.vsftpd = {
|
||||
enable = true;
|
||||
userlistDeny = false;
|
||||
localUsers = true;
|
||||
userlist = [ "ftp-test-user" ];
|
||||
writeEnable = true;
|
||||
localRoot = "/tmp";
|
||||
};
|
||||
networking.firewall.enable = false;
|
||||
|
||||
users = {
|
||||
users.ftp-test-user = {
|
||||
isSystemUser = true;
|
||||
password = "ftp-test-password";
|
||||
group = "ftp-test-group";
|
||||
};
|
||||
groups.ftp-test-group = {};
|
||||
};
|
||||
};
|
||||
|
||||
client = {};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
client.start()
|
||||
server.wait_for_unit("vsftpd")
|
||||
server.wait_for_open_port("21")
|
||||
|
||||
client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server")
|
||||
client.succeed('echo "this is a test" > /tmp/test.file.up')
|
||||
client.succeed("curl -v -T /tmp/test.file.up -u ftp-test-user:ftp-test-password ftp://server")
|
||||
client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server/test.file.up > /tmp/test.file.down")
|
||||
client.succeed("diff /tmp/test.file.up /tmp/test.file.down")
|
||||
assert client.succeed("cat /tmp/test.file.up") == server.succeed("cat /tmp/test.file.up")
|
||||
assert client.succeed("cat /tmp/test.file.down") == server.succeed("cat /tmp/test.file.up")
|
||||
'';
|
||||
})
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tauon";
|
||||
version = "7.1.2";
|
||||
version = "7.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "TauonMusicBox";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0/xWSae5TD5qI+HgoJ2DAHxqv/Z0E4DGiQhfTA03xkM=";
|
||||
sha256 = "sha256-UadE8qsQxRjE+POHLAUY1tRUInNXsMEqTAP02zSDSZ4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -221,6 +221,7 @@ let
|
|||
skanlite = callPackage ./skanlite.nix {};
|
||||
spectacle = callPackage ./spectacle.nix {};
|
||||
yakuake = callPackage ./yakuake.nix {};
|
||||
zanshin = callPackage ./zanshin.nix {};
|
||||
};
|
||||
|
||||
in lib.makeScope libsForQt5.newScope packages
|
||||
|
|
18
pkgs/applications/kde/zanshin.nix
Normal file
18
pkgs/applications/kde/zanshin.nix
Normal file
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules,
|
||||
akonadi-calendar, boost, kontactinterface, krunner
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "zanshin";
|
||||
meta = with lib; {
|
||||
description = "A powerful yet simple application to manage your day to day actions, getting your mind like water";
|
||||
homepage = "https://zanshin.kde.org/";
|
||||
maintainers = with maintainers; [ zraexy ];
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ akonadi-calendar boost kontactinterface krunner ];
|
||||
}
|
|
@ -20,8 +20,8 @@ let
|
|||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bottles";
|
||||
version = "2022.2.14-trento";
|
||||
sha256 = "GtVC3JfVoooJ+MuF9r1W3J8RfXNKalaIgecv1ner7GA=";
|
||||
version = "2022.2.28-trento-1";
|
||||
sha256 = "tE6YuuZZcs3RKxs1S6OoGt0CXz3oHUi/sopFN0iywds=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bottlesdevs";
|
||||
|
@ -99,6 +99,7 @@ python3Packages.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "An easy-to-use wineprefix manager";
|
||||
homepage = "https://usebottles.com/";
|
||||
downloadPage = "https://github.com/bottlesdevs/Bottles/releases";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ bloomvdomino psydvl shamilton ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neo";
|
||||
version = "0.6";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/st3w/neo/releases/download/v${version}/neo-${version}.tar.gz";
|
||||
sha256 = "sha256-skXLT1td4dGdsu+wbX44Z2u5sDEOKXYVVys4Q6RayIk=";
|
||||
sha256 = "sha256-pV5O1e/QpK8kjRYBinqq07YX7x06wF0pKiWKOKr0ank=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
, fetchurl
|
||||
, extra-cmake-modules
|
||||
, boost
|
||||
, akonadi-calendar
|
||||
, kontactinterface
|
||||
, krunner
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "zanshin";
|
||||
version = "21.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz";
|
||||
sha256 = "sha256-zMCV4KIrqeKHEsMbqEbnm/DgQiGxZbZXDVMuSSrXj8Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
akonadi-calendar
|
||||
kontactinterface
|
||||
krunner
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A powerful yet simple application to manage your day to day actions, getting your mind like water";
|
||||
homepage = "https://zanshin.kde.org/";
|
||||
maintainers = with maintainers; [ zraexy ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
|
@ -3,32 +3,41 @@
|
|||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, bash
|
||||
, coreutils
|
||||
, git
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
let
|
||||
version = "1.2.1";
|
||||
commit = "eed9dc7c82c5a7fbc13fd9b496e1faaec3f20d57";
|
||||
in buildGoModule {
|
||||
pname = "gg-scm";
|
||||
version = "1.1.0";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gg-scm";
|
||||
repo = "gg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk=";
|
||||
sha256 = "770c807403f5d99cea6450f889d268800e1c2563f0cd6142936741c40b29cc95";
|
||||
};
|
||||
patches = [ ./skip-broken-revert-tests.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/gg/editor_unix.go \
|
||||
--replace /bin/sh ${bash}/bin/sh
|
||||
'';
|
||||
subPackages = [ "cmd/gg" ];
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X" "main.versionInfo=${version}"
|
||||
"-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+"
|
||||
"-X" "main.buildCommit=${commit}"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk=";
|
||||
vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405";
|
||||
|
||||
nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ];
|
||||
buildInputs = [ git ];
|
||||
nativeBuildInputs = [ pandoc installShellFiles makeWrapper ];
|
||||
checkInputs = [ bash coreutils git ];
|
||||
buildInputs = [ bash git ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/gg --suffix PATH : ${git}/bin
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/cmd/gg/revert_test.go b/cmd/gg/revert_test.go
|
||||
index 9420e9b..ff6ca93 100644
|
||||
--- a/cmd/gg/revert_test.go
|
||||
+++ b/cmd/gg/revert_test.go
|
||||
@@ -592,6 +592,7 @@ func TestRevert_LocalRename(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestRevert_UnknownFile(t *testing.T) {
|
||||
+ t.Skip("Broken in 1.1.0")
|
||||
t.Parallel()
|
||||
t.Run("EmptyRepo", func(t *testing.T) {
|
||||
t.Parallel()
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook
|
||||
{ lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook
|
||||
, zlib, libzen, libmediainfo, curl, libmms, glib
|
||||
}:
|
||||
|
||||
|
@ -10,11 +10,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filebot";
|
||||
version = "4.9.4";
|
||||
version = "4.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
sha256 = "sha256-fz0B9P/UBrlKGPZkheMd/4cFnWHt+brS3zRTv4nVt9o=";
|
||||
url = "https://web.archive.org/web/20220226124706/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
sha256 = "sha256-LNvfAueDMd2TedK6bqnNG+J/4YhhbmUca9iyUkoUNkE=";
|
||||
};
|
||||
|
||||
unpackPhase = "tar xvf $src";
|
||||
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
--replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
|
||||
--replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license'
|
||||
wrapProgram $out/opt/filebot.sh \
|
||||
--prefix PATH : ${lib.makeBinPath [ openjdk11 ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ openjdk17 ]}
|
||||
# Expose the binary in bin to make runnable.
|
||||
ln -s $out/opt/filebot.sh $out/bin/filebot
|
||||
'';
|
||||
|
|
44
pkgs/applications/window-managers/i3/swallow.nix
Normal file
44
pkgs/applications/window-managers/i3/swallow.nix
Normal file
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, i3ipc
|
||||
, xlib
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "i3-swallow";
|
||||
version = "unstable-2022-02-19";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jamesofarrell";
|
||||
repo = "i3-swallow";
|
||||
rev = "6fbc04645c483fe733de56b56743e453693d4c78";
|
||||
sha256 = "1l3x8mixwq4n0lnyp0wz5vijgnypamq6lqjazcd2ywl2jv8d6fif";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
i3ipc
|
||||
xlib
|
||||
six
|
||||
];
|
||||
|
||||
# No tests available
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jamesofarrell/i3-swallow";
|
||||
description = "Swallow a terminal window in i3wm";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "swallow";
|
||||
maintainers = [ maintainers.ivar ];
|
||||
};
|
||||
}
|
|
@ -2,24 +2,24 @@
|
|||
, lib
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
, dosbox
|
||||
|
||||
# Docs cause an immense increase in build time, up to 2 additional hours
|
||||
, withDocs ? false
|
||||
, dosbox
|
||||
, ghostscript
|
||||
, withGUI ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-watcom-v2";
|
||||
version = "unstable-2022-01-18";
|
||||
version = "unstable-2022-02-22";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "f09e0c969c45679c048180f2dc6b3dbbe69e42a0";
|
||||
sha256 = "dEjG4L/VVufSAerKcXPUqZ7esz4m8/210ZshVz4SNAA=";
|
||||
rev = "9e25b3d6b8066f09b4f7131a31de1cf2af691e9a";
|
||||
sha256 = "1w336070kmhc6cmn2aqr8vm0fmw3yza2n0w4asvs2kqxjgmbn6i2";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -41,8 +41,7 @@ stdenv.mkDerivation rec {
|
|||
--replace '-static' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ ]
|
||||
++ lib.optional (withDocs || withGUI) dosbox
|
||||
nativeBuildInputs = [ dosbox ]
|
||||
++ lib.optional withDocs ghostscript;
|
||||
|
||||
configurePhase = ''
|
||||
|
@ -55,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
export OWGUINOBUILD=${if withGUI then "0" else "1"}
|
||||
export OWNOBUILD=
|
||||
export OWDISTRBUILD=0
|
||||
export OWDOSBOX=${lib.optionalString (withDocs || withGUI) "${dosbox}/bin/dosbox"}
|
||||
export OWDOSBOX=${dosbox}/bin/dosbox
|
||||
export OWVERBOSE=0
|
||||
export OWRELROOT=$out
|
||||
|
||||
|
|
|
@ -336,7 +336,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
|
||||
sha512 = "sha512-xLmVyO/L6C4ZdHzHqiJVq3ZfDWSym29x75JcwJx746ps61UcNEg4ozSwN9ud7UjXLntdXe1xDLNOUO1lc7LN5g==";
|
||||
sha512 = "sha512-dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA==";
|
||||
};
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
|
|
|
@ -43,13 +43,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-runner";
|
||||
version = "2.287.1";
|
||||
version = "2.288.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4SPrtX3j8blWTYnSkD2Z7IecZvI4xdAqHRJ1lBM0aAo=";
|
||||
hash = "sha256-vl8p+isoK+yczmsMO2YjnmJQW/k0jLgCUbhQa/wG650=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -184,6 +184,11 @@ stdenv.mkDerivation rec {
|
|||
"EnsureDotnetsdkPowershellDownloadScriptUpToDate"
|
||||
]
|
||||
++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ]
|
||||
# Tests for trimmed runner packages which aim at reducing the update size. Not relevant for Nix.
|
||||
++ map (x: "GitHub.Runner.Common.Tests.PackagesTrimL0.${x}") [
|
||||
"RunnerLayoutParts_CheckExternalsHash"
|
||||
"RunnerLayoutParts_CheckDotnetRuntimeHash"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
|
||||
# "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
|
||||
"GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
|
||||
|
|
|
@ -10,19 +10,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prisma-engines";
|
||||
version = "3.8.0";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
rev = version;
|
||||
sha256 = "sha256-pP5gNWRucr2rJqBPBt4Y/akf7tABFWhmr3EWC3/kj+g=";
|
||||
sha256 = "sha256-0m0RjIasEGB9QxZc7wKCMLnxHXkSlvCDA2QWa87mRRs=";
|
||||
};
|
||||
|
||||
# Use system openssl.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
cargoSha256 = "sha256-F105SOFWEhFVGMmPOEdBZwhNHCYkRh1HI7fESzL2uQw=";
|
||||
cargoSha256 = "sha256-KNQa+wLLl4abz48QKYkWu7A+FTGIyB+1EWAnLuWpJwc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "just";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Q5ROUXOeqZfIZdrYwP3uaCy+Nh1FggJRUaNF0mMN7d4=";
|
||||
sha256 = "sha256-ssc6djhSk0xV4jdlTmehWX6UMBPAuebtYlzWRZ/32mM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sCijb9/Of38IebulGmdqSewBRrOCH4RzFopFC0cOPrI=";
|
||||
cargoSha256 = "sha256-ynYK37nCfIiy1CHBEQ/vMHOAPY/pp/lF/tSl9MJD7fY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
|
|
@ -14,12 +14,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-aTi+EogY1aDWYq3anjRkjz1mzINVfUPQbOPHthxrvS4=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lsiutil.c \
|
||||
--replace /sbin/modprobe "${kmod}/bin/modprobe" \
|
||||
--replace /bin/mknod "${coreutils}/bin/mknod"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
gcc -Wall -O lsiutil.c -o lsiutil
|
||||
|
||||
runHook postBuild
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libcap, openssl, pam }:
|
||||
{ lib, stdenv, fetchurl, libcap, libseccomp, openssl, pam, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vsftpd";
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM=";
|
||||
};
|
||||
|
||||
buildInputs = [ libcap openssl pam ];
|
||||
buildInputs = [ libcap openssl libseccomp pam ];
|
||||
|
||||
patches = [ ./CVE-2015-1419.patch ];
|
||||
|
||||
|
@ -30,10 +30,14 @@ stdenv.mkDerivation rec {
|
|||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
|
||||
NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap -lseccomp";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) vsftpd; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A very secure FTP daemon";
|
||||
license = licenses.gpl2;
|
||||
|
|
|
@ -14,15 +14,15 @@ let
|
|||
inherit (lib) last splitString;
|
||||
|
||||
pname = "winbox";
|
||||
version = "3.34";
|
||||
version = "3.35";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
executable = fetchurl (if use64 then {
|
||||
url = "https://download.mikrotik.com/winbox/${version}/${pname}64.exe";
|
||||
sha256 = "1zr5qvdnr98xhwlhjikdnx3l5zyx6qnvxqy9p2hrayi0w4w5wmba";
|
||||
sha256 = "0jigjs4paci6h897hl1046ks5f812jfb2ihnp78lbah0294shjnj";
|
||||
} else {
|
||||
url = "https://download.mikrotik.com/winbox/${version}/${pname}.exe";
|
||||
sha256 = "1d5zif0f4xfiipjs281xwa3f3blfxbgzqppv3gg3rh5ivxwvaf6g";
|
||||
sha256 = "1a3cjhvh2z4n767aqqkv3a7wlda34ssgx9acigdcszgvbksbav1f";
|
||||
});
|
||||
# This is from the winbox AUR package:
|
||||
# https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boundary";
|
||||
version = "0.7.4";
|
||||
version = "0.7.5";
|
||||
|
||||
src =
|
||||
let
|
||||
|
@ -12,11 +12,13 @@ stdenv.mkDerivation rec {
|
|||
x86_64-linux = "linux_amd64";
|
||||
aarch64-linux = "linux_arm64";
|
||||
x86_64-darwin = "darwin_amd64";
|
||||
aarch64-darwin = "darwin_arm64";
|
||||
};
|
||||
sha256 = selectSystem {
|
||||
x86_64-linux = "sha256-5owLce0A7AwKDXB/JsUJZeHJHhrHT4/kA6XG+ZwhuyU=";
|
||||
aarch64-linux = "sha256-WDFIr+GOip70Di5u9fRu2lVWPMJe9urYTcuc2hTMD7g=";
|
||||
x86_64-darwin = "sha256-FGsY7+bC7n3fu1SsLl92FPytj8MgL4nT95CC6GM6vss=";
|
||||
x86_64-linux = "sha256-wqNeeEQhR8cj7Gpbzp7UQV0j+w0peo41uKqgK9BoLH4=";
|
||||
aarch64-linux = "sha256-HK/6eMBWUW1IbYE5RpInhcQuIw16X9vQEZmOBje9Yzk=";
|
||||
x86_64-darwin = "sha256-ghgkPlEN9DHFviQzcGS/+oG+9Qqy2AfJ2IEyiSMJwwY=";
|
||||
aarch64-darwin = "sha256-F4iOCxAm8s34KktuS5PRPkIg9A0179H6zlOM3OuTyUw=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
|
@ -60,7 +62,6 @@ stdenv.mkDerivation rec {
|
|||
and does not require an agent to be installed on every end host.
|
||||
'';
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ jk ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ jk techknowlogick ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -31,9 +31,11 @@ BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/ha
|
|||
BOUNDARY_LINUX_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_amd64")
|
||||
BOUNDARY_DARWIN_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_amd64")
|
||||
BOUNDARY_LINUX_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_arm64")
|
||||
BOUNDARY_DARWIN_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_arm64")
|
||||
|
||||
sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV"
|
||||
|
||||
replace_sha "x86_64-linux" "$BOUNDARY_LINUX_X64_SHA256"
|
||||
replace_sha "x86_64-darwin" "$BOUNDARY_DARWIN_X64_SHA256"
|
||||
replace_sha "aarch64-linux" "$BOUNDARY_LINUX_AARCH64_SHA256"
|
||||
replace_sha "aarch64-darwin" "$BOUNDARY_DARWIN_AARCH64_SHA256"
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alejandra";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kamadorueda";
|
||||
repo = "alejandra";
|
||||
rev = version;
|
||||
sha256 = "sha256-WgVEI+io05sUIMxdsYOWOJOVNeTDpDiDeTTbxoDFHZU=";
|
||||
sha256 = "sha256-jhmNDzNICcXc0p+Esi+uWCL1wOkGDyrJGBa0IEnkE08=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-AO/LTW9ogDRPns2uPXOvkXJUfeeI+beT7qUGi8IHiwk=";
|
||||
cargoSha256 = "sha256-4EtiF2W0J0OeguLDfjJbpHQKUZNtejxbTF1gNiP7SEQ=";
|
||||
|
||||
passthru.tests = {
|
||||
version = testVersion { package = alejandra; };
|
||||
|
|
|
@ -1433,6 +1433,7 @@ mapAliases ({
|
|||
plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace
|
||||
plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style
|
||||
sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake
|
||||
zanshin
|
||||
;
|
||||
|
||||
inherit (plasma5Packages.thirdParty)
|
||||
|
|
|
@ -26490,6 +26490,8 @@ with pkgs;
|
|||
|
||||
i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { };
|
||||
|
||||
i3-swallow = python3Packages.callPackage ../applications/window-managers/i3/swallow.nix { };
|
||||
|
||||
i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
|
||||
|
||||
i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };
|
||||
|
@ -30174,8 +30176,6 @@ with pkgs;
|
|||
|
||||
zammad = callPackage ../applications/networking/misc/zammad { };
|
||||
|
||||
zanshin = libsForQt5.callPackage ../applications/office/zanshin { };
|
||||
|
||||
zathuraPkgs = callPackage ../applications/misc/zathura { };
|
||||
zathura = zathuraPkgs.zathuraWrapper;
|
||||
|
||||
|
|
Loading…
Reference in a new issue