Merge master into staging-next
This commit is contained in:
commit
73cb9342e8
|
@ -22,7 +22,7 @@ NixOS - not necessarily the latest major release from upstream.
|
||||||
|
|
||||||
All available PHP attributes are wrappers around their respective
|
All available PHP attributes are wrappers around their respective
|
||||||
binary PHP package and provide commonly used extensions this way. The
|
binary PHP package and provide commonly used extensions this way. The
|
||||||
real PHP 7.4 package, i.e. the unwrapped one, is available as
|
real PHP 8.1 package, i.e. the unwrapped one, is available as
|
||||||
`php81.unwrapped`; see the next section for more details.
|
`php81.unwrapped`; see the next section for more details.
|
||||||
|
|
||||||
Interactive tools built on PHP are put in `php.packages`; composer is
|
Interactive tools built on PHP are put in `php.packages`; composer is
|
||||||
|
|
|
@ -34,6 +34,8 @@
|
||||||
|
|
||||||
- The [services.caddy.acmeCA](#opt-services.caddy.acmeCA) option now defaults to `null` instead of `"https://acme-v02.api.letsencrypt.org/directory"`, to use all of Caddy's default ACME CAs and enable Caddy's automatic issuer fallback feature by default, as recommended by upstream.
|
- The [services.caddy.acmeCA](#opt-services.caddy.acmeCA) option now defaults to `null` instead of `"https://acme-v02.api.letsencrypt.org/directory"`, to use all of Caddy's default ACME CAs and enable Caddy's automatic issuer fallback feature by default, as recommended by upstream.
|
||||||
|
|
||||||
|
- `php80` is no longer supported due to upstream not supporting this version anymore.
|
||||||
|
|
||||||
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
|
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
|
||||||
|
|
||||||
- The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`.
|
- The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`.
|
||||||
|
|
|
@ -97,7 +97,6 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf (cfg.provider != "libc") {
|
config = mkIf (cfg.provider != "libc") {
|
||||||
boot.kernel.sysctl."vm.max_map_count" = mkIf (cfg.provider == "graphene-hardened") (mkDefault 1048576);
|
|
||||||
environment.etc."ld-nix.so.preload".text = ''
|
environment.etc."ld-nix.so.preload".text = ''
|
||||||
${providerLibPath}
|
${providerLibPath}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -72,5 +72,8 @@ in
|
||||||
# Disable YAMA by default to allow easy debugging.
|
# Disable YAMA by default to allow easy debugging.
|
||||||
boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0;
|
boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0;
|
||||||
|
|
||||||
|
# Improve compatibility with applications that allocate
|
||||||
|
# a lot of memory, like modern games
|
||||||
|
boot.kernel.sysctl."vm.max_map_count" = mkDefault 1048576;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -337,7 +337,7 @@ let
|
||||||
|
|
||||||
phpPackage = mkOption {
|
phpPackage = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
relatedPackages = [ "php80" "php81" ];
|
relatedPackages = [ "php81" "php82" ];
|
||||||
default = pkgs.php81;
|
default = pkgs.php81;
|
||||||
defaultText = "pkgs.php81";
|
defaultText = "pkgs.php81";
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
|
|
|
@ -211,7 +211,7 @@ in {
|
||||||
};
|
};
|
||||||
phpPackage = mkOption {
|
phpPackage = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
relatedPackages = [ "php80" "php81" ];
|
relatedPackages = [ "php81" "php82" ];
|
||||||
defaultText = "pkgs.php";
|
defaultText = "pkgs.php";
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
PHP package to use for Nextcloud.
|
PHP package to use for Nextcloud.
|
||||||
|
|
|
@ -177,7 +177,7 @@ in {
|
||||||
"fs.inotify.max_queued_events" = 1048576;
|
"fs.inotify.max_queued_events" = 1048576;
|
||||||
"fs.inotify.max_user_instances" = 1048576;
|
"fs.inotify.max_user_instances" = 1048576;
|
||||||
"fs.inotify.max_user_watches" = 1048576;
|
"fs.inotify.max_user_watches" = 1048576;
|
||||||
"vm.max_map_count" = 262144;
|
"vm.max_map_count" = 262144; # TODO: Default vm.max_map_count has been increased system-wide
|
||||||
"kernel.dmesg_restrict" = 1;
|
"kernel.dmesg_restrict" = 1;
|
||||||
"net.ipv4.neigh.default.gc_thresh3" = 8192;
|
"net.ipv4.neigh.default.gc_thresh3" = 8192;
|
||||||
"net.ipv6.neigh.default.gc_thresh3" = 8192;
|
"net.ipv6.neigh.default.gc_thresh3" = 8192;
|
||||||
|
|
|
@ -593,7 +593,6 @@ in {
|
||||||
phosh = handleTest ./phosh.nix {};
|
phosh = handleTest ./phosh.nix {};
|
||||||
photoprism = handleTest ./photoprism.nix {};
|
photoprism = handleTest ./photoprism.nix {};
|
||||||
php = handleTest ./php {};
|
php = handleTest ./php {};
|
||||||
php80 = handleTest ./php { php = pkgs.php80; };
|
|
||||||
php81 = handleTest ./php { php = pkgs.php81; };
|
php81 = handleTest ./php { php = pkgs.php81; };
|
||||||
php82 = handleTest ./php { php = pkgs.php82; };
|
php82 = handleTest ./php { php = pkgs.php82; };
|
||||||
phylactery = handleTest ./web-apps/phylactery.nix {};
|
phylactery = handleTest ./web-apps/phylactery.nix {};
|
||||||
|
|
|
@ -45,6 +45,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
regular2 = foreground;
|
regular2 = foreground;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
etc."gpg-agent.conf".text = ''
|
||||||
|
pinentry-timeout 86400
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
fonts.fonts = [ pkgs.inconsolata ];
|
fonts.fonts = [ pkgs.inconsolata ];
|
||||||
|
@ -71,16 +75,53 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
enableOCR = true;
|
|
||||||
|
|
||||||
testScript = { nodes, ... }: ''
|
testScript = { nodes, ... }: ''
|
||||||
import shlex
|
import shlex
|
||||||
|
import json
|
||||||
|
|
||||||
def swaymsg(command: str, succeed=True):
|
q = shlex.quote
|
||||||
with machine.nested(f"sending swaymsg {command!r}" + " (allowed to fail)" * (not succeed)):
|
NODE_GROUPS = ["nodes", "floating_nodes"]
|
||||||
(machine.succeed if succeed else machine.execute)(
|
|
||||||
f"su - alice -c {shlex.quote('swaymsg -- ' + command)}"
|
|
||||||
)
|
def swaymsg(command: str = "", succeed=True, type="command"):
|
||||||
|
assert command != "" or type != "command", "Must specify command or type"
|
||||||
|
shell = q(f"swaymsg -t {q(type)} -- {q(command)}")
|
||||||
|
with machine.nested(
|
||||||
|
f"sending swaymsg {shell!r}" + " (allowed to fail)" * (not succeed)
|
||||||
|
):
|
||||||
|
ret = (machine.succeed if succeed else machine.execute)(
|
||||||
|
f"su - alice -c {shell}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# execute also returns a status code, but disregard.
|
||||||
|
if not succeed:
|
||||||
|
_, ret = ret
|
||||||
|
|
||||||
|
if not succeed and not ret:
|
||||||
|
return None
|
||||||
|
|
||||||
|
parsed = json.loads(ret)
|
||||||
|
return parsed
|
||||||
|
|
||||||
|
|
||||||
|
def walk(tree):
|
||||||
|
yield tree
|
||||||
|
for group in NODE_GROUPS:
|
||||||
|
for node in tree.get(group, []):
|
||||||
|
yield from walk(node)
|
||||||
|
|
||||||
|
|
||||||
|
def wait_for_window(pattern):
|
||||||
|
def func(last_chance):
|
||||||
|
nodes = (node["name"] for node in walk(swaymsg(type="get_tree")))
|
||||||
|
|
||||||
|
if last_chance:
|
||||||
|
nodes = list(nodes)
|
||||||
|
machine.log(f"Last call! Current list of windows: {nodes}")
|
||||||
|
|
||||||
|
return any(pattern in name for name in nodes)
|
||||||
|
|
||||||
|
retry(func)
|
||||||
|
|
||||||
start_all()
|
start_all()
|
||||||
machine.wait_for_unit("multi-user.target")
|
machine.wait_for_unit("multi-user.target")
|
||||||
|
@ -94,7 +135,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
|
|
||||||
# Test XWayland (foot does not support X):
|
# Test XWayland (foot does not support X):
|
||||||
swaymsg("exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty")
|
swaymsg("exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty")
|
||||||
machine.wait_for_text("alice@machine")
|
wait_for_window("alice@machine")
|
||||||
machine.send_chars("test-x11\n")
|
machine.send_chars("test-x11\n")
|
||||||
machine.wait_for_file("/tmp/test-x11-exit-ok")
|
machine.wait_for_file("/tmp/test-x11-exit-ok")
|
||||||
print(machine.succeed("cat /tmp/test-x11.out"))
|
print(machine.succeed("cat /tmp/test-x11.out"))
|
||||||
|
@ -106,7 +147,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
machine.send_key("alt-3")
|
machine.send_key("alt-3")
|
||||||
machine.sleep(3)
|
machine.sleep(3)
|
||||||
machine.send_key("alt-ret")
|
machine.send_key("alt-ret")
|
||||||
machine.wait_for_text("alice@machine")
|
wait_for_window("alice@machine")
|
||||||
machine.send_chars("test-wayland\n")
|
machine.send_chars("test-wayland\n")
|
||||||
machine.wait_for_file("/tmp/test-wayland-exit-ok")
|
machine.wait_for_file("/tmp/test-wayland-exit-ok")
|
||||||
print(machine.succeed("cat /tmp/test-wayland.out"))
|
print(machine.succeed("cat /tmp/test-wayland.out"))
|
||||||
|
@ -117,16 +158,24 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
|
|
||||||
# Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if
|
# Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if
|
||||||
# $WAYLAND_DISPLAY is correctly imported into the D-Bus user env):
|
# $WAYLAND_DISPLAY is correctly imported into the D-Bus user env):
|
||||||
swaymsg("exec gpg --no-tty --yes --quick-generate-key test")
|
swaymsg("exec mkdir -p ~/.gnupg")
|
||||||
|
swaymsg("exec cp /etc/gpg-agent.conf ~/.gnupg")
|
||||||
|
|
||||||
|
swaymsg("exec DISPLAY=INVALID gpg --no-tty --yes --quick-generate-key test", succeed=False)
|
||||||
machine.wait_until_succeeds("pgrep --exact gpg")
|
machine.wait_until_succeeds("pgrep --exact gpg")
|
||||||
machine.wait_for_text("Passphrase")
|
wait_for_window("gpg")
|
||||||
|
machine.succeed("pgrep --exact gpg")
|
||||||
machine.screenshot("gpg_pinentry")
|
machine.screenshot("gpg_pinentry")
|
||||||
machine.send_key("alt-shift-q")
|
machine.send_key("alt-shift-q")
|
||||||
machine.wait_until_fails("pgrep --exact gpg")
|
machine.wait_until_fails("pgrep --exact gpg")
|
||||||
|
|
||||||
# Test swaynag:
|
# Test swaynag:
|
||||||
|
def get_height():
|
||||||
|
return [node['rect']['height'] for node in walk(swaymsg(type="get_tree")) if node['focused']][0]
|
||||||
|
|
||||||
|
before = get_height()
|
||||||
machine.send_key("alt-shift-e")
|
machine.send_key("alt-shift-e")
|
||||||
machine.wait_for_text("You pressed the exit shortcut.")
|
retry(lambda _: get_height() < before)
|
||||||
machine.screenshot("sway_exit")
|
machine.screenshot("sway_exit")
|
||||||
|
|
||||||
swaymsg("exec swaylock")
|
swaymsg("exec swaylock")
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pt2-clone";
|
pname = "pt2-clone";
|
||||||
version = "1.59";
|
version = "1.60";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "8bitbubsy";
|
owner = "8bitbubsy";
|
||||||
repo = "pt2-clone";
|
repo = "pt2-clone";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Hv2ZM01aDyBcmdbK+7C20zncvCeZSQ61BJ7zTSM/OA8=";
|
sha256 = "sha256-hV73omi5Eedk0RgYvIMruTa9lfuduvcXoIpdS5Cg0xk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -22,22 +21,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sound-juicer";
|
pname = "sound-juicer";
|
||||||
version = "3.38.0";
|
version = "3.40.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf";
|
sha256 = "LuiCdEORvrTG1koPaCX7dlUQtwbsK3BL+0LkKvquHeY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix build with meson 0.61
|
|
||||||
# data/meson.build:2:5: ERROR: Function does not take positional arguments.
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.gnome.org/GNOME/sound-juicer/-/commit/9f97ca1faca396099f52264a9729aa355f8d122e.patch";
|
|
||||||
sha256 = "8JllVSQgI7KiBI5WP6QtXRiggYuD89NSJJp1hP4Dbao=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
|
|
@ -1,67 +0,0 @@
|
||||||
{ lib, stdenv
|
|
||||||
, fetchFromGitHub
|
|
||||||
, pkg-config
|
|
||||||
, python3
|
|
||||||
, fftw
|
|
||||||
, libGL
|
|
||||||
, libX11
|
|
||||||
, libjack2
|
|
||||||
, liblo
|
|
||||||
, lv2
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
# this is what upstream calls the package, see:
|
|
||||||
# https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2
|
|
||||||
pname = "uhhyou.lv2";
|
|
||||||
version = "unstable-2021-02-08";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "ryukau";
|
|
||||||
repo = "LV2Plugins";
|
|
||||||
rev = "df67460fc344f94db4306d4ee21e4207e657bbee";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
sha256 = "1a23av35cw26zgq93yzmmw35084hsj29cb7sb04j2silv5qisila";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config python3 ];
|
|
||||||
|
|
||||||
buildInputs = [ fftw libGL libX11 libjack2 liblo lv2 ];
|
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=$(out)" ];
|
|
||||||
|
|
||||||
prePatch = ''
|
|
||||||
patchShebangs generate-ttl.sh patch.sh patch/apply.sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Audio plugins for Linux";
|
|
||||||
longDescription = ''
|
|
||||||
Plugin List:
|
|
||||||
- CollidingCombSynth
|
|
||||||
- CubicPadSynth
|
|
||||||
- EnvelopedSine
|
|
||||||
- EsPhaser
|
|
||||||
- FDNCymbal
|
|
||||||
- FoldShaper
|
|
||||||
- IterativeSinCluster
|
|
||||||
- L3Reverb
|
|
||||||
- L4Reverb
|
|
||||||
- LatticeReverb
|
|
||||||
- LightPadSynth
|
|
||||||
- ModuloShaper
|
|
||||||
- OddPowShaper
|
|
||||||
- SevenDelay
|
|
||||||
- SoftClipper
|
|
||||||
- SyncSawSynth
|
|
||||||
- TrapezoidSynth
|
|
||||||
- WaveCymbal
|
|
||||||
'';
|
|
||||||
homepage = "https://github.com/ryukau/LV2Plugins/";
|
|
||||||
license = licenses.gpl3Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.magnetophon ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "featherpad";
|
pname = "featherpad";
|
||||||
version = "1.4.0";
|
version = "1.4.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tsujan";
|
owner = "tsujan";
|
||||||
repo = "FeatherPad";
|
repo = "FeatherPad";
|
||||||
rev = "V${version}";
|
rev = "V${version}";
|
||||||
sha256 = "sha256-6hu8r38hrQEt0vaO9XA+KaWPuWYcBdydpjEf2V+m5xY=";
|
sha256 = "sha256-8IT/PxLz6BsLHzY5pM0bTlAO0xvfC7/aI7+Gbw2LyME=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config qttools ];
|
nativeBuildInputs = [ cmake pkg-config qttools ];
|
||||||
|
|
|
@ -28,13 +28,13 @@
|
||||||
|
|
||||||
buildDotnetModule rec {
|
buildDotnetModule rec {
|
||||||
pname = "ryujinx";
|
pname = "ryujinx";
|
||||||
version = "1.1.897"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
version = "1.1.898"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Ryujinx";
|
owner = "Ryujinx";
|
||||||
repo = "Ryujinx";
|
repo = "Ryujinx";
|
||||||
rev = "f9a538bb0f02b4665f8cccbde0730e08da208024";
|
rev = "649d372f7da8559f8b6d74ca44af64ba7d7853c4";
|
||||||
sha256 = "07y4235bjd2a3fssm6y2hdkzsriwlb7sdblmj6qjl55qh4q6xrqw";
|
sha256 = "0vi87qd99dzshg4raiw158b3d5l62y359kandfabjqbjn7614bpp";
|
||||||
};
|
};
|
||||||
|
|
||||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||||
|
|
|
@ -27,13 +27,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "xemu";
|
pname = "xemu";
|
||||||
version = "0.7.95";
|
version = "0.7.96";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xemu-project";
|
owner = "xemu-project";
|
||||||
repo = "xemu";
|
repo = "xemu";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-JZEDVmW1Q+nAFv8oVaYl7w41Mvm+L/t8PamkkE1FaIk=";
|
hash = "sha256-6lEQotqVrfK+A67nTEKeqY70LrQRdH9dUGlzOt5CWZ0=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,13 +17,13 @@ let
|
||||||
'';
|
'';
|
||||||
in mkDerivation rec {
|
in mkDerivation rec {
|
||||||
pname = "deadd-notification-center";
|
pname = "deadd-notification-center";
|
||||||
version = "2.0.3";
|
version = "2.0.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "phuhl";
|
owner = "phuhl";
|
||||||
repo = "linux_notification_center";
|
repo = "linux_notification_center";
|
||||||
rev = "${version}";
|
rev = "${version}";
|
||||||
hash = "sha256-OM4zzKdo0HMvzAl7BG9IuSHmTauSC5rLWoJJOAshDYg=";
|
hash = "sha256-ascg31HsHeXKhvMNntiRLuZ4+T2+fokfDhZ3c8N/Gzg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
isLibrary = false;
|
isLibrary = false;
|
||||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -371,6 +371,7 @@ buildStdenv.mkDerivation ({
|
||||||
export MOZILLA_OFFICIAL=1
|
export MOZILLA_OFFICIAL=1
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
# linking firefox hits the vm.max_map_count kernel limit with the default musl allocator
|
# linking firefox hits the vm.max_map_count kernel limit with the default musl allocator
|
||||||
|
# TODO: Default vm.max_map_count has been increased, retest without this
|
||||||
export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so
|
export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -51,11 +51,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "opera";
|
pname = "opera";
|
||||||
version = "99.0.4788.65";
|
version = "99.0.4788.77";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||||
hash = "sha256-B57yTunq6wQTjYMYvocy1A3//I22w0TTUcK1bohpp2U=";
|
hash = "sha256-VdhUyXKqQaIpvwE4izQXIVdyDHfW7FQLfiiUBop70rI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
unpackPhase = "dpkg-deb -x $src .";
|
unpackPhase = "dpkg-deb -x $src .";
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "circumflex";
|
pname = "circumflex";
|
||||||
version = "2.9.1";
|
version = "3.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bensadeh";
|
owner = "bensadeh";
|
||||||
repo = "circumflex";
|
repo = "circumflex";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-FgmtRARNyvO+Ivhwr2S12GLX+vlTFnsClXv1Y7sTCmU=";
|
hash = "sha256-GIA49Syk22T0efxqmR3OgQpxpcEZnCicq8sj9CXdIhQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-p4lIIu3rkzb1EfJ4GJeXPgQlxGN1dqyTlIC9BOE1o/Y=";
|
vendorHash = "sha256-ms7TvCXQdkrlWp1pGj3ja+ACodt7z6sP3E373xHxA34=";
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ let
|
||||||
versions = if stdenv.isLinux then {
|
versions = if stdenv.isLinux then {
|
||||||
stable = "0.0.27";
|
stable = "0.0.27";
|
||||||
ptb = "0.0.42";
|
ptb = "0.0.42";
|
||||||
canary = "0.0.158";
|
canary = "0.0.160";
|
||||||
development = "0.0.216";
|
development = "0.0.216";
|
||||||
} else {
|
} else {
|
||||||
stable = "0.0.273";
|
stable = "0.0.273";
|
||||||
|
@ -24,7 +24,7 @@ let
|
||||||
};
|
};
|
||||||
canary = fetchurl {
|
canary = fetchurl {
|
||||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||||
sha256 = "sha256-vEkH8erhTP03/hU3TJqAULgaZMfTJl/zPrebEBa5ktA=";
|
sha256 = "sha256-fsltWhCQ/jSxdELngRlpOsdH7gXl1WW5euZsrEQgkm0=";
|
||||||
};
|
};
|
||||||
development = fetchurl {
|
development = fetchurl {
|
||||||
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "ircdog";
|
pname = "ircdog";
|
||||||
version = "0.5.0";
|
version = "0.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "goshuirc";
|
owner = "goshuirc";
|
||||||
repo = "ircdog";
|
repo = "ircdog";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-3fOui17ZederpnB7jZh7GsYa12VKvhb3wwOnVFi23wM=";
|
hash = "sha256-nXXSHNQp+yFfgY/VPqaMLM6lv4oYE97rdgHYW+0+L9g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorHash = null;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes";
|
description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes";
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildGo120Module
|
, buildGoModule
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, gitUpdater
|
, gitUpdater
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
|
@ -9,20 +9,20 @@
|
||||||
, shellhub-agent
|
, shellhub-agent
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGo120Module rec {
|
buildGoModule rec {
|
||||||
pname = "shellhub-agent";
|
pname = "shellhub-agent";
|
||||||
version = "0.12.2";
|
version = "0.12.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "shellhub-io";
|
owner = "shellhub-io";
|
||||||
repo = "shellhub";
|
repo = "shellhub";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "9ZOLbws2jRjUK3IK2HnRF6TDk3ZXAtE/oCjAR5BjqlM=";
|
hash = "sha256-WKMy2JttXFRcW1yb5aQ6xe8BoSoN65K8Hlmac62+QPc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
modRoot = "./agent";
|
modRoot = "./agent";
|
||||||
|
|
||||||
vendorSha256 = "sha256-7T2MWwcq99AF8d/DM2n8xROroRSqiEKY+58x9UZ3fow=";
|
vendorHash = "sha256-BqzpQcL3U6SIrDW5NfBG0D2zyvv1zNu7uoOBYmKbF4Y=";
|
||||||
|
|
||||||
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
|
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
|
||||||
|
|
||||||
|
|
|
@ -6,11 +6,12 @@
|
||||||
, fftw
|
, fftw
|
||||||
, blas
|
, blas
|
||||||
, lapack
|
, lapack
|
||||||
, withMPI ? false
|
|
||||||
, mpi
|
|
||||||
, cmake
|
, cmake
|
||||||
|
, pkg-config
|
||||||
# Available list of packages can be found near here:
|
# Available list of packages can be found near here:
|
||||||
# https://github.com/lammps/lammps/blob/develop/cmake/CMakeLists.txt#L222
|
#
|
||||||
|
# - https://github.com/lammps/lammps/blob/develop/cmake/CMakeLists.txt#L222
|
||||||
|
# - https://docs.lammps.org/Build_extras.html
|
||||||
, packages ? {
|
, packages ? {
|
||||||
ASPHERE = true;
|
ASPHERE = true;
|
||||||
BODY = true;
|
BODY = true;
|
||||||
|
@ -35,6 +36,10 @@
|
||||||
SRD = true;
|
SRD = true;
|
||||||
REAXFF = true;
|
REAXFF = true;
|
||||||
}
|
}
|
||||||
|
# Extra cmakeFlags to add as "-D${attr}=${value}"
|
||||||
|
, extraCmakeFlags ? {}
|
||||||
|
# Extra `buildInputs` - meant for packages that require more inputs
|
||||||
|
, extraBuildInputs ? []
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -53,14 +58,22 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit mpi;
|
# Remove these at some point - perhaps after release 23.11. See discussion at:
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/238771#discussion_r1235459961
|
||||||
|
mpi = throw "`lammps-mpi.passthru.mpi` was removed in favor of `extraBuildInputs`";
|
||||||
inherit packages;
|
inherit packages;
|
||||||
|
inherit extraCmakeFlags;
|
||||||
|
inherit extraBuildInputs;
|
||||||
};
|
};
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
] ++ (builtins.map (p: "-DPKG_${p}=ON") (builtins.attrNames (lib.filterAttrs (n: v: v) packages)));
|
]
|
||||||
|
++ (builtins.map (p: "-DPKG_${p}=ON") (builtins.attrNames (lib.filterAttrs (n: v: v) packages)))
|
||||||
|
++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags)
|
||||||
|
;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
fftw
|
fftw
|
||||||
|
@ -68,9 +81,8 @@ stdenv.mkDerivation rec {
|
||||||
blas
|
blas
|
||||||
lapack
|
lapack
|
||||||
gzip
|
gzip
|
||||||
] ++ lib.optionals withMPI [
|
] ++ extraBuildInputs
|
||||||
mpi
|
;
|
||||||
];
|
|
||||||
|
|
||||||
# For backwards compatibility
|
# For backwards compatibility
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
, v4l-utils }:
|
, v4l-utils }:
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "webcamoid";
|
pname = "webcamoid";
|
||||||
version = "9.0.0";
|
version = "9.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
sha256 = "sha256-NV1BmG+fgy+ZcvHl+05VX5J1BAz8PxKiZ3z9BxjhMU0=";
|
sha256 = "sha256-E2hHFrksJtdDLWiX7wL1z9LBbBKT04a853V8u+WiwbA=";
|
||||||
rev = version;
|
rev = version;
|
||||||
repo = "webcamoid";
|
repo = "webcamoid";
|
||||||
owner = "webcamoid";
|
owner = "webcamoid";
|
||||||
|
|
|
@ -43,13 +43,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "evince";
|
pname = "evince";
|
||||||
version = "44.1";
|
version = "44.2";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "Fa/TuxX/s4/sqzTCM1CVCtJwqwOoW5TjM9ndfuanQxQ=";
|
sha256 = "mnXH/49ZkhjQcOCftAgssm+bhjcKm/rpjhqstWTWdd0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "abcl";
|
pname = "abcl";
|
||||||
version = "1.9.1";
|
version = "1.9.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
|
url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
|
||||||
sha256 = "sha256-pbxnfJRB9KgzwgpUG93Rb/+SZIRmkd6aHa9mmfj/EeI=";
|
sha256 = "sha256-Ti9Lj4Xi2V2V5b282foXrWExoX4vzxK8Gf+5e0i8HTg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
|
|
|
@ -273,8 +273,8 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
crystal_1_8 = generic {
|
crystal_1_8 = generic {
|
||||||
version = "1.8.1";
|
version = "1.8.2";
|
||||||
sha256 = "sha256-t+1vM1m62UftCvfa90Dg6nqt6Zseh/GP/Gc1VfOa4+c=";
|
sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8=";
|
||||||
binary = binaryCrystal_1_2;
|
binary = binaryCrystal_1_2;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,53 +0,0 @@
|
||||||
{ callPackage, lib, stdenv, ... }@_args:
|
|
||||||
|
|
||||||
let
|
|
||||||
base = callPackage ./generic.nix (_args // {
|
|
||||||
version = "8.0.29";
|
|
||||||
hash = "sha256-SAGh8OFxcChnI6tUrNBFrHipZWAh1W8QSmRUPuySLhI=";
|
|
||||||
});
|
|
||||||
|
|
||||||
in
|
|
||||||
base.withExtensions ({ all, ... }: with all; ([
|
|
||||||
bcmath
|
|
||||||
calendar
|
|
||||||
curl
|
|
||||||
ctype
|
|
||||||
dom
|
|
||||||
exif
|
|
||||||
fileinfo
|
|
||||||
filter
|
|
||||||
ftp
|
|
||||||
gd
|
|
||||||
gettext
|
|
||||||
gmp
|
|
||||||
iconv
|
|
||||||
imap
|
|
||||||
intl
|
|
||||||
ldap
|
|
||||||
mbstring
|
|
||||||
mysqli
|
|
||||||
mysqlnd
|
|
||||||
opcache
|
|
||||||
openssl
|
|
||||||
pcntl
|
|
||||||
pdo
|
|
||||||
pdo_mysql
|
|
||||||
pdo_odbc
|
|
||||||
pdo_pgsql
|
|
||||||
pdo_sqlite
|
|
||||||
pgsql
|
|
||||||
posix
|
|
||||||
readline
|
|
||||||
session
|
|
||||||
simplexml
|
|
||||||
sockets
|
|
||||||
soap
|
|
||||||
sodium
|
|
||||||
sysvsem
|
|
||||||
sqlite3
|
|
||||||
tokenizer
|
|
||||||
xmlreader
|
|
||||||
xmlwriter
|
|
||||||
zip
|
|
||||||
zlib
|
|
||||||
]))
|
|
|
@ -247,8 +247,7 @@ let
|
||||||
++ lib.optional (!ipv6Support) "--disable-ipv6"
|
++ lib.optional (!ipv6Support) "--disable-ipv6"
|
||||||
++ lib.optional systemdSupport "--with-fpm-systemd"
|
++ lib.optional systemdSupport "--with-fpm-systemd"
|
||||||
++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}"
|
++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}"
|
||||||
++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts"
|
++ lib.optional ztsSupport "--enable-zts"
|
||||||
++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts"
|
|
||||||
|
|
||||||
|
|
||||||
# Sendmail
|
# Sendmail
|
||||||
|
|
|
@ -16,13 +16,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fb303";
|
pname = "fb303";
|
||||||
version = "2023.04.24.00";
|
version = "2023.06.12.00";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "facebook";
|
owner = "facebook";
|
||||||
repo = "fb303";
|
repo = "fb303";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-dhqHv+A4uak1FxKNqIsYlQl2WiP5+Y9I83pumpFbJDA=";
|
sha256 = "sha256-nUOPYb5/tLyHjaZDvKuq0vdu4L7XOmO8R9nNLGAzeLI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -9,19 +9,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnome-video-effects";
|
pname = "gnome-video-effects";
|
||||||
version = "0.5.0";
|
version = "0.6.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd";
|
sha256 = "166utGs/WoMvsuDZC0K/jGFgICylKsmt0Xr84ZLjyKg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix effectsdir in .pc file
|
|
||||||
# https://gitlab.gnome.org/GNOME/gnome-video-effects/commit/955404195ada606819974dd63c48956f25611e14
|
|
||||||
./fix-pc-file.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
# Can't use pkgconfig helper https://github.com/mesonbuild/meson/issues/2253
|
|
||||||
conf = configuration_data()
|
|
||||||
conf.set('prefix', prefix)
|
|
||||||
-conf.set('datarootdir', pkgdatadir)
|
|
||||||
+conf.set('datarootdir', datadir)
|
|
||||||
conf.set('VERSION', meson.project_version())
|
|
||||||
|
|
||||||
pkg = configure_file(configuration: conf,
|
|
|
@ -14,9 +14,13 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY=";
|
sha256 = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preBuild = ''
|
sourceRoot = "source/c";
|
||||||
cd c/
|
|
||||||
'';
|
nativeBuildInputs = lib.optionals stdenv.cc.isClang [
|
||||||
|
stdenv.cc.cc.libllvm.out
|
||||||
|
];
|
||||||
|
|
||||||
|
makeFlags = lib.optionals stdenv.cc.isClang [ "AR=llvm-ar" ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
@ -34,7 +38,6 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ mcbeth AndersonTorres ];
|
maintainers = with maintainers; [ mcbeth AndersonTorres ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
broken = stdenv.isDarwin;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
# TODO: build the other languages
|
# TODO: build the other languages
|
||||||
|
|
|
@ -597,6 +597,11 @@ final: prev: {
|
||||||
|
|
||||||
wrangler = prev.wrangler.override (oldAttrs: {
|
wrangler = prev.wrangler.override (oldAttrs: {
|
||||||
meta = oldAttrs.meta // { broken = before "16.13"; };
|
meta = oldAttrs.meta // { broken = before "16.13"; };
|
||||||
|
buildInputs = [ pkgs.llvmPackages.libcxx pkgs.llvmPackages.libunwind ] ++ lib.optional stdenv.isLinux pkgs.autoPatchelfHook;
|
||||||
|
preFixup = ''
|
||||||
|
# patch elf is trying to patch binary for sunos
|
||||||
|
rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64
|
||||||
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
yaml-language-server = prev.yaml-language-server.override {
|
yaml-language-server = prev.yaml-language-server.override {
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, python3Packages
|
||||||
|
, poetry-core
|
||||||
|
, tkinter
|
||||||
|
, pythonRelaxDepsHook
|
||||||
|
, pytestCheckHook
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "async-tkinter-loop";
|
||||||
|
version = "0.8.1";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit version;
|
||||||
|
pname = "async_tkinter_loop";
|
||||||
|
hash = "sha256-+9AvnYIZMWCbpCEKdbIadyU8zgyUlW/fRYYyDOxAzeg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pythonRelaxDepsHook
|
||||||
|
poetry-core
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
tkinter
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonRemoveDeps = [
|
||||||
|
"asyncio"
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"async_tkinter_loop"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Implementation of asynchronous mainloop for tkinter, the use of which allows using async handler functions";
|
||||||
|
homepage = "https://github.com/insolor/async-tkinter-loop";
|
||||||
|
changelog = "https://github.com/insolor/async-tkinter-loop/releases/tag/${version}";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ AngryAnt ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -15,14 +15,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-datastore";
|
pname = "google-cloud-datastore";
|
||||||
version = "2.15.2";
|
version = "2.16.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-PnPP7FRrxKyuYTcFuSZdwUs+Ff06yPyJ8Omk6Zaufv0=";
|
hash = "sha256-70n9jgOvR5OYWBPKSR50E1ST/60uGzlbsiYXCkJNo18=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -8,11 +8,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ijson";
|
pname = "ijson";
|
||||||
version = "3.2.0.post0";
|
version = "3.2.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-gKW9fpkjyrIAcB9nrSNyEEMouZ3fJJ276INBAshS0xY=";
|
hash = "sha256-uYg8hxYAHXpcgYWQUgjkCnfu+bKnPbzk0YnOsJKqk70=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -2,24 +2,22 @@
|
||||||
, lib
|
, lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, setuptools
|
, setuptools
|
||||||
, pint
|
, pint
|
||||||
, pandas
|
, pandas
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage {
|
buildPythonPackage rec {
|
||||||
pname = "pint-pandas";
|
pname = "pint-pandas";
|
||||||
# Latest release contains bugs and failing tests.
|
version = "0.4";
|
||||||
version = "unstable-2022-11-24";
|
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hgrecco";
|
owner = "hgrecco";
|
||||||
repo = "pint-pandas";
|
repo = "pint-pandas";
|
||||||
rev = "c58a7fcf9123eb65f5e78845077b205e20279b9d";
|
rev = version;
|
||||||
hash = "sha256-gMZNJSJxtSZvgU4o71ws5ZA6tgD2M5c5oOrn62DRyMI=";
|
hash = "sha256-FuH6wksSCkkL2AyQN46hwTnfeAZFwkWRl6KEEhsxmUY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -36,7 +34,7 @@ buildPythonPackage {
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
broken = stdenv.isDarwin;
|
||||||
description = "Pandas support for pint";
|
description = "Pandas support for pint";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
homepage = "https://github.com/hgrecco/pint-pandas";
|
homepage = "https://github.com/hgrecco/pint-pandas";
|
||||||
|
|
|
@ -8,14 +8,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pydata-google-auth";
|
pname = "pydata-google-auth";
|
||||||
version = "1.7.0";
|
version = "1.8.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
repo = pname;
|
repo = pname;
|
||||||
owner = "pydata";
|
owner = "pydata";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-VJmu7VExWmXBa0cjgppyOgWDLDRMdhOoaOrZoi4WAxo=";
|
hash = "sha256-PMQj+ySdin02MUBIumyW/PvCGqUhmloDCnBFJggd4I8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -8,22 +8,21 @@
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, requests
|
, requests
|
||||||
, six
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyopnsense";
|
pname = "pyopnsense";
|
||||||
version = "0.3.0";
|
version = "0.4.0";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "06rssdb3zhccnm63z96mw5yd38d9i99fgigfcdxn9divalbbhp5a";
|
hash = "sha256-3DKlVrOtMa55gTu557pgojRpdgrO5pEZ3L+9gKoW9yg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
pbr
|
pbr
|
||||||
six
|
|
||||||
requests
|
requests
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -34,11 +33,14 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "pyopnsense" ];
|
pythonImportsCheck = [
|
||||||
|
"pyopnsense"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python client for the OPNsense API";
|
description = "Python client for the OPNsense API";
|
||||||
homepage = "https://github.com/mtreinish/pyopnsense";
|
homepage = "https://github.com/mtreinish/pyopnsense";
|
||||||
|
changelog = "https://github.com/mtreinish/pyopnsense/releases/tag/${version}";
|
||||||
license = with licenses; [ gpl3Plus ];
|
license = with licenses; [ gpl3Plus ];
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-utils";
|
pname = "python-utils";
|
||||||
version = "3.6.0";
|
version = "3.7.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||||
owner = "WoLpH";
|
owner = "WoLpH";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-D4HmmXIiy1mOEE7lxy9ddeqMxR8l1+k8WgDFPeTVHUE=";
|
hash = "sha256-WSP5LQQZnm9k0v/xbsUHgQiwmhcb2Uw9BQurC1ieMjI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "textual";
|
pname = "textual";
|
||||||
version = "0.28.0";
|
version = "0.28.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||||
owner = "Textualize";
|
owner = "Textualize";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-Ei9tn1o28lvMKBYIN7vglYpr6rxq/2OiJtbeeZZH5Os=";
|
hash = "sha256-tSCMKM9Wv4crl6SLcIc2r6QY6U3RBTW8yfAjkYLV3eE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,23 +1,23 @@
|
||||||
{ lib
|
{ lib
|
||||||
|
, argcomplete
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, substituteAll
|
|
||||||
, argcomplete
|
|
||||||
, pyyaml
|
|
||||||
, toml
|
|
||||||
, xmltodict
|
|
||||||
, jq
|
, jq
|
||||||
, setuptools-scm
|
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pyyaml
|
||||||
|
, setuptools-scm
|
||||||
|
, substituteAll
|
||||||
|
, tomlkit
|
||||||
|
, xmltodict
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "yq";
|
pname = "yq";
|
||||||
version = "3.1.1";
|
version = "3.2.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-hT80KxVi3e6XkDjsjs7lQFzdm2p8uB7WzbgBjJ6AJjM=";
|
hash = "sha256-jbt6DJN92/w90XXmR49AlgwUDT6LHxoDFd52OE1mZQo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -32,10 +32,10 @@ buildPythonPackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
pyyaml
|
|
||||||
xmltodict
|
|
||||||
toml
|
|
||||||
argcomplete
|
argcomplete
|
||||||
|
pyyaml
|
||||||
|
tomlkit
|
||||||
|
xmltodict
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
|
|
|
@ -12,24 +12,27 @@
|
||||||
, glib
|
, glib
|
||||||
, gtk3
|
, gtk3
|
||||||
, gtk4
|
, gtk4
|
||||||
|
, gtksourceview4
|
||||||
, libadwaita
|
, libadwaita
|
||||||
, libhandy
|
, libhandy
|
||||||
, webkitgtk
|
, webkitgtk_4_1
|
||||||
|
, webkitgtk_6_0
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "cambalache";
|
pname = "cambalache";
|
||||||
version = "0.10.3";
|
version = "0.12.1";
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
|
# Did not fetch submodule since it is only for tests we don't run.
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
owner = "jpu";
|
owner = "jpu";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Xm8h3BBRibdLCeI/OeprF5dCCiNrfJCg7aE24uleCds=";
|
sha256 = "sha256-kGCpccWIhaeWrzLlrDI7Vzd0KuAIKxvLrDuSqWtpSLU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -51,7 +54,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
glib
|
glib
|
||||||
gtk3
|
gtk3
|
||||||
gtk4
|
gtk4
|
||||||
webkitgtk
|
gtksourceview4
|
||||||
|
webkitgtk_4_1
|
||||||
|
webkitgtk_6_0
|
||||||
# For extra widgets support.
|
# For extra widgets support.
|
||||||
libadwaita
|
libadwaita
|
||||||
libhandy
|
libhandy
|
||||||
|
@ -63,7 +68,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs postinstall.py
|
patchShebangs postinstall.py
|
||||||
# those programs are used at runtime not build time
|
# those programs are used at runtime not build time
|
||||||
# https://gitlab.gnome.org/jpu/cambalache/-/blob/main/meson.build#L79-80
|
# https://gitlab.gnome.org/jpu/cambalache/-/blob/0.12.1/meson.build#L79-80
|
||||||
substituteInPlace ./meson.build \
|
substituteInPlace ./meson.build \
|
||||||
--replace "find_program('broadwayd', required: true)" "" \
|
--replace "find_program('broadwayd', required: true)" "" \
|
||||||
--replace "find_program('gtk4-broadwayd', required: true)" ""
|
--replace "find_program('gtk4-broadwayd', required: true)" ""
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "acr";
|
pname = "acr";
|
||||||
version = "2.1.1";
|
version = "2.1.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "radareorg";
|
owner = "radareorg";
|
||||||
repo = "acr";
|
repo = "acr";
|
||||||
rev = finalAttrs.version;
|
rev = finalAttrs.version;
|
||||||
hash = "sha256-JReYgIqQISQuLPd4pUbqbKtBOXT0/YJCn9czz2VTVBs=";
|
hash = "sha256-xKB9zBw9sX+z/yBzvfIzQPyOHzlCAGfGLyuLGRoyWbg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php80 }:
|
{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php81 }:
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "n98-magerun";
|
pname = "n98-magerun";
|
||||||
|
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
install -D $src/n98-magerun $out/libexec/n98-magerun/n98-magerun-${version}.phar
|
install -D $src/n98-magerun $out/libexec/n98-magerun/n98-magerun-${version}.phar
|
||||||
makeWrapper ${php80}/bin/php $out/bin/n98-magerun \
|
makeWrapper ${php81}/bin/php $out/bin/n98-magerun \
|
||||||
--add-flags "$out/libexec/n98-magerun/n98-magerun-${version}.phar" \
|
--add-flags "$out/libexec/n98-magerun/n98-magerun-${version}.phar" \
|
||||||
--prefix PATH : ${lib.makeBinPath [ unzip ]}
|
--prefix PATH : ${lib.makeBinPath [ unzip ]}
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
|
@ -34,5 +34,6 @@ stdenv.mkDerivation {
|
||||||
homepage = "https://magerun.net/";
|
homepage = "https://magerun.net/";
|
||||||
changelog = "https://magerun.net/category/magerun/";
|
changelog = "https://magerun.net/category/magerun/";
|
||||||
maintainers = teams.php.members;
|
maintainers = teams.php.members;
|
||||||
|
broken = true; # Not compatible with PHP 8.1, see https://github.com/netz98/n98-magerun/issues/1275
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-ndk";
|
pname = "cargo-ndk";
|
||||||
version = "3.1.2";
|
version = "3.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bbqsrc";
|
owner = "bbqsrc";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-L7HZzudu26Vyz1qm2soqGlZf8sBJKcx1BoBf8zC0ee4=";
|
sha256 = "sha256-rpEBxoXm77UuK7jiaf90yxVnmJay6ptkRk5KUEBoSvk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-RMP1Nz2uWVIOxSlsjTR6QsVy6Heu9dXhrBBI5xGMbtY=";
|
cargoHash = "sha256-XRT4U6zkmXzNnPnnHWrGlQWVV3W09UXQ0McksIFKgyE=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [
|
buildInputs = lib.optionals stdenv.isDarwin [
|
||||||
CoreGraphics
|
CoreGraphics
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.8.2";
|
version = "0.8.3";
|
||||||
pname = "extremetuxracer";
|
pname = "extremetuxracer";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
|
url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
|
||||||
sha256 = "sha256-HIdJZeniSVM78VwI2rxh5gwFuz/VeJF4gBF/+KkQzU4=";
|
sha256 = "sha256-LuQvP1/C+NSap1BW6xFvbKuE1lZBIOaWGuWSc2ckURM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config intltool ];
|
nativeBuildInputs = [ pkg-config intltool ];
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lpairs2";
|
pname = "lpairs2";
|
||||||
version = "2.2";
|
version = "2.2.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
|
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
|
||||||
hash = "sha256-swe/cB9RqxHSNSShiryJ8XfwZk2X6qIDxFURbwNOd58=";
|
hash = "sha256-n2/3QxsnRzVgzKzOUF6RLzpHJ2R8z67Mkjwdh2ghn28=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -116,7 +116,7 @@ wrapped-full = runCommand unwrapped.name
|
||||||
allowSubstitutes = false;
|
allowSubstitutes = false;
|
||||||
inherit (unwrapped) meta;
|
inherit (unwrapped) meta;
|
||||||
}
|
}
|
||||||
''
|
(''
|
||||||
mkdir -p "$out"/bin
|
mkdir -p "$out"/bin
|
||||||
makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \
|
makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \
|
||||||
--set LUA_PATH "$LUA_PATH" \
|
--set LUA_PATH "$LUA_PATH" \
|
||||||
|
@ -125,10 +125,10 @@ wrapped-full = runCommand unwrapped.name
|
||||||
ln -sr '${unwrapped}/share' "$out"/
|
ln -sr '${unwrapped}/share' "$out"/
|
||||||
ln -sr '${unwrapped}/lib' "$out"/ # useful in NixOS service
|
ln -sr '${unwrapped}/lib' "$out"/ # useful in NixOS service
|
||||||
ln -sr "$out"/{bin,sbin}
|
ln -sr "$out"/{bin,sbin}
|
||||||
|
'' + lib.optionalString unwrapped.doInstallCheck ''
|
||||||
echo "Checking that 'http' module loads, i.e. lua search paths work:"
|
echo "Checking that 'http' module loads, i.e. lua search paths work:"
|
||||||
echo "modules.load('http')" > test-http.lua
|
echo "modules.load('http')" > test-http.lua
|
||||||
echo -e 'quit()' | env -i "$out"/bin/kresd -a 127.0.0.1#53535 -c test-http.lua
|
echo -e 'quit()' | env -i "$out"/bin/kresd -a 127.0.0.1#53535 -c test-http.lua
|
||||||
'';
|
'');
|
||||||
|
|
||||||
in result
|
in result
|
||||||
|
|
|
@ -32,13 +32,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "frr";
|
pname = "frr";
|
||||||
version = "8.5.1";
|
version = "8.5.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "FRRouting";
|
owner = "FRRouting";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "${pname}-${version}";
|
rev = "${pname}-${version}";
|
||||||
hash = "sha256-dK6eVYj9OIVChnR90FDTB7ow93nLLNRaOG8YEXxh8UQ=";
|
hash = "sha256-xJCaVh/PlV6WRv/JRHO/vzF72E6Ap8/RaqLnkYTnk14=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -145,13 +145,13 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "inspircd";
|
pname = "inspircd";
|
||||||
version = "3.16.0";
|
version = "3.16.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-TKjUgy8S76gn9a9hbrWehb6BGI+dSFn1gYc0MCppyJk=";
|
sha256 = "sha256-UpDjxF4zRrtiY4Z1tRML1uWQdklfgCeLsJtxCKfHOdw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "lib" "man" "doc" "out" ];
|
outputs = [ "bin" "lib" "man" "doc" "out" ];
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "miniflux";
|
pname = "miniflux";
|
||||||
version = "2.0.44";
|
version = "2.0.45";
|
||||||
|
|
||||||
in buildGoModule {
|
in buildGoModule {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
@ -11,16 +11,14 @@ in buildGoModule {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = "v2";
|
repo = "v2";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-PBhoKDljLpgi8cJicY7U7yrW3qNPDMzno/6PacOZ76E=";
|
sha256 = "sha256-/d5+Qc2kXZZkKe80+879YdxYt+zy/Y1sf2dwSjGw0EM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-Ydd1LiVq4cCyj7dvcwxpKNU1HjcvXbSerHYJNoV/YQY=";
|
vendorHash = "sha256-nwKo4Sjg8HjuxeDUgwQYZ2LOHxkRSlyaBlQwSjOuJ7U=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkFlags = [ "-skip=TestClient" ]; # skip client tests as they require network access
|
||||||
go test $(go list ./... | grep -v client)
|
|
||||||
''; # skip client tests as they require network access
|
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s" "-w" "-X miniflux.app/version.Version=${version}"
|
"-s" "-w" "-X miniflux.app/version.Version=${version}"
|
||||||
|
|
|
@ -32,10 +32,10 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.42.0";
|
version = "2.44.0";
|
||||||
webUiStatic = fetchurl {
|
webUiStatic = fetchurl {
|
||||||
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
|
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
|
||||||
sha256 = "sha256-QOnt8YZkq+/cmoaI8ZOrVbgVh5MnaKpDBVtPTckl4+A=";
|
sha256 = "sha256-4FNW78V5bQWbTwmaEpvKaB5f/+uYqXjf0F+FONZq5c4=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
|
@ -48,10 +48,10 @@ buildGoModule rec {
|
||||||
owner = "prometheus";
|
owner = "prometheus";
|
||||||
repo = "prometheus";
|
repo = "prometheus";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-UwowidKKn3fp2z/MSbwESpl2E4IIioEC0oV1QRE7ViQ=";
|
sha256 = "sha256-JCEJQ0GjP0jxyQudmgo2krjxXmsOFSwzh9Cm1XsrFZo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-wUniz7E9l/5ldgPHo+wZkKaZuAH5kvjT0VDl4qkcoNs=";
|
vendorSha256 = "sha256-dR69FWhiT5FLQjZ1G0uf2QPCu9nEp2YkRjrkP1a/948=";
|
||||||
|
|
||||||
excludedPackages = [ "documentation/prometheus-mixin" ];
|
excludedPackages = [ "documentation/prometheus-mixin" ];
|
||||||
|
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "snappymail";
|
pname = "snappymail";
|
||||||
version = "2.28.1";
|
version = "2.28.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
|
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
|
||||||
sha256 = "sha256-et3KuILHNPUMaqgOffMh1w73h0ThUbc/lR82pFaG6rM=";
|
sha256 = "sha256-GrF3WTe4Mr27FlvVQg0WrDu/k8AYJUWUDzbKmgqeQ6E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "snappymail";
|
sourceRoot = "snappymail";
|
||||||
|
|
|
@ -214,7 +214,7 @@ let
|
||||||
|
|
||||||
checkDependencyList = checkDependencyList' [];
|
checkDependencyList = checkDependencyList' [];
|
||||||
checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep:
|
checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep:
|
||||||
if lib.isDerivation dep || dep == null || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep
|
if lib.isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep
|
||||||
else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep
|
else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep
|
||||||
else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}");
|
else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}");
|
||||||
in if builtins.length erroneousHardeningFlags != 0
|
in if builtins.length erroneousHardeningFlags != 0
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
, buildDotnetModule
|
, buildDotnetModule
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, dotnetCorePackages
|
|
||||||
, gtk3
|
, gtk3
|
||||||
, libX11
|
, libX11
|
||||||
, libXrandr
|
, libXrandr
|
||||||
|
@ -19,13 +18,13 @@
|
||||||
|
|
||||||
buildDotnetModule rec {
|
buildDotnetModule rec {
|
||||||
pname = "OpenTabletDriver";
|
pname = "OpenTabletDriver";
|
||||||
version = "0.6.0.4";
|
version = "0.6.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OpenTabletDriver";
|
owner = "OpenTabletDriver";
|
||||||
repo = "OpenTabletDriver";
|
repo = "OpenTabletDriver";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-VvxW8Ck+XC4nXSUyDhcbGoeSr5uSAZ66jtZNoADuVR8=";
|
sha256 = "sha256-9C6rtq+1WTinlAs0SJs1/J1QRnKm5pGNDSbLQ0kRUXY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
debPkg = fetchurl {
|
debPkg = fetchurl {
|
||||||
|
|
8
pkgs/tools/X11/opentabletdriver/deps.nix
generated
8
pkgs/tools/X11/opentabletdriver/deps.nix
generated
|
@ -16,9 +16,6 @@
|
||||||
(fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; })
|
(fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; })
|
||||||
(fetchNuGet { pname = "MessagePack"; version = "2.1.194"; sha256 = "1v2gyd9sd6hppfhlzngmzzhnpr39b95rwrqq0r9zzp480b6vzaj0"; })
|
(fetchNuGet { pname = "MessagePack"; version = "2.1.194"; sha256 = "1v2gyd9sd6hppfhlzngmzzhnpr39b95rwrqq0r9zzp480b6vzaj0"; })
|
||||||
(fetchNuGet { pname = "MessagePack.Annotations"; version = "2.1.194"; sha256 = "1jkhq3hiy4brvzsywl4p4jb9jrnzs3vmgr3s8fxpb1dzafadw8b0"; })
|
(fetchNuGet { pname = "MessagePack.Annotations"; version = "2.1.194"; sha256 = "1jkhq3hiy4brvzsywl4p4jb9jrnzs3vmgr3s8fxpb1dzafadw8b0"; })
|
||||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "5.0.0"; sha256 = "0d7sjr89zwq0wxirf8la05hfalv9nhvlczg1c7a508k8aw79jvfg"; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "183xgqzlwd5lhacxdwcjl8vcq7r7xypv0hddps9k32mmmwf83d8h"; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "066fwdlssbv556zd9w1x87x1j8j4kafj9rxyy0692bssdb4gcyc8"; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; })
|
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.4"; sha256 = "11wiyy3ykgk1sa9amy3lgcsg2v7d1sz59ggw647vx8ibpjxijjpp"; })
|
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.4"; sha256 = "11wiyy3ykgk1sa9amy3lgcsg2v7d1sz59ggw647vx8ibpjxijjpp"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
|
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
|
||||||
|
@ -26,11 +23,6 @@
|
||||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })
|
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })
|
||||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; })
|
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; })
|
||||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })
|
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.17"; sha256 = "07v7vyqm556xr1ypkazfp6gh6drgf20zkwbhkpja8bwdcr6lphbb"; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "16whaq82pj6fqa0vam3a0va9ly843aa1z12hza040vn6252kk9fq"; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "0jgcfs3jc98jfyaaamssznckbpnaygplk8pjsp6dswpansz5bnnq"; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; })
|
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; })
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "fioctl";
|
pname = "fioctl";
|
||||||
version = "0.32.0";
|
version = "0.33";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "foundriesio";
|
owner = "foundriesio";
|
||||||
repo = "fioctl";
|
repo = "fioctl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-3k3FoRU1yCtntVe3WTGUuhIBTD6KRvSsDISbjmNvzQI=";
|
sha256 = "sha256-9c0eyRij1L2C6nJ9ufDGONVenJTGdRALFojK3SFRTjI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-hSllpWjiYOBbANCX7usdAAF1HNAJ79ELK92qEyn8G1c=";
|
vendorHash = "sha256-hSllpWjiYOBbANCX7usdAAF1HNAJ79ELK92qEyn8G1c=";
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchgit
|
, fetchgit
|
||||||
, fetchpatch
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
|
@ -15,23 +14,14 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "plocate";
|
pname = "plocate";
|
||||||
version = "1.1.17";
|
version = "1.1.19";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://git.sesse.net/plocate";
|
url = "https://git.sesse.net/plocate";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-EcWzvbY8ey5asEJxUeSl10ozApgg+wL5o8NCNw7/W7k=";
|
sha256 = "sha256-Vf/NgUPDL3KWMpjnyB2QR2sU6rQfPIADNU6OlpN+O0M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# fix redefinition error
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://git.sesse.net/?p=plocate;a=patch;h=0125004cd28c5f9124632b594e51dde73af1691c";
|
|
||||||
revert = true;
|
|
||||||
sha256 = "sha256-1TDpxIdpDZQ0IZ/wGG91RVZDrpMpWkvhRF8oE0CJWIY=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -i meson.build \
|
sed -i meson.build \
|
||||||
-e '/mkdir\.sh/d'
|
-e '/mkdir\.sh/d'
|
||||||
|
|
|
@ -22,11 +22,11 @@ buildPythonPackage rec {
|
||||||
# The websites yt-dlp deals with are a very moving target. That means that
|
# The websites yt-dlp deals with are a very moving target. That means that
|
||||||
# downloads break constantly. Because of that, updates should always be backported
|
# downloads break constantly. Because of that, updates should always be backported
|
||||||
# to the latest stable release.
|
# to the latest stable release.
|
||||||
version = "2023.6.21";
|
version = "2023.6.22";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-VsNdGtPs+4KMO4n/4HsjWzVO3dguGjHdw9FuuMPnHo4=";
|
sha256 = "sha256-7WqLjgrQikVA1K+g/Qin+YACLHm5CBvZ5j3cAK7u5ag=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "boundary";
|
pname = "boundary";
|
||||||
version = "0.12.2";
|
version = "0.13.0";
|
||||||
|
|
||||||
src =
|
src =
|
||||||
let
|
let
|
||||||
|
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
||||||
aarch64-darwin = "darwin_arm64";
|
aarch64-darwin = "darwin_arm64";
|
||||||
};
|
};
|
||||||
sha256 = selectSystem {
|
sha256 = selectSystem {
|
||||||
x86_64-linux = "sha256-8JqteVRGT5UT1AgZeBMFjpTZOU/4/6/ZcJxdWcqU5G8=";
|
x86_64-linux = "sha256-nz3b5EMuzZgwqh1guSyOuSqwmZpPOhY6jb/7CL65Q7c=";
|
||||||
aarch64-linux = "sha256-msVbtcBfDFOjU7BebbtEV05LjBdWDlI1Q/8YEwMbyq0=";
|
aarch64-linux = "sha256-fyYdm5E9iuGcs6TxrwbbCC7/NU9p35T/2nEOdv7yU9k=";
|
||||||
x86_64-darwin = "sha256-ZXz0y6GvoCpeKcPJXV0t828fBBfeFAO+zmUAqCIOysU=";
|
x86_64-darwin = "sha256-xx16xCghd6t9BYrQAYqJTVdrS2G8qNQ5l4gG9SfDwRI=";
|
||||||
aarch64-darwin = "sha256-4xnM7k5i4XssQQ6Y0h2hq9s4TLnuazhqXiGQMhR4HNU=";
|
aarch64-darwin = "sha256-z/aHLRqybf7UiZue608VYDlKdIenEVVmMdd/XvIzXsc=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
fetchzip {
|
fetchzip {
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "iperf";
|
pname = "iperf";
|
||||||
version = "3.12";
|
version = "3.13";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
|
url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
|
||||||
sha256 = "sha256-cgNOz7an1tZ+OE4Z+27/8yNspPftTFGNfbZJxEfh/9Y=";
|
sha256 = "sha256-vuQnrrE9ai7iIHPyMmH2NxLYK++qg6yMtNtdpMK9yGU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ];
|
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ];
|
||||||
|
|
|
@ -30,16 +30,16 @@ let
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "netbird";
|
pname = "netbird";
|
||||||
version = "0.21.3";
|
version = "0.21.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "netbirdio";
|
owner = "netbirdio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-OPLt2IDC/utRdmpYo8V1VVThpv4Fy2X7lhF5BckKkMM=";
|
sha256 = "sha256-zsbxc6Arbqrx2LxmNJJXlsyQc7X6L84ej+2piy2Hy/k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-D2jPpaPkbou/upkiOUhA8QJONyKTlTqx9Ylgkq+nBfo=";
|
vendorHash = "sha256-R5LhqW6uh7R8/vr60Sy0kVpAaTL3rwh5c4Ix08Rx6Zk=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tcpreplay";
|
pname = "tcpreplay";
|
||||||
version = "4.4.3";
|
version = "4.4.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz";
|
url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz";
|
||||||
sha256 = "sha256-IWMxaS4QwS1/JXlF53eSjXm9CREX8+T/tbMS6yygv3w=";
|
sha256 = "sha256-RPGPttNHDsr3elG5AaEZ2uFtpb5NQUD/uyeF43rW1L8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libpcap ]
|
buildInputs = [ libpcap ]
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "exploitdb";
|
pname = "exploitdb";
|
||||||
version = "2023-06-20";
|
version = "2023-06-22";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "exploit-database";
|
owner = "exploit-database";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-rtxgUnmNAZDnyczucpRB0ItyM5lk0us33I/ejYTDn4U=";
|
hash = "sha256-l9JM6j0UqMqEKpH4cTM5sqlGwIDFjjCNxOk40mdI2aY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "katana";
|
pname = "katana";
|
||||||
version = "1.0.1";
|
version = "1.0.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "projectdiscovery";
|
owner = "projectdiscovery";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-LXyYdfBrqtMN4qGakQDG/axzmDTYkwCun2xw9Heaejk=";
|
hash = "sha256-MhvagLlJ3WuZ3eEA0KI0sJ1ioFyqCcC9lejvewIFg5M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-MEmVmokQX/HfBPvObeW1M5L6zm2KXB1yzGmNFBjt+i0=";
|
vendorHash = "sha256-1XT8VOBztC/V5Yguzq91ZoOWlkdT6fJrvcxp7KvtNqw=";
|
||||||
|
|
||||||
CGO_ENABLED = 0;
|
CGO_ENABLED = 0;
|
||||||
|
|
||||||
|
|
|
@ -1,32 +1,17 @@
|
||||||
{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3
|
{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3
|
||||||
, pcre, libssh2
|
, pcre, libssh2
|
||||||
, libX11 ? null
|
|
||||||
, gtk2 ? null
|
|
||||||
, makeWrapper ? null
|
|
||||||
, withLua ? true
|
, withLua ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nmap";
|
pname = "nmap";
|
||||||
version = "7.93";
|
version = "7.94";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
|
url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
|
||||||
sha256 = "sha256-Vbz+R5PiWsyWukJ02MQijbVQuOjv1yAEs47FWi3RZlE=";
|
sha256 = "sha256-1xvhie7EPX4Jm6yFcVCdMWxFd8p5SRgyrD4SF7yPksw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./zenmap.patch ]
|
|
||||||
++ lib.optionals stdenv.cc.isClang [(
|
|
||||||
# Fixes a compile error due an ambiguous reference to bind(2) in
|
|
||||||
# nping/EchoServer.cc, which is otherwise resolved to std::bind.
|
|
||||||
# https://github.com/nmap/nmap/pull/1363
|
|
||||||
fetchpatch {
|
|
||||||
url = "https://github.com/nmap/nmap/commit/5bbe66f1bd8cbd3718f5805139e2e8139e6849bb.diff";
|
|
||||||
includes = [ "nping/EchoServer.cc" ];
|
|
||||||
sha256 = "0xcph9mycy57yryjg253frxyz87c4135rrbndlqw1400c8jxq70c";
|
|
||||||
}
|
|
||||||
)];
|
|
||||||
|
|
||||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||||
substituteInPlace libz/configure \
|
substituteInPlace libz/configure \
|
||||||
--replace /usr/bin/libtool ar \
|
--replace /usr/bin/libtool ar \
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
diff -ruN nmap-5.50.orig/zenmap/zenmapCore/Paths.py nmap-5.50/zenmap/zenmapCore/Paths.py
|
|
||||||
--- nmap-5.50.orig/zenmap/zenmapCore/Paths.py 2013-06-06 05:52:10.723087428 +0000
|
|
||||||
+++ nmap-5.50/zenmap/zenmapCore/Paths.py 2013-06-06 07:07:25.481261761 +0000
|
|
||||||
@@ -115,7 +115,10 @@
|
|
||||||
else:
|
|
||||||
# Normal script execution. Look in the current directory to allow
|
|
||||||
# running from the distribution.
|
|
||||||
- return os.path.abspath(os.path.dirname(fs_dec(sys.argv[0])))
|
|
||||||
+ #
|
|
||||||
+ # Grrwlf: No,no,dear. That's not a script, thats Nixos wrapper. Go add
|
|
||||||
+ # those '..' to substract /bin part.
|
|
||||||
+ return os.path.abspath(os.path.join(os.path.dirname(fs_dec(sys.argv[0])), ".."))
|
|
||||||
|
|
||||||
prefix = get_prefix()
|
|
||||||
|
|
|
@ -14,11 +14,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "crowdin-cli";
|
pname = "crowdin-cli";
|
||||||
version = "3.12.0";
|
version = "3.13.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
|
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
|
||||||
hash = "sha256-Key8zmFpQibTTaxbZT6kd6re9EdJ3wgEj+WiLervJiE=";
|
hash = "sha256-YQvCOdMIMMEtT2K9WBWp5xmDNGeICvgTs0GnX+D4DZI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
|
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
|
||||||
|
|
|
@ -1263,6 +1263,10 @@ mapAliases ({
|
||||||
phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
|
phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
|
||||||
|
|
||||||
# Obsolete PHP version aliases
|
# Obsolete PHP version aliases
|
||||||
|
php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21
|
||||||
|
php80Packages = php80; # Added 2023-06-21
|
||||||
|
php80Extensions = php80; # Added 2023-06-21
|
||||||
|
|
||||||
php74 = throw "php74 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2022-05-24
|
php74 = throw "php74 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2022-05-24
|
||||||
php74Packages = php74; # Added 2022-05-24
|
php74Packages = php74; # Added 2022-05-24
|
||||||
php74Extensions = php74; # Added 2022-05-24
|
php74Extensions = php74; # Added 2022-05-24
|
||||||
|
@ -1711,6 +1715,7 @@ mapAliases ({
|
||||||
uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02
|
uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02
|
||||||
ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22
|
ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22
|
||||||
ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11
|
ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11
|
||||||
|
uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21
|
||||||
ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22
|
ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22
|
||||||
unicorn-emu = unicorn; # Added 2020-10-29
|
unicorn-emu = unicorn; # Added 2020-10-29
|
||||||
uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI";
|
uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI";
|
||||||
|
|
|
@ -17316,16 +17316,6 @@ with pkgs;
|
||||||
php81Extensions = recurseIntoAttrs php81.extensions;
|
php81Extensions = recurseIntoAttrs php81.extensions;
|
||||||
php81Packages = recurseIntoAttrs php81.packages;
|
php81Packages = recurseIntoAttrs php81.packages;
|
||||||
|
|
||||||
# Import PHP80 interpreter, extensions and packages
|
|
||||||
php80 = callPackage ../development/interpreters/php/8.0.nix {
|
|
||||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
|
||||||
pcre2 = pcre2.override {
|
|
||||||
withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630
|
|
||||||
};
|
|
||||||
};
|
|
||||||
php80Extensions = recurseIntoAttrs php80.extensions;
|
|
||||||
php80Packages = recurseIntoAttrs php80.packages;
|
|
||||||
|
|
||||||
phpactor = callPackage ../development/tools/phpactor { };
|
phpactor = callPackage ../development/tools/phpactor { };
|
||||||
|
|
||||||
picoc = callPackage ../development/interpreters/picoc { };
|
picoc = callPackage ../development/interpreters/picoc { };
|
||||||
|
@ -35096,8 +35086,6 @@ with pkgs;
|
||||||
|
|
||||||
uefi-run = callPackage ../tools/virtualization/uefi-run { };
|
uefi-run = callPackage ../tools/virtualization/uefi-run { };
|
||||||
|
|
||||||
uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { };
|
|
||||||
|
|
||||||
umurmur = callPackage ../applications/networking/umurmur { };
|
umurmur = callPackage ../applications/networking/umurmur { };
|
||||||
|
|
||||||
udocker = callPackage ../tools/virtualization/udocker { };
|
udocker = callPackage ../tools/virtualization/udocker { };
|
||||||
|
@ -38354,7 +38342,11 @@ with pkgs;
|
||||||
fftw = fftw;
|
fftw = fftw;
|
||||||
};
|
};
|
||||||
|
|
||||||
lammps-mpi = lowPrio (lammps.override { withMPI = true; });
|
lammps-mpi = lowPrio (lammps.override {
|
||||||
|
extraBuildInputs = [
|
||||||
|
mpi
|
||||||
|
];
|
||||||
|
});
|
||||||
|
|
||||||
gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
|
gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
|
||||||
singlePrec = true;
|
singlePrec = true;
|
||||||
|
|
|
@ -750,6 +750,8 @@ self: super: with self; {
|
||||||
|
|
||||||
async-timeout = callPackage ../development/python-modules/async_timeout { };
|
async-timeout = callPackage ../development/python-modules/async_timeout { };
|
||||||
|
|
||||||
|
async-tkinter-loop = callPackage ../development/python-modules/async-tkinter-loop { };
|
||||||
|
|
||||||
asyncua = callPackage ../development/python-modules/asyncua { };
|
asyncua = callPackage ../development/python-modules/asyncua { };
|
||||||
|
|
||||||
async-upnp-client = callPackage ../development/python-modules/async-upnp-client { };
|
async-upnp-client = callPackage ../development/python-modules/async-upnp-client { };
|
||||||
|
|
Loading…
Reference in a new issue