Merge staging-next into staging
This commit is contained in:
commit
cb2c7905b6
|
@ -11246,6 +11246,12 @@
|
||||||
githubId = 17120571;
|
githubId = 17120571;
|
||||||
name = "Xinhao Luo";
|
name = "Xinhao Luo";
|
||||||
};
|
};
|
||||||
|
nevivurn = {
|
||||||
|
email = "nevivurn@nevi.dev";
|
||||||
|
github = "nevivurn";
|
||||||
|
githubId = 7698349;
|
||||||
|
name = "Yongun Seong";
|
||||||
|
};
|
||||||
newam = {
|
newam = {
|
||||||
email = "alex@thinglab.org";
|
email = "alex@thinglab.org";
|
||||||
github = "newAM";
|
github = "newAM";
|
||||||
|
|
|
@ -255,6 +255,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
- `fail2ban` has been updated to 1.0.2, which has a few breaking changes compared to 0.11.2 ([changelog for 1.0.1](https://github.com/fail2ban/fail2ban/blob/1.0.1/ChangeLog), [changelog for 1.0.2](https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog))
|
- `fail2ban` has been updated to 1.0.2, which has a few breaking changes compared to 0.11.2 ([changelog for 1.0.1](https://github.com/fail2ban/fail2ban/blob/1.0.1/ChangeLog), [changelog for 1.0.2](https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog))
|
||||||
|
|
||||||
|
- `albert` has been updated from 0.17.6 to 0.20.13, and 0.18.0 changed the config format and many plugins ([changelog for 0.18.0](https://github.com/albertlauncher/albert/blob/v0.18.0/CHANGELOG.md))
|
||||||
|
|
||||||
- Calling `makeSetupHook` without passing a `name` argument is deprecated.
|
- Calling `makeSetupHook` without passing a `name` argument is deprecated.
|
||||||
|
|
||||||
- Top-level buildPlatform,hostPlatform,targetPlatform have been deprecated, use stdenv.X instead.
|
- Top-level buildPlatform,hostPlatform,targetPlatform have been deprecated, use stdenv.X instead.
|
||||||
|
|
|
@ -47,6 +47,18 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
cryptMountOptions = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [];
|
||||||
|
example = literalExpression ''
|
||||||
|
[ "allow_discard" ]
|
||||||
|
'';
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Global mount options that apply to every crypt volume.
|
||||||
|
You can define volume-specific options in the volume definitions.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
fuseMountOptions = mkOption {
|
fuseMountOptions = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = [];
|
default = [];
|
||||||
|
@ -157,7 +169,7 @@ in
|
||||||
<!-- specify the binaries to be called -->
|
<!-- specify the binaries to be called -->
|
||||||
<fusemount>${pkgs.fuse}/bin/mount.fuse %(VOLUME) %(MNTPT) -o ${concatStringsSep "," (cfg.fuseMountOptions ++ [ "%(OPTIONS)" ])}</fusemount>
|
<fusemount>${pkgs.fuse}/bin/mount.fuse %(VOLUME) %(MNTPT) -o ${concatStringsSep "," (cfg.fuseMountOptions ++ [ "%(OPTIONS)" ])}</fusemount>
|
||||||
<fuseumount>${pkgs.fuse}/bin/fusermount -u %(MNTPT)</fuseumount>
|
<fuseumount>${pkgs.fuse}/bin/fusermount -u %(MNTPT)</fuseumount>
|
||||||
<cryptmount>${pkgs.pam_mount}/bin/mount.crypt %(VOLUME) %(MNTPT)</cryptmount>
|
<cryptmount>${pkgs.pam_mount}/bin/mount.crypt -o ${concatStringsSep "," (cfg.cryptMountOptions ++ [ "%(OPTIONS)" ])} %(VOLUME) %(MNTPT)</cryptmount>
|
||||||
<cryptumount>${pkgs.pam_mount}/bin/umount.crypt %(MNTPT)</cryptumount>
|
<cryptumount>${pkgs.pam_mount}/bin/umount.crypt %(MNTPT)</cryptumount>
|
||||||
<pmvarrun>${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION)</pmvarrun>
|
<pmvarrun>${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION)</pmvarrun>
|
||||||
${optionalString oflRequired "<ofl>${fake_ofl}/bin/fake_ofl %(SIGNAL) %(MNTPT)</ofl>"}
|
${optionalString oflRequired "<ofl>${fake_ofl}/bin/fake_ofl %(SIGNAL) %(MNTPT)</ofl>"}
|
||||||
|
|
|
@ -414,13 +414,16 @@ in
|
||||||
# https://libvirt.org/daemons.html#monolithic-systemd-integration
|
# https://libvirt.org/daemons.html#monolithic-systemd-integration
|
||||||
systemd.sockets.libvirtd.wantedBy = [ "sockets.target" ];
|
systemd.sockets.libvirtd.wantedBy = [ "sockets.target" ];
|
||||||
|
|
||||||
security.polkit.extraConfig = ''
|
security.polkit = {
|
||||||
polkit.addRule(function(action, subject) {
|
enable = true;
|
||||||
if (action.id == "org.libvirt.unix.manage" &&
|
extraConfig = ''
|
||||||
subject.isInGroup("libvirtd")) {
|
polkit.addRule(function(action, subject) {
|
||||||
return polkit.Result.YES;
|
if (action.id == "org.libvirt.unix.manage" &&
|
||||||
}
|
subject.isInGroup("libvirtd")) {
|
||||||
});
|
return polkit.Result.YES;
|
||||||
'';
|
}
|
||||||
|
});
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
import ../make-test-python.nix ({ pkgs, ... }:
|
import ../make-test-python.nix ({ lib, ... }:
|
||||||
# copy_from_host works only for store paths
|
|
||||||
rec {
|
rec {
|
||||||
name = "fcitx5";
|
name = "fcitx5";
|
||||||
|
meta.maintainers = with lib.maintainers; [ nevivurn ];
|
||||||
|
|
||||||
nodes.machine = { pkgs, ... }:
|
nodes.machine = { pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -30,8 +31,10 @@ rec {
|
||||||
i18n.inputMethod = {
|
i18n.inputMethod = {
|
||||||
enabled = "fcitx5";
|
enabled = "fcitx5";
|
||||||
fcitx5.addons = [
|
fcitx5.addons = [
|
||||||
pkgs.fcitx5-m17n
|
|
||||||
pkgs.fcitx5-chinese-addons
|
pkgs.fcitx5-chinese-addons
|
||||||
|
pkgs.fcitx5-hangul
|
||||||
|
pkgs.fcitx5-m17n
|
||||||
|
pkgs.fcitx5-mozc
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -43,11 +46,16 @@ rec {
|
||||||
fcitx_confdir = "${user.home}/.config/fcitx5";
|
fcitx_confdir = "${user.home}/.config/fcitx5";
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
# We need config files before login session
|
start_all()
|
||||||
# So copy first thing
|
|
||||||
|
machine.wait_for_x()
|
||||||
|
machine.wait_for_file("${xauth}")
|
||||||
|
machine.succeed("xauth merge ${xauth}")
|
||||||
|
machine.sleep(5)
|
||||||
|
|
||||||
|
machine.succeed("su - ${user.name} -c 'kill $(pgrep fcitx5)'")
|
||||||
|
machine.sleep(1)
|
||||||
|
|
||||||
# Point and click would be expensive,
|
|
||||||
# So configure using files
|
|
||||||
machine.copy_from_host(
|
machine.copy_from_host(
|
||||||
"${./profile}",
|
"${./profile}",
|
||||||
"${fcitx_confdir}/profile",
|
"${fcitx_confdir}/profile",
|
||||||
|
@ -57,15 +65,8 @@ rec {
|
||||||
"${fcitx_confdir}/config",
|
"${fcitx_confdir}/config",
|
||||||
)
|
)
|
||||||
|
|
||||||
start_all()
|
machine.succeed("su - ${user.name} -c 'alacritty >&2 &'")
|
||||||
|
machine.succeed("su - ${user.name} -c 'fcitx5 >&2 &'")
|
||||||
machine.wait_for_file("${xauth}}")
|
|
||||||
machine.succeed("xauth merge ${xauth}")
|
|
||||||
|
|
||||||
machine.sleep(5)
|
|
||||||
|
|
||||||
machine.succeed("su - ${user.name} -c 'alacritty&'")
|
|
||||||
machine.succeed("su - ${user.name} -c 'fcitx5&'")
|
|
||||||
machine.sleep(10)
|
machine.sleep(10)
|
||||||
|
|
||||||
### Type on terminal
|
### Type on terminal
|
||||||
|
@ -74,7 +75,6 @@ rec {
|
||||||
|
|
||||||
### Start fcitx Unicode input
|
### Start fcitx Unicode input
|
||||||
machine.send_key("ctrl-alt-shift-u")
|
machine.send_key("ctrl-alt-shift-u")
|
||||||
machine.sleep(5)
|
|
||||||
machine.sleep(1)
|
machine.sleep(1)
|
||||||
|
|
||||||
### Search for smiling face
|
### Search for smiling face
|
||||||
|
@ -94,9 +94,15 @@ rec {
|
||||||
machine.sleep(1)
|
machine.sleep(1)
|
||||||
|
|
||||||
### Default wubi, enter 一下
|
### Default wubi, enter 一下
|
||||||
machine.send_chars("gggh")
|
machine.send_chars("gggh ")
|
||||||
machine.sleep(1)
|
machine.sleep(1)
|
||||||
machine.send_key("\n")
|
|
||||||
|
### Switch to Hangul
|
||||||
|
machine.send_key("alt-shift")
|
||||||
|
machine.sleep(1)
|
||||||
|
|
||||||
|
### Enter 한
|
||||||
|
machine.send_chars("gks")
|
||||||
machine.sleep(1)
|
machine.sleep(1)
|
||||||
|
|
||||||
### Switch to Harvard Kyoto
|
### Switch to Harvard Kyoto
|
||||||
|
@ -104,12 +110,17 @@ rec {
|
||||||
machine.sleep(1)
|
machine.sleep(1)
|
||||||
|
|
||||||
### Enter क
|
### Enter क
|
||||||
machine.send_chars("ka ")
|
machine.send_chars("ka")
|
||||||
machine.sleep(1)
|
machine.sleep(1)
|
||||||
|
|
||||||
|
### Switch to Mozc
|
||||||
machine.send_key("alt-shift")
|
machine.send_key("alt-shift")
|
||||||
machine.sleep(1)
|
machine.sleep(1)
|
||||||
|
|
||||||
|
### Enter か
|
||||||
|
machine.send_chars("ka\n")
|
||||||
|
machine.sleep(1)
|
||||||
|
|
||||||
### Turn off Fcitx
|
### Turn off Fcitx
|
||||||
machine.send_key("ctrl-spc")
|
machine.send_key("ctrl-spc")
|
||||||
machine.sleep(1)
|
machine.sleep(1)
|
||||||
|
@ -121,7 +132,7 @@ rec {
|
||||||
|
|
||||||
### Verify that file contents are as expected
|
### Verify that file contents are as expected
|
||||||
file_content = machine.succeed("cat ${user.home}/fcitx_test.out")
|
file_content = machine.succeed("cat ${user.home}/fcitx_test.out")
|
||||||
assert file_content == "☺一下क\n"
|
assert file_content == "☺一下한कか\n"
|
||||||
''
|
''
|
||||||
;
|
;
|
||||||
})
|
})
|
||||||
|
|
|
@ -4,12 +4,24 @@ Default Layout=us
|
||||||
DefaultIM=wbx
|
DefaultIM=wbx
|
||||||
|
|
||||||
[Groups/0/Items/0]
|
[Groups/0/Items/0]
|
||||||
|
Name=keyboard-us
|
||||||
|
Layout=
|
||||||
|
|
||||||
|
[Groups/0/Items/1]
|
||||||
Name=wbx
|
Name=wbx
|
||||||
Layout=us
|
Layout=us
|
||||||
|
|
||||||
[Groups/0/Items/1]
|
[Groups/0/Items/2]
|
||||||
|
Name=hangul
|
||||||
|
Layout=us
|
||||||
|
|
||||||
|
[Groups/0/Items/3]
|
||||||
Name=m17n_sa_harvard-kyoto
|
Name=m17n_sa_harvard-kyoto
|
||||||
Layout=us
|
Layout=us
|
||||||
|
|
||||||
|
[Groups/0/Items/4]
|
||||||
|
Name=mozc
|
||||||
|
Layout=us
|
||||||
|
|
||||||
[GroupOrder]
|
[GroupOrder]
|
||||||
0=NixOS_test
|
0=NixOS_test
|
||||||
|
|
|
@ -348,9 +348,13 @@ let
|
||||||
enable = true;
|
enable = true;
|
||||||
url = "http://localhost";
|
url = "http://localhost";
|
||||||
configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON {
|
configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON {
|
||||||
metrics = [
|
modules = {
|
||||||
{ name = "json_test_metric"; path = "{ .test }"; }
|
default = {
|
||||||
];
|
metrics = [
|
||||||
|
{ name = "json_test_metric"; path = "{ .test }"; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
metricProvider = {
|
metricProvider = {
|
||||||
|
|
|
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "Checks whether the contrast between two colors meet the WCAG requirements";
|
description = "Checks whether the contrast between two colors meet the WCAG requirements";
|
||||||
homepage = "https://gitlab.gnome.org/World/design/contrast";
|
homepage = "https://gitlab.gnome.org/World/design/contrast";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
|
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
|
||||||
broken = stdenv.isDarwin;
|
broken = stdenv.isDarwin;
|
||||||
|
|
|
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "Audio effects for PipeWire applications.";
|
description = "Audio effects for PipeWire applications.";
|
||||||
homepage = "https://github.com/wwmm/easyeffects";
|
homepage = "https://github.com/wwmm/easyeffects";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "Standalone lyrics fetcher/displayer";
|
description = "Standalone lyrics fetcher/displayer";
|
||||||
homepage = "https://github.com/osdlyrics/osdlyrics";
|
homepage = "https://github.com/osdlyrics/osdlyrics";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,12 @@
|
||||||
{ lib, stdenv, callPackage }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, callPackage
|
||||||
|
, ...
|
||||||
|
}@args:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
extraArgs = removeAttrs args [ "callPackage" ];
|
||||||
|
|
||||||
pname = "spotify";
|
pname = "spotify";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -12,5 +18,5 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
in if stdenv.isDarwin
|
in if stdenv.isDarwin
|
||||||
then callPackage ./darwin.nix { inherit pname meta; }
|
then callPackage ./darwin.nix (extraArgs // { inherit pname meta; })
|
||||||
else callPackage ./linux.nix { inherit pname meta; }
|
else callPackage ./linux.nix (extraArgs // { inherit pname meta; })
|
||||||
|
|
|
@ -130,7 +130,7 @@ in stdenv.mkDerivation (rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Sophisticated text editor for code, markup and prose";
|
description = "Sophisticated text editor for code, markup and prose";
|
||||||
homepage = "https://www.sublimetext.com/";
|
homepage = "https://www.sublimetext.com/";
|
||||||
maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ];
|
maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ];
|
||||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||||
|
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "A simple color chooser written in GTK3";
|
description = "A simple color chooser written in GTK3";
|
||||||
homepage = "https://gitlab.gnome.org/World/gcolor3";
|
homepage = "https://gitlab.gnome.org/World/gcolor3";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,27 +2,25 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, cmake
|
, cmake
|
||||||
|
, libqalculate
|
||||||
, muparser
|
, muparser
|
||||||
, python3
|
, python3Packages
|
||||||
, qtbase
|
, qtbase
|
||||||
, qtcharts
|
, qtscxml
|
||||||
, qtdeclarative
|
|
||||||
, qtgraphicaleffects
|
|
||||||
, qtsvg
|
, qtsvg
|
||||||
, qtx11extras
|
|
||||||
, wrapQtAppsHook
|
, wrapQtAppsHook
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "albert";
|
pname = "albert";
|
||||||
version = "0.17.6";
|
version = "0.20.13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "albertlauncher";
|
owner = "albertlauncher";
|
||||||
repo = "albert";
|
repo = "albert";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-nbnywrsKvFG8AkayjnylOKSnn7rRWgNv5zE9DDeOmLw=";
|
sha256 = "sha256-zG6XlFOzSpUSswG4kvKf2lgwUSZkzEVslgQBjzVTLYQ=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -32,20 +30,17 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
libqalculate
|
||||||
muparser
|
muparser
|
||||||
python3
|
|
||||||
qtbase
|
qtbase
|
||||||
qtcharts
|
qtscxml
|
||||||
qtdeclarative
|
|
||||||
qtgraphicaleffects
|
|
||||||
qtsvg
|
qtsvg
|
||||||
qtx11extras
|
] ++ (with python3Packages; [ python pybind11 ]);
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \;
|
find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \;
|
||||||
|
|
||||||
sed -i src/app/main.cpp \
|
sed -i src/nativepluginprovider.cpp \
|
||||||
-e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath(),"
|
-e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath(),"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,8 @@
|
||||||
, pypresence
|
, pypresence
|
||||||
, pyyaml
|
, pyyaml
|
||||||
, requests
|
, requests
|
||||||
|
, protobuf
|
||||||
|
, moddb
|
||||||
|
|
||||||
# commands that lutris needs
|
# commands that lutris needs
|
||||||
, xrandr
|
, xrandr
|
||||||
|
@ -73,13 +75,13 @@ let
|
||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "lutris-unwrapped";
|
pname = "lutris-unwrapped";
|
||||||
version = "0.5.12";
|
version = "0.5.13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lutris";
|
owner = "lutris";
|
||||||
repo = "lutris";
|
repo = "lutris";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg=";
|
hash = "sha256-ectrfbIkPhIqfhkavDpBCNdLPnGQhCnfFYwTf2IxB50=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||||
|
@ -113,6 +115,8 @@ buildPythonApplication rec {
|
||||||
pypresence
|
pypresence
|
||||||
pyyaml
|
pyyaml
|
||||||
requests
|
requests
|
||||||
|
protobuf
|
||||||
|
moddb
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "ttdl";
|
pname = "ttdl";
|
||||||
version = "3.8.0";
|
version = "3.9.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "VladimirMarkelov";
|
owner = "VladimirMarkelov";
|
||||||
repo = "ttdl";
|
repo = "ttdl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-6QfUy1Y7qFOdBFmDFQyRr+GJZSdH+pbU3dEcAjsV1JM=";
|
sha256 = "sha256-qeMGJn3UNz9VQSn3J71DEzg0lOqO9DyPpwd21UQwXc0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-N+mVfgbL22fmynmz4/xFNxQh7l455cH2jyuczc4XsM4=";
|
cargoHash = "sha256-oIiTiJC+FmiudnJdhSjmKBg6EwXNpDshRZDjeftVR0o=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A CLI tool to manage todo lists in todo.txt format";
|
description = "A CLI tool to manage todo lists in todo.txt format";
|
||||||
|
|
|
@ -17,7 +17,8 @@ buildGoModule rec {
|
||||||
sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY=";
|
sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-f82ibPnauUOuZ5D6Rz3Yyt0jiAXvjN8Or3gud+ri6FA=";
|
vendorHash = "sha256-9uuLidieBMoKz/FLcBnp9wenyveOIzB0IvRBRasulZk=";
|
||||||
|
proxyVendor = true;
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
@ -40,6 +41,5 @@ buildGoModule rec {
|
||||||
maintainers = with maintainers; [ kalbasit ];
|
maintainers = with maintainers; [ kalbasit ];
|
||||||
mainProgram = "wtfutil";
|
mainProgram = "wtfutil";
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
broken = stdenv.isDarwin;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kluctl";
|
pname = "kluctl";
|
||||||
version = "2.19.3";
|
version = "2.19.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kluctl";
|
owner = "kluctl";
|
||||||
repo = "kluctl";
|
repo = "kluctl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-yp471eWrwnJiCAVwqnZzq1rN1Mt4d42ymVvsUtTyOsc=";
|
hash = "sha256-q/LWUTaf0PlNGhUZZIvMTjILmrYAO+jQGrUCqBkbDVM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-Ws0Qaw2hk8alOF/K5Wd0ZcMGr6Q3JiQIo/kHOXiGvmg=";
|
vendorHash = "sha256-AywaABegaM32HnPN4b3xnnG/sggr1Z1Jubfbi1VA1k8=";
|
||||||
|
|
||||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
|
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
|
||||||
|
|
||||||
|
|
|
@ -10,16 +10,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "werf";
|
pname = "werf";
|
||||||
version = "1.2.231";
|
version = "1.2.233";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "werf";
|
owner = "werf";
|
||||||
repo = "werf";
|
repo = "werf";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-tiIfdODyUH3RoB1Htono2ZgN8+kiM1BXpNPn2B9V/mk=";
|
hash = "sha256-3T8LbMbM9ZcG8uLspZSNvM7LYuDAOIWweZsYPTC/DOY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-SRNxV3zRYfbMJB4iGic3lu25VXIrl5011rB6AYqZG8U=";
|
vendorHash = "sha256-AKoK/WAelzMhu9W1zoRe4p5Cx/3NzktLGJEG7gPXekQ=";
|
||||||
|
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -14,32 +14,35 @@
|
||||||
, gstreamer
|
, gstreamer
|
||||||
, gst-plugins-base
|
, gst-plugins-base
|
||||||
, gst-plugins-bad
|
, gst-plugins-bad
|
||||||
, libsecret
|
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
, appstream-glib
|
, appstream-glib
|
||||||
, openssl
|
, openssl
|
||||||
, pipewire
|
, pipewire
|
||||||
, libshumate
|
, libshumate
|
||||||
, wrapGAppsHook4
|
, wrapGAppsHook4
|
||||||
|
, sqlite
|
||||||
|
, xdg-desktop-portal
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fractal-next";
|
pname = "fractal-next";
|
||||||
version = "5-alpha1";
|
version = "5.beta1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
owner = "GNOME";
|
owner = "GNOME";
|
||||||
repo = "fractal";
|
repo = "fractal";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-gHMfBGrq3HiGeqHx2knuc9LomgIW9QA9fCSCcQncvz0=";
|
hash = "sha256-i1kz7k2BBsSmZXUk6U2eT+08T2l950eFd67Cojtd1/k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.importCargoLock {
|
cargoDeps = rustPlatform.importCargoLock {
|
||||||
lockFile = ./Cargo.lock;
|
lockFile = ./Cargo.lock;
|
||||||
outputHashes = {
|
outputHashes = {
|
||||||
"indexed_db_futures-0.2.3" = "sha256-yAG2gqMclkyQNfb+gG+YlPX46rKSKGAmagQqlcP6gr8=";
|
"matrix-sdk-0.6.2" = "sha256-27FYmqkzqh1wI6B2BI8LM4DoMfymyJdOn5OGsJZjBAc=";
|
||||||
"matrix-sdk-0.5.0" = "sha256-qti8NEl8nhGLclX3AjF5X+RLX8AH2CQw/Z+uL3wRMp4=";
|
"ruma-0.8.2" = "sha256-Qsk8KVY5ix7nlDG+1246vQ5HZxgmJmm3KU+RknUFFGg=";
|
||||||
|
"vodozemac-0.3.0" = "sha256-tAimsVD8SZmlVybb7HvRffwlNsfb7gLWGCplmwbLIVE=";
|
||||||
|
"x25519-dalek-1.2.0" = "sha256-AHjhccCqacu0WMTFyxIret7ghJ2V+8wEAwR5L6Hy1KY=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -66,16 +69,13 @@ stdenv.mkDerivation rec {
|
||||||
gtk4
|
gtk4
|
||||||
gtksourceview5
|
gtksourceview5
|
||||||
libadwaita
|
libadwaita
|
||||||
libsecret
|
|
||||||
openssl
|
openssl
|
||||||
pipewire
|
pipewire
|
||||||
libshumate
|
libshumate
|
||||||
|
sqlite
|
||||||
|
xdg-desktop-portal
|
||||||
];
|
];
|
||||||
|
|
||||||
# enables pipewire API deprecated in 0.3.64
|
|
||||||
# fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55
|
|
||||||
env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Matrix group messaging app (development version)";
|
description = "Matrix group messaging app (development version)";
|
||||||
homepage = "https://gitlab.gnome.org/GNOME/fractal";
|
homepage = "https://gitlab.gnome.org/GNOME/fractal";
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, mkDerivation
|
, mkDerivation
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, cmake
|
, cmake
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, doxygen
|
, doxygen
|
||||||
|
@ -33,6 +34,12 @@ mkDerivation rec {
|
||||||
patches = [
|
patches = [
|
||||||
# spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix
|
# spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix
|
||||||
./spuce.patch
|
./spuce.patch
|
||||||
|
# Poco had some breaking API changes in 1.12
|
||||||
|
(fetchpatch {
|
||||||
|
name = "poco-1.12-compat.patch";
|
||||||
|
url = "https://github.com/pothosware/PothosCore/commit/092d1209b0fd0aa8a1733706c994fa95e66fd017.patch";
|
||||||
|
hash = "sha256-bZXG8kD4+1LgDV8viZrJ/DMjg8UvW7b5keJQDXurfkA=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ];
|
nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "docker-compose";
|
pname = "docker-compose";
|
||||||
version = "2.17.3";
|
version = "2.18.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "docker";
|
owner = "docker";
|
||||||
repo = "compose";
|
repo = "compose";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-9P6WpTefcyKtpPGbe+nxoatG/i8v8C/vOX28j9Cu1Hc=";
|
sha256 = "sha256-Zx6yN3hQ3o2yvzNEJ65Q4dtnOvTg/tNa8MJvTZuwick=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||||
rm -rf e2e/
|
rm -rf e2e/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
vendorHash = "sha256-YnGO5ccl1W3Q6DQ+6cEw7AEZTSbPcvJdQIWzWbQJ9Yo=";
|
vendorHash = "sha256-RXxuHfNzJe+qLw4A+3jZQTJQgro5sXau4+Ff6OG0GtU=";
|
||||||
|
|
||||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||||
|
|
||||||
|
|
|
@ -111,6 +111,6 @@ stdenv.mkDerivation rec {
|
||||||
# In Fedora twitter-twemoji-fonts source
|
# In Fedora twitter-twemoji-fonts source
|
||||||
## spec files are MIT: https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files
|
## spec files are MIT: https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files
|
||||||
license = with licenses; [ asl20 ofl cc-by-40 mit ];
|
license = with licenses; [ asl20 ofl cc-by-40 mit ];
|
||||||
maintainers = with maintainers; [ jtojnar emily ];
|
maintainers = with maintainers; [ emily ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
description = "Linux application sandboxing and distribution framework";
|
description = "Linux application sandboxing and distribution framework";
|
||||||
homepage = "https://flatpak.org/";
|
homepage = "https://flatpak.org/";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "GObject/GTK port of three.js";
|
description = "GObject/GTK port of three.js";
|
||||||
homepage = "https://github.com/alexlarsson/gthree";
|
homepage = "https://github.com/alexlarsson/gthree";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin
|
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin
|
||||||
};
|
};
|
||||||
|
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "ABI Generic Analysis and Instrumentation Library";
|
description = "ABI Generic Analysis and Instrumentation Library";
|
||||||
homepage = "https://sourceware.org/libabigail/";
|
homepage = "https://sourceware.org/libabigail/";
|
||||||
license = licenses.asl20-llvm;
|
license = licenses.asl20-llvm;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "A library full of GTK widgets for mobile phones";
|
description = "A library full of GTK widgets for mobile phones";
|
||||||
homepage = "https://source.puri.sm/Librem5/libhandy";
|
homepage = "https://source.puri.sm/Librem5/libhandy";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
|
||||||
pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
|
pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
|
||||||
version = "0.6";
|
version = "0.6";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
outputs = [ "out" "dev" ]
|
||||||
|
++ lib.optional (variant != "qt5") "devdoc";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "flatpak";
|
owner = "flatpak";
|
||||||
|
@ -62,12 +63,14 @@ stdenv.mkDerivation rec {
|
||||||
gtk4
|
gtk4
|
||||||
] ++ lib.optionals (variant == "qt5") [
|
] ++ lib.optionals (variant == "qt5") [
|
||||||
libsForQt5.qtbase
|
libsForQt5.qtbase
|
||||||
|
libsForQt5.qtx11extras
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Dbackends=${lib.optionalString (variant != null) variant}"
|
"-Dbackends=${lib.optionalString (variant != null) variant}"
|
||||||
"-Dvapi=${if variant != "qt5" then "true" else "false"}"
|
"-Dvapi=${if variant != "qt5" then "true" else "false"}"
|
||||||
"-Dintrospection=${if variant != "qt5" then "true" else "false"}"
|
"-Dintrospection=${if variant != "qt5" then "true" else "false"}"
|
||||||
|
"-Ddocs=${if variant != "qt5" then "true" else "false"}" # requires introspection=true
|
||||||
];
|
];
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
@ -75,6 +78,9 @@ stdenv.mkDerivation rec {
|
||||||
moveToOutput "share/doc" "$devdoc"
|
moveToOutput "share/doc" "$devdoc"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# we don't have any binaries
|
||||||
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Flatpak portal library";
|
description = "Flatpak portal library";
|
||||||
homepage = "https://github.com/flatpak/libportal";
|
homepage = "https://github.com/flatpak/libportal";
|
||||||
|
|
|
@ -16,13 +16,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "openimageio";
|
pname = "openimageio";
|
||||||
version = "2.4.11.0";
|
version = "2.4.11.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OpenImageIO";
|
owner = "OpenImageIO";
|
||||||
repo = "oiio";
|
repo = "oiio";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-YWVKmvUHq1QSpTCP0UBfSxqWTIWjxOF0gVE7qljCOyY=";
|
hash = "sha256-Q8Gb/zscZre7fJPyLlZn04Xp3VFFbr6Z007mDPzownc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" "doc" ];
|
outputs = [ "bin" "out" "dev" "doc" ];
|
||||||
|
|
|
@ -224,7 +224,7 @@ let
|
||||||
homepage = "https://pipewire.org/";
|
homepage = "https://pipewire.org/";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ jtojnar kranzes k900 ];
|
maintainers = with maintainers; [ kranzes k900 ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,38 +1,21 @@
|
||||||
{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
|
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, pcre2, expat, sqlite, openssl, unixODBC, libmysqlclient }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "poco";
|
pname = "poco";
|
||||||
|
|
||||||
version = "1.11.1";
|
version = "1.12.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz";
|
owner = "pocoproject";
|
||||||
sha256 = "sha256-MczOYCAEcnAAO/tbDafirUMohMI9PNUJyG9HzzpeXSo=";
|
repo = "poco";
|
||||||
|
sha256 = "sha256-gQ97fkoTGI6yuMPjEsITfapH9FSQieR8rcrPR1nExxc=";
|
||||||
|
rev = "poco-${version}-release";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Use GNUInstallDirs (https://github.com/pocoproject/poco/pull/3503)
|
|
||||||
(fetchpatch {
|
|
||||||
name = "use-gnuinstalldirs.patch";
|
|
||||||
url = "https://github.com/pocoproject/poco/commit/16a2a74f6c28c6e6baca2ba26b4964b51d8a1b74.patch";
|
|
||||||
sha256 = "sha256-mkemG8UemJEUQxae1trKakhnJFJW0AufDYFAbmnINbY=";
|
|
||||||
# Files not included in release tarball
|
|
||||||
excludes = [
|
|
||||||
"Encodings/Compiler/CMakeLists.txt"
|
|
||||||
"PocoDoc/CMakeLists.txt"
|
|
||||||
"NetSSL_Win/CMakeLists.txt"
|
|
||||||
"PDF/CMakeLists.txt"
|
|
||||||
"SevenZip/CMakeLists.txt"
|
|
||||||
"ApacheConnector/CMakeLists.txt"
|
|
||||||
"CppParser/CMakeLists.txt"
|
|
||||||
];
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ unixODBC libmysqlclient ];
|
buildInputs = [ unixODBC libmysqlclient ];
|
||||||
propagatedBuildInputs = [ zlib pcre expat sqlite openssl ];
|
propagatedBuildInputs = [ zlib pcre2 expat sqlite openssl ];
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
@ -43,11 +26,18 @@ stdenv.mkDerivation rec {
|
||||||
"-DPOCO_UNBUNDLED=ON"
|
"-DPOCO_UNBUNDLED=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
grep -rlF INTERFACE_INCLUDE_DIRECTORIES "$dev/lib/cmake/Poco" | while read -r f; do
|
||||||
|
substituteInPlace "$f" \
|
||||||
|
--replace "$"'{_IMPORT_PREFIX}/include' ""
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://pocoproject.org/";
|
homepage = "https://pocoproject.org/";
|
||||||
description = "Cross-platform C++ libraries with a network/internet focus";
|
description = "Cross-platform C++ libraries with a network/internet focus";
|
||||||
license = licenses.boost;
|
license = licenses.boost;
|
||||||
maintainers = with maintainers; [ orivej ];
|
maintainers = with maintainers; [ orivej tomodachi94 ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
5960
pkgs/development/node-packages/node-packages.nix
generated
5960
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -30,6 +30,6 @@ mkDerivation {
|
||||||
description = "An application for building and managing Phars";
|
description = "An application for building and managing Phars";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
homepage = "https://github.com/box-project/box";
|
homepage = "https://github.com/box-project/box";
|
||||||
maintainers = with maintainers; [ jtojnar ] ++ teams.php.members;
|
maintainers = with maintainers; [ ] ++ teams.php.members;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,6 @@ mkDerivation {
|
||||||
description = "A tool to automatically fix PHP coding standards issues";
|
description = "A tool to automatically fix PHP coding standards issues";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
homepage = "https://cs.symfony.com/";
|
homepage = "https://cs.symfony.com/";
|
||||||
maintainers = with maintainers; [ jtojnar ] ++ teams.php.members;
|
maintainers = with maintainers; [ ] ++ teams.php.members;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,6 +43,6 @@ mkDerivation {
|
||||||
description = "Tool to check syntax of PHP files faster than serial check with fancier output";
|
description = "Tool to check syntax of PHP files faster than serial check with fancier output";
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
homepage = "https://github.com/php-parallel-lint/PHP-Parallel-Lint";
|
homepage = "https://github.com/php-parallel-lint/PHP-Parallel-Lint";
|
||||||
maintainers = with maintainers; [ jtojnar ] ++ teams.php.members;
|
maintainers = with maintainers; [ ] ++ teams.php.members;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,6 +28,6 @@ buildPythonPackage rec {
|
||||||
homepage = "https://github.com/gnome-keysign/babel-glade";
|
homepage = "https://github.com/gnome-keysign/babel-glade";
|
||||||
description = "Babel Glade XML files translatable strings extractor";
|
description = "Babel Glade XML files translatable strings extractor";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,54 +4,42 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, scikit-learn
|
, scikit-learn
|
||||||
, scipy
|
, scipy
|
||||||
|
, colorama
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, isPy27
|
, pythonOlder
|
||||||
, fetchpatch
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bayesian-optimization";
|
pname = "bayesian-optimization";
|
||||||
version = "1.2.0";
|
version = "1.4.3";
|
||||||
disabled = isPy27;
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fmfn";
|
owner = "bayesian-optimization";
|
||||||
repo = "BayesianOptimization";
|
repo = "BayesianOptimization";
|
||||||
rev = version;
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "01mg9npiqh1qmq5ldnbpjmr8qkiw827msiv3crpkhbj4bdzasbfm";
|
hash = "sha256-Bp/ZhVSW5lTGwnsd/doOXu++Gxw/51owCfMm96Qmgd4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
scikit-learn
|
scikit-learn
|
||||||
scipy
|
scipy
|
||||||
];
|
colorama
|
||||||
|
|
||||||
patches = [
|
|
||||||
# TypeError with scipy >= 1.8
|
|
||||||
# https://github.com/fmfn/BayesianOptimization/issues/300
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/fmfn/BayesianOptimization/commit/b4e09a25842985a4a0acea0c0f5c8789b7be125e.patch";
|
|
||||||
hash = "sha256-PfcifCFd4GRNTA+4+T+6A760QAgyZxhDCTyzNn2crdM=";
|
|
||||||
name = "scipy_18_fix.patch";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [ pytestCheckHook ];
|
nativeCheckInputs = [ pytestCheckHook ];
|
||||||
|
|
||||||
disabledTests = [
|
|
||||||
# New sklearn broke one test
|
|
||||||
# https://github.com/fmfn/BayesianOptimization/issues/243
|
|
||||||
"test_suggest_with_one_observation"
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonImportsCheck = [ "bayes_opt" ];
|
pythonImportsCheck = [ "bayes_opt" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
broken = stdenv.isLinux && stdenv.isAarch64;
|
||||||
description = ''
|
description = ''
|
||||||
A Python implementation of global optimization with gaussian processes
|
A Python implementation of global optimization with gaussian processes
|
||||||
'';
|
'';
|
||||||
homepage = "https://github.com/fmfn/BayesianOptimization";
|
homepage = "https://github.com/bayesian-optimization/BayesianOptimization";
|
||||||
|
changelog = "https://github.com/bayesian-optimization/BayesianOptimization/releases/tag/v${version}";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = [ maintainers.juliendehos ];
|
maintainers = [ maintainers.juliendehos ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -37,6 +37,6 @@ buildPythonPackage rec {
|
||||||
description = "Standalone CFF subroutinizer based on AFDKO tx";
|
description = "Standalone CFF subroutinizer based on AFDKO tx";
|
||||||
homepage = "https://github.com/adobe-type-tools/cffsubr";
|
homepage = "https://github.com/adobe-type-tools/cffsubr";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,6 +46,6 @@ buildPythonPackage rec {
|
||||||
description = "Add support for commands that use configuration files to Click";
|
description = "Add support for commands that use configuration files to Click";
|
||||||
homepage = "https://github.com/click-contrib/click-configfile";
|
homepage = "https://github.com/click-contrib/click-configfile";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,6 @@ buildPythonPackage rec {
|
||||||
description = "Add support for showwing that command line app is active to Click";
|
description = "Add support for showwing that command line app is active to Click";
|
||||||
homepage = "https://github.com/click-contrib/click-spinner";
|
homepage = "https://github.com/click-contrib/click-spinner";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,6 +39,6 @@ buildPythonPackage rec {
|
||||||
description = "Cloudsmith API Client";
|
description = "Cloudsmith API Client";
|
||||||
homepage = "https://github.com/cloudsmith-io/cloudsmith-api";
|
homepage = "https://github.com/cloudsmith-io/cloudsmith-api";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "cohere";
|
pname = "cohere";
|
||||||
version = "4.3.1";
|
version = "4.5.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-koIDk7JPKb8lhBkwaX/o76AuaNrFaeapVp54RRxEY9U=";
|
hash = "sha256-+/oeZpYyCrQava0lEt5uLlSc65XaBCyI/G/lwAxfBTA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -40,6 +40,6 @@ buildPythonPackage rec {
|
||||||
description = "CFF table subroutinizer for FontTools";
|
description = "CFF table subroutinizer for FontTools";
|
||||||
homepage = "https://github.com/googlefonts/compreffor";
|
homepage = "https://github.com/googlefonts/compreffor";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,6 +62,6 @@ buildPythonPackage {
|
||||||
description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications";
|
description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications";
|
||||||
homepage = "https://gitlab.com/dogtail/dogtail";
|
homepage = "https://gitlab.com/dogtail/dogtail";
|
||||||
license = lib.licenses.gpl2Only;
|
license = lib.licenses.gpl2Only;
|
||||||
maintainers = with lib.maintainers; [ jtojnar ];
|
maintainers = with lib.maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, pytest
|
, pytest
|
||||||
, pysha3
|
|
||||||
, safe-pysha3
|
, safe-pysha3
|
||||||
, pycryptodome
|
, pycryptodome
|
||||||
}:
|
}:
|
||||||
|
@ -32,7 +31,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
passthru.optional-dependencies = {
|
passthru.optional-dependencies = {
|
||||||
pycryptodome = [ pycryptodome ];
|
pycryptodome = [ pycryptodome ];
|
||||||
pysha3 = if pythonOlder "3.9" then [ pysha3 ] else [ safe-pysha3 ];
|
pysha3 = [ safe-pysha3 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
|
, setuptools-scm
|
||||||
, dulwich
|
, dulwich
|
||||||
, mercurial
|
, mercurial
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
@ -8,16 +9,20 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "hg-git";
|
pname = "hg-git";
|
||||||
version = "1.0.1";
|
version = "1.0.2";
|
||||||
format = "setuptools";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-P3Ng9bD16AX7DJac/Y168GSWLTIAD3I1aLblYIDQiyk=";
|
hash = "sha256-WoQOh6cKFcnB4GGWvD7VlV53LxHpsYA+iMDJ9VrwNBY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
setuptools-scm
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
dulwich
|
dulwich
|
||||||
mercurial
|
mercurial
|
||||||
|
|
|
@ -26,6 +26,6 @@ buildPythonPackage rec {
|
||||||
description = "Load me later. A lazy plugin management system for Python";
|
description = "Load me later. A lazy plugin management system for Python";
|
||||||
homepage = "http://lml.readthedocs.io/";
|
homepage = "http://lml.readthedocs.io/";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = with lib.maintainers; [ jtojnar ];
|
maintainers = with lib.maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
47
pkgs/development/python-modules/moddb/default.nix
Normal file
47
pkgs/development/python-modules/moddb/default.nix
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pythonRelaxDepsHook
|
||||||
|
, beautifulsoup4
|
||||||
|
, pyrate-limiter
|
||||||
|
, requests
|
||||||
|
, toolz
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "moddb";
|
||||||
|
version = "0.8.1";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "ClementJ18";
|
||||||
|
repo = "moddb";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-Pl/Wc0CL31+ZLFfy6yUfrZzsECifnEpWVGRHZVaFWG4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pythonRelaxDepsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
beautifulsoup4
|
||||||
|
pyrate-limiter
|
||||||
|
requests
|
||||||
|
toolz
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonRelaxDeps = true;
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "moddb" ];
|
||||||
|
|
||||||
|
doCheck = false; # Tests try to access the internet.
|
||||||
|
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A Python scrapper to access ModDB mods, games and more as objects";
|
||||||
|
homepage = "https://github.com/ClementJ18/moddb";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ kranzes ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||||
description = "An Ordered Set implementation in Cython";
|
description = "An Ordered Set implementation in Cython";
|
||||||
homepage = "https://pypi.python.org/pypi/orderedset";
|
homepage = "https://pypi.python.org/pypi/orderedset";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = [ maintainers.jtojnar ];
|
maintainers = [ ];
|
||||||
# No support for Python 3.9/3.10
|
# No support for Python 3.9/3.10
|
||||||
# https://github.com/simonpercivall/orderedset/issues/36
|
# https://github.com/simonpercivall/orderedset/issues/36
|
||||||
broken = true;
|
broken = true;
|
||||||
|
|
|
@ -14,17 +14,17 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "osc-lib";
|
pname = "osc-lib";
|
||||||
version = "unstable-2022-03-09";
|
version = "2.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "openstack";
|
owner = "openstack";
|
||||||
repo = "osc-lib";
|
repo = "osc-lib";
|
||||||
rev = "65c73fd5030276e34f3d52c03ddb9d27cd8ec6f5";
|
rev = version;
|
||||||
hash = "sha256-CLE9lrMMlvVrihe+N4wvIKe8t9IZ1TpHHVdn2dnvAOI=";
|
hash = "sha256-ijL/m9BTAgDUjqy77nkl3rDppeUPBycmEqlL6uMruIA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# fake version to make pbr.packaging happy and not reject it...
|
# fake version to make pbr.packaging happy and not reject it...
|
||||||
PBR_VERSION = "2.5.0";
|
PBR_VERSION = version;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pbr
|
pbr
|
||||||
|
|
|
@ -1,9 +1,13 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, pygobject3 }:
|
{ lib, buildPythonPackage, fetchPypi, pygobject3, pythonAtLeast }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pydbus";
|
pname = "pydbus";
|
||||||
version = "0.6.0";
|
version = "0.6.0";
|
||||||
|
|
||||||
|
# Python 3.11 changed the API of the `inspect` module and pydbus was never
|
||||||
|
# updated to adapt; last commit was in 2018.
|
||||||
|
disabled = pythonAtLeast "3.11";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0b0gipvz7vcfa9ddmwq2jrx16d4apb0hdnl5q4i3h8jlzwp1c1s2";
|
sha256 = "0b0gipvz7vcfa9ddmwq2jrx16d4apb0hdnl5q4i3h8jlzwp1c1s2";
|
||||||
|
|
|
@ -29,6 +29,6 @@ buildPythonPackage rec {
|
||||||
description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases";
|
description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases";
|
||||||
homepage = "http://docs.pyexcel.org/";
|
homepage = "http://docs.pyexcel.org/";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = with lib.maintainers; [ jtojnar ];
|
maintainers = with lib.maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,6 +36,6 @@ buildPythonPackage rec {
|
||||||
description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy";
|
description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy";
|
||||||
homepage = "http://docs.pyexcel.org/";
|
homepage = "http://docs.pyexcel.org/";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = with lib.maintainers; [ jtojnar ];
|
maintainers = with lib.maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,6 @@ buildPythonPackage rec {
|
||||||
description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt";
|
description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt";
|
||||||
homepage = "http://docs.pyexcel.org/";
|
homepage = "http://docs.pyexcel.org/";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = with lib.maintainers; [ jtojnar ];
|
maintainers = with lib.maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,6 +38,6 @@ buildPythonPackage rec {
|
||||||
description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files";
|
description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files";
|
||||||
homepage = "http://docs.pyexcel.org/";
|
homepage = "http://docs.pyexcel.org/";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = with lib.maintainers; [ jtojnar ];
|
maintainers = with lib.maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,18 @@
|
||||||
{ lib, buildPythonPackage, fetchurl, isPyPy
|
{ lib
|
||||||
, gpgme }:
|
, buildPythonPackage
|
||||||
|
, fetchurl
|
||||||
|
, gpgme
|
||||||
|
, isPyPy
|
||||||
|
, pythonAtLeast
|
||||||
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "0.3";
|
version = "0.3";
|
||||||
pname = "pygpgme";
|
pname = "pygpgme";
|
||||||
disabled = isPyPy;
|
|
||||||
|
# Native code doesn't compile against the C API of Python 3.11:
|
||||||
|
# https://bugs.launchpad.net/pygpgme/+bug/1996122
|
||||||
|
disabled = isPyPy || pythonAtLeast "3.11";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${pname}-${version}.tar.gz";
|
url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${pname}-${version}.tar.gz";
|
||||||
|
|
34
pkgs/development/python-modules/pyrate-limiter/default.nix
Normal file
34
pkgs/development/python-modules/pyrate-limiter/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, poetry-core
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "pyrate-limiter";
|
||||||
|
version = "2.10.0";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "vutran1710";
|
||||||
|
repo = "PyrateLimiter";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
poetry-core
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"pyrate_limiter"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Python Rate-Limiter using Leaky-Bucket Algorimth Family";
|
||||||
|
homepage = "https://github.com/vutran1710/PyrateLimiter";
|
||||||
|
changelog = "https://github.com/vutran1710/PyrateLimiter/blob/${src.rev}/CHANGELOG.md";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ kranzes ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,18 +0,0 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "pysha3";
|
|
||||||
version = "1.0.2";
|
|
||||||
disabled = pythonOlder "2.7";
|
|
||||||
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit pname version;
|
|
||||||
sha256 = "17kkjapv6sr906ib0r5wpldmzw7scza08kv241r98vffy9rqx67y";
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Backport of hashlib.sha3 for 2.7 to 3.5";
|
|
||||||
homepage = "https://github.com/tiran/pysha3";
|
|
||||||
license = lib.licenses.psfl;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,17 +1,28 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi }:
|
{ lib, buildPythonPackage, cython, fetchFromGitHub }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-ctags3";
|
pname = "python-ctags3";
|
||||||
version = "1.5.0";
|
version = "1.5.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchFromGitHub {
|
||||||
inherit pname version;
|
owner = "universal-ctags";
|
||||||
sha256 = "a2cb0b35f0d67bab47045d803dce8291a1500af11832b154f69b3785f2130daa";
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-XVsZckNVJ1H5q8FzqoVd1UWRw0zOygvRtb7arX9dwGE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cython
|
||||||
|
];
|
||||||
|
|
||||||
|
# Regenerating the bindings keeps later versions of Python happy
|
||||||
|
postPatch = ''
|
||||||
|
cython src/_readtags.pyx
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
inherit (src.meta) homepage;
|
||||||
description = "Ctags indexing python bindings";
|
description = "Ctags indexing python bindings";
|
||||||
homepage = "https://github.com/jonashaag/python-ctags3";
|
|
||||||
license = licenses.lgpl3Plus;
|
license = licenses.lgpl3Plus;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,6 +65,6 @@ buildPythonPackage rec {
|
||||||
homepage = "https://github.com/daltonmaag/statmake";
|
homepage = "https://github.com/daltonmaag/statmake";
|
||||||
changelog = "https://github.com/daltonmaag/statmake/releases/tag/v${version}";
|
changelog = "https://github.com/daltonmaag/statmake/releases/tag/v${version}";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,6 +64,6 @@ buildPythonPackage rec {
|
||||||
description = "Bridge from UFOs to FontTools objects";
|
description = "Bridge from UFOs to FontTools objects";
|
||||||
homepage = "https://github.com/googlefonts/ufo2ft";
|
homepage = "https://github.com/googlefonts/ufo2ft";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,6 +49,6 @@ buildPythonPackage rec {
|
||||||
description = "Library to deal with UFO font sources";
|
description = "Library to deal with UFO font sources";
|
||||||
homepage = "https://github.com/fonttools/ufoLib2";
|
homepage = "https://github.com/fonttools/ufoLib2";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,14 +7,15 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "uptime-kuma-api";
|
pname = "uptime-kuma-api";
|
||||||
version = "0.10.0";
|
version = "0.13.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "uptime_kuma_api";
|
pname = "uptime_kuma_api";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-qBSXQyruLVGJ0QeihnEUXOqYpvVftdFM5ED3usHT0OQ=";
|
hash = "sha256-MoHE6Y7x1F1l70tuCHNIPt+vpqfJ00EUIMHnE4476Co=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -32,6 +33,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A Python wrapper for the Uptime Kuma Socket.IO API";
|
description = "A Python wrapper for the Uptime Kuma Socket.IO API";
|
||||||
homepage = "https://github.com/lucasheld/uptime-kuma-api";
|
homepage = "https://github.com/lucasheld/uptime-kuma-api";
|
||||||
|
changelog = "https://github.com/lucasheld/uptime-kuma-api/blob/${version}/CHANGELOG.md";
|
||||||
license = with licenses; [ mit ];
|
license = with licenses; [ mit ];
|
||||||
maintainers = with maintainers; [ julienmalka ];
|
maintainers = with maintainers; [ julienmalka ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
|
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
|
||||||
, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
|
, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
|
||||||
, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml
|
, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml
|
||||||
, autoSignDarwinBinariesHook
|
, autoSignDarwinBinariesHook, fetchpatch
|
||||||
}@args:
|
}@args:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -530,6 +530,15 @@ in
|
||||||
|
|
||||||
ovirt-engine-sdk = attrs: {
|
ovirt-engine-sdk = attrs: {
|
||||||
buildInputs = [ curl libxml2 ];
|
buildInputs = [ curl libxml2 ];
|
||||||
|
dontBuild = false;
|
||||||
|
patches = [
|
||||||
|
# fix ruby 3.1 https://github.com/oVirt/ovirt-engine-sdk-ruby/pull/3
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/oVirt/ovirt-engine-sdk-ruby/pull/3/commits/b596b919bc7857fdc0fc1c61a8cb7eab32cfc2db.patch";
|
||||||
|
hash = "sha256-AzGTQaD/e6X4LOMuXhy/WhbayhWKYCGHXPFlzLRWyPM=";
|
||||||
|
stripLen = 1;
|
||||||
|
})
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
pango = attrs: {
|
pango = attrs: {
|
||||||
|
|
|
@ -145,7 +145,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
code.
|
code.
|
||||||
'';
|
'';
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ jtojnar mbe AndersonTorres ];
|
maintainers = with maintainers; [ mbe AndersonTorres ];
|
||||||
inherit (python3.meta) platforms;
|
inherit (python3.meta) platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
homepage = "https://help.cloudsmith.io/docs/cli/";
|
homepage = "https://help.cloudsmith.io/docs/cli/";
|
||||||
description = "Cloudsmith Command Line Interface";
|
description = "Cloudsmith Command Line Interface";
|
||||||
changelog = "https://github.com/cloudsmith-io/cloudsmith-cli/blob/v${version}/CHANGELOG.md";
|
changelog = "https://github.com/cloudsmith-io/cloudsmith-cli/blob/v${version}/CHANGELOG.md";
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
platforms = with platforms; unix;
|
platforms = with platforms; unix;
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "vitess";
|
pname = "vitess";
|
||||||
version = "16.0.1";
|
version = "16.0.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vitessio";
|
owner = "vitessio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-2iy80Ac8yh7lTiM53qXygVX/n3r2C/MmijoQRXIhoRk=";
|
hash = "sha256-8nFvNO+zb7Z0g2BMnlk+obDolCQrlfClOIg0mPW8gAU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-hC0skrEDXn6SXjH75ur77I0pHnGSURErAy97lmVvqro=";
|
vendorHash = "sha256-hC0skrEDXn6SXjH75ur77I0pHnGSURErAy97lmVvqro=";
|
||||||
|
|
|
@ -152,7 +152,7 @@ in stdenv.mkDerivation rec {
|
||||||
description = "Tool to build flatpaks from source";
|
description = "Tool to build flatpaks from source";
|
||||||
homepage = "https://github.com/flatpak/flatpak-builder";
|
homepage = "https://github.com/flatpak/flatpak-builder";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gosec";
|
pname = "gosec";
|
||||||
version = "2.15.0";
|
version = "2.16.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "securego";
|
owner = "securego";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-GB+BAGIVPtyY2Bsm/yDTYjJixLGvGwsIoOLCyy/0AJk=";
|
sha256 = "sha256-ajaTXq1IIUjzEMwdsVCnA4G97dCFod/hKrngDi5piGY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-5LIIXf+8ZN7WcFSPzsJ5Tt+d40AgF5YI3O1oXms1WgI=";
|
vendorHash = "sha256-UTxBKjyWmGq7FhB3j1NdSgOHZRYn6fAtuKJb4UcbPno=";
|
||||||
|
|
||||||
subPackages = [
|
subPackages = [
|
||||||
"cmd/gosec"
|
"cmd/gosec"
|
||||||
|
|
|
@ -34,7 +34,7 @@ mkDerivation {
|
||||||
description = "Phone Simulator for modem testing";
|
description = "Phone Simulator for modem testing";
|
||||||
homepage = "https://01.org/ofono";
|
homepage = "https://01.org/ofono";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "revive";
|
pname = "revive";
|
||||||
version = "1.3.1";
|
version = "1.3.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mgechev";
|
owner = "mgechev";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Iqe3iFE9hTPUgIO6MoPHAkr+KU5mEJ3ZY4Oh9xhXido=";
|
sha256 = "sha256-zv9N5Sw23SalP2keII/WC71uhGU+nr+DG3GJcbUwonQ=";
|
||||||
# populate values that require us to use git. By doing this in postFetch we
|
# populate values that require us to use git. By doing this in postFetch we
|
||||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
||||||
rm -rf $out/.git
|
rm -rf $out/.git
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
vendorHash = "sha256-FHm4TjsAYu4VM2WAHdd2xPP3/54YM6ei6cppHWF8LDc=";
|
vendorHash = "sha256-7VZcZR04JyNa1a4CpLbE7ig+orML3fhdeBOZGTNACKc=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
@ -35,7 +35,7 @@ buildGoModule rec {
|
||||||
|
|
||||||
# The following tests fail when built by nix:
|
# The following tests fail when built by nix:
|
||||||
#
|
#
|
||||||
# $ nix log /nix/store/build-revive.1.3.1.drv | grep FAIL
|
# $ nix log /nix/store/build-revive.1.3.2.drv | grep FAIL
|
||||||
#
|
#
|
||||||
# --- FAIL: TestAll (0.01s)
|
# --- FAIL: TestAll (0.01s)
|
||||||
# --- FAIL: TestTimeEqual (0.00s)
|
# --- FAIL: TestTimeEqual (0.00s)
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, openssl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, glibc
|
, glibc
|
||||||
, libsoup
|
, libsoup
|
||||||
|
@ -16,22 +17,22 @@ let
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "tauri";
|
pname = "tauri";
|
||||||
version = "1.2.4";
|
version = "1.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tauri-apps";
|
owner = "tauri-apps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "tauri-v${version}";
|
rev = "tauri-v${version}";
|
||||||
sha256 = "sha256-BzstYoRZuZTNAkVGqPGYrd/AiWEhoH6t/XezDaFdmVo=";
|
hash = "sha256-+Zez3dxLtcPFzrPdi+yGucr+55GDmMsaLlUZcyqprtc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||||
sourceRoot = "source/tooling/cli";
|
sourceRoot = "source/tooling/cli";
|
||||||
|
|
||||||
cargoHash = "sha256-t5MlJpQOA5T/EwbPoSD95kATGReiZTmq+JkbDVbRj+0=";
|
cargoHash = "sha256-ErUzhmPA2M1H4B4SrEt4FRWHcWLA1UzQqVA1gkrmdJQ=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ]
|
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ]
|
||||||
++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "vendir";
|
pname = "vendir";
|
||||||
version = "0.32.1";
|
version = "0.33.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vmware-tanzu";
|
owner = "vmware-tanzu";
|
||||||
repo = "carvel-vendir";
|
repo = "carvel-vendir";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-IgPUqIR9xuLEglVqVHz2KvqqCHpCPYv8TX+Z6q5xCNA=";
|
sha256 = "sha256-jXPyOnGCyXe06pazppo6czJ4CpaeEscRbanchDnz2tw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorHash = null;
|
||||||
|
|
||||||
subPackages = [ "cmd/vendir" ];
|
subPackages = [ "cmd/vendir" ];
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ in stdenv.mkDerivation {
|
||||||
|
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
|
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
hydraPlatforms = platforms.linux; # sdl-config times out on darwin
|
hydraPlatforms = platforms.linux; # sdl-config times out on darwin
|
||||||
};
|
};
|
||||||
|
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "Gthree port of HexGL";
|
description = "Gthree port of HexGL";
|
||||||
homepage = "https://github.com/alexlarsson/gnome-hexgl";
|
homepage = "https://github.com/alexlarsson/gnome-hexgl";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
{ fetchFromGitHub, lib, stdenv, kernel ? false }:
|
{ fetchFromGitHub, lib, stdenv, kernel ? false }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cryptodev-linux-1.12";
|
pname = "cryptodev-linux-1.13";
|
||||||
name = "${pname}-${kernel.version}";
|
name = "${pname}-${kernel.version}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cryptodev-linux";
|
owner = "cryptodev-linux";
|
||||||
repo = "cryptodev-linux";
|
repo = "cryptodev-linux";
|
||||||
rev = pname;
|
rev = pname;
|
||||||
sha256 = "sha256-vJQ10rG5FGbeEOqCUmH/pZ0P77kAW/MtUarywbtIyHw=";
|
hash = "sha256-EzTPoKYa+XWOAa/Dk7ru02JmlymHeXVX7RMmEoJ1OT0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||||
|
|
|
@ -128,6 +128,6 @@ stdenv.mkDerivation rec {
|
||||||
description = "Makes user-selected power profiles handling available over D-Bus";
|
description = "Makes user-selected power profiles handling available over D-Bus";
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ jtojnar mvnetbiz ];
|
maintainers = with maintainers; [ mvnetbiz ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rdma-core";
|
pname = "rdma-core";
|
||||||
version = "45.0";
|
version = "46.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "linux-rdma";
|
owner = "linux-rdma";
|
||||||
repo = "rdma-core";
|
repo = "rdma-core";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-GjR/gFC7fkcLyl8FwTWbQ+jpJTFRqjExjulXwrsRlDY=";
|
sha256 = "sha256-/mhaEACBAtKdjn5hIj7YnuzrwraiuA4sR9eHg3w0YZM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rtl8812au";
|
pname = "rtl8812au";
|
||||||
version = "${kernel.version}-unstable-2023-01-17";
|
version = "${kernel.version}-unstable-2023-05-11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "morrownr";
|
owner = "morrownr";
|
||||||
repo = "8812au-20210629";
|
repo = "8812au-20210629";
|
||||||
rev = "0a8bb3cec3ef91e6ef8cf549ca926016ba0a8acd";
|
rev = "765d4e4bd5970f4c1c79e63bbe301667e5e029c9";
|
||||||
sha256 = "sha256-25NaMQq9H6mqVynNQJXpqISAslxfEVSt3ELzG7s4mV4=";
|
hash = "sha256-FF2LVfOpITMJ5LiwsGAudrWStlkKsZUlHvzZs03gb9g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies;
|
nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies;
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "headscale";
|
pname = "headscale";
|
||||||
version = "0.22.1";
|
version = "0.22.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "juanfont";
|
owner = "juanfont";
|
||||||
repo = "headscale";
|
repo = "headscale";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-6T4wWuhikanoQGGjVvNJak5yvgcEfhGtOmfLc2xKmms=";
|
hash = "sha256-nqmTqe3F3Oh8rnJH0clwACD/0RpqmfOMXNubr3C8rEc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-+JxS4Q6rTpdBwms2nkVDY/Kluv2qu2T0BaOIjfeX85M=";
|
vendorHash = "sha256-IOkbbFtE6+tNKnglE/8ZuNxhPSnloqM2sLgTvagMmnc=";
|
||||||
|
|
||||||
ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
|
ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@ let
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = [ ];
|
maintainers = [ ];
|
||||||
license = [ licenses.asl20 ];
|
license = [ licenses.asl20 ];
|
||||||
|
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -19,13 +19,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "oven-media-engine";
|
pname = "oven-media-engine";
|
||||||
version = "0.15.10";
|
version = "0.15.11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "AirenSoft";
|
owner = "AirenSoft";
|
||||||
repo = "OvenMediaEngine";
|
repo = "OvenMediaEngine";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-gQ9Z8VMu5v4zEo4vtViNFG0QP5JooHsQxJPMOnZmVZM=";
|
sha256 = "sha256-PkdzxLIch0OObFs1zFE7gg6R7bwP2qwpqQqvY3SMnuY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "source/src";
|
sourceRoot = "source/src";
|
||||||
|
@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://ovenmediaengine.com";
|
homepage = "https://ovenmediaengine.com";
|
||||||
license = licenses.agpl3Only;
|
license = licenses.agpl3Only;
|
||||||
maintainers = with maintainers; [ lukegb ];
|
maintainers = with maintainers; [ lukegb ];
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "uptime-kuma";
|
pname = "uptime-kuma";
|
||||||
version = "1.21.2";
|
version = "1.21.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "louislam";
|
owner = "louislam";
|
||||||
repo = "uptime-kuma";
|
repo = "uptime-kuma";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Xu5mTerhLjOMnLXhjCdnw4yaznfta3h3D9VGk12JziE=";
|
sha256 = "sha256-hNtD8R8nDwO+uJ5WD8TxaCyYD7ESvBPmcv7iT7NAu6s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-J00sLDfUOIy/ZJTqKrMY1dAyE3HY9Cqm9vTEm2lmLoY=";
|
npmDepsHash = "sha256-yPUVLtqfowSuvrzp4Edcsussaxao5Ti1/sLsd9lmiSM=";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fixes the permissions of the database being not set correctly
|
# Fixes the permissions of the database being not set correctly
|
||||||
|
|
|
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "Near Field Communication manager";
|
description = "Near Field Communication manager";
|
||||||
homepage = "https://01.org/linux-nfc";
|
homepage = "https://01.org/linux-nfc";
|
||||||
license = licenses.gpl2Only;
|
license = licenses.gpl2Only;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper
|
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper
|
||||||
, cacert, moreutils, jq, git, pkg-config, yarn, python3
|
, cacert, moreutils, jq, git, pkg-config, yarn, python3
|
||||||
, esbuild, nodejs_16, libsecret, xorg, ripgrep
|
, esbuild, nodejs, libsecret, xorg, ripgrep
|
||||||
, AppKit, Cocoa, Security, cctools, nixosTests }:
|
, AppKit, Cocoa, Security, cctools, nixosTests }:
|
||||||
|
|
||||||
let
|
let
|
||||||
system = stdenv.hostPlatform.system;
|
system = stdenv.hostPlatform.system;
|
||||||
|
|
||||||
nodejs = nodejs_16;
|
|
||||||
yarn' = yarn.override { inherit nodejs; };
|
yarn' = yarn.override { inherit nodejs; };
|
||||||
defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"];
|
defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"];
|
||||||
|
|
||||||
|
@ -108,9 +107,6 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# set offline mirror to yarn cache we created in previous steps
|
# set offline mirror to yarn cache we created in previous steps
|
||||||
yarn --offline config set yarn-offline-mirror "${yarnCache}"
|
yarn --offline config set yarn-offline-mirror "${yarnCache}"
|
||||||
|
|
||||||
# set nodedir, so we can build binaries later
|
|
||||||
npm config set nodedir "${nodejs}"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
@ -147,7 +143,7 @@ in stdenv.mkDerivation rec {
|
||||||
# rebuild binaries, we use npm here, as yarn does not provide an alternative
|
# rebuild binaries, we use npm here, as yarn does not provide an alternative
|
||||||
# that would not attempt to try to reinstall everything and break our
|
# that would not attempt to try to reinstall everything and break our
|
||||||
# patching attempts
|
# patching attempts
|
||||||
npm --prefix ./remote rebuild --build-from-source
|
npm --prefix ./remote rebuild --build-from-source --nodedir ${nodejs}
|
||||||
|
|
||||||
# run postinstall scripts after patching
|
# run postinstall scripts after patching
|
||||||
find . -path "*node_modules" -prune -o \
|
find . -path "*node_modules" -prune -o \
|
||||||
|
|
|
@ -1,27 +1,28 @@
|
||||||
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
|
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
|
||||||
index a44941a1e73..5fc924cb367 100644
|
index 4630eaad3cc..96b165b0949 100644
|
||||||
--- a/build/gulpfile.reh.js
|
--- a/build/gulpfile.reh.js
|
||||||
+++ b/build/gulpfile.reh.js
|
+++ b/build/gulpfile.reh.js
|
||||||
@@ -265,8 +265,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
@@ -271,9 +271,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
||||||
.pipe(util.stripSourceMappingURL())
|
.pipe(util.stripSourceMappingURL())
|
||||||
.pipe(jsFilter.restore);
|
.pipe(jsFilter.restore);
|
||||||
|
|
||||||
- const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`;
|
- const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`;
|
||||||
- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });
|
- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });
|
||||||
|
-
|
||||||
let web = [];
|
let web = [];
|
||||||
if (type === 'reh-web') {
|
if (type === 'reh-web') {
|
||||||
@@ -284,7 +282,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
web = [
|
||||||
|
@@ -290,7 +287,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
||||||
license,
|
license,
|
||||||
sources,
|
sources,
|
||||||
deps,
|
deps,
|
||||||
- node,
|
- node,
|
||||||
...web
|
...web
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -382,7 +379,6 @@ function tweakProductForServerWeb(product) {
|
@@ -408,7 +404,6 @@ function tweakProductForServerWeb(product) {
|
||||||
const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
|
const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
|
||||||
|
|
||||||
const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
|
const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
|
||||||
- gulp.task(`node-${platform}-${arch}`),
|
- gulp.task(`node-${platform}-${arch}`),
|
||||||
util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
|
util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "rustypaste";
|
pname = "rustypaste";
|
||||||
version = "0.8.4";
|
version = "0.9.0";
|
||||||
|
|
||||||
src = fetchFromGitHub{
|
src = fetchFromGitHub{
|
||||||
owner = "orhun";
|
owner = "orhun";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-tx2ipgvYDdCwcWFeZ/qgGXyKe+kHLuOgDAz/8vf2zEs=";
|
sha256 = "sha256-s0IpyybF0haTQu30QBaPDmCSFivpMeESt9S6a6NWfTM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-/zji2sFaOweBo666LqfNRpO/0vi1eAGgOReeuvQIaEQ=";
|
cargoHash = "sha256-87JxmZsjXZ7kf4LHgqrgrWbQtVj/XdZrf0G/6wP/ip8=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [
|
buildInputs = lib.optionals stdenv.isDarwin [
|
||||||
darwin.apple_sdk.frameworks.CoreServices
|
darwin.apple_sdk.frameworks.CoreServices
|
||||||
|
|
148
pkgs/servers/sql/pgpool/darwin-strlcpy.patch
Normal file
148
pkgs/servers/sql/pgpool/darwin-strlcpy.patch
Normal file
|
@ -0,0 +1,148 @@
|
||||||
|
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||||
|
index 3b19ca27..4d2e8e52 100644
|
||||||
|
--- a/src/Makefile.in
|
||||||
|
+++ b/src/Makefile.in
|
||||||
|
@@ -124,7 +124,7 @@ am_pgpool_OBJECTS = main/main.$(OBJEXT) main/pool_globals.$(OBJEXT) \
|
||||||
|
context/pool_query_context.$(OBJEXT) \
|
||||||
|
streaming_replication/pool_worker_child.$(OBJEXT) \
|
||||||
|
rewrite/pool_timestamp.$(OBJEXT) rewrite/pool_lobj.$(OBJEXT) \
|
||||||
|
- utils/pool_select_walker.$(OBJEXT) utils/strlcpy.$(OBJEXT) \
|
||||||
|
+ utils/pool_select_walker.$(OBJEXT) \
|
||||||
|
utils/psprintf.$(OBJEXT) utils/pool_params.$(OBJEXT) \
|
||||||
|
utils/ps_status.$(OBJEXT) utils/pool_shmem.$(OBJEXT) \
|
||||||
|
utils/pool_sema.$(OBJEXT) utils/pool_signal.$(OBJEXT) \
|
||||||
|
@@ -469,7 +469,6 @@ pgpool_SOURCES = main/main.c \
|
||||||
|
rewrite/pool_timestamp.c \
|
||||||
|
rewrite/pool_lobj.c \
|
||||||
|
utils/pool_select_walker.c \
|
||||||
|
- utils/strlcpy.c \
|
||||||
|
utils/psprintf.c \
|
||||||
|
utils/pool_params.c \
|
||||||
|
utils/ps_status.c \
|
||||||
|
@@ -762,7 +761,6 @@ utils/$(am__dirstamp):
|
||||||
|
@$(MKDIR_P) utils
|
||||||
|
@: > utils/$(am__dirstamp)
|
||||||
|
utils/pool_select_walker.$(OBJEXT): utils/$(am__dirstamp)
|
||||||
|
-utils/strlcpy.$(OBJEXT): utils/$(am__dirstamp)
|
||||||
|
utils/psprintf.$(OBJEXT): utils/$(am__dirstamp)
|
||||||
|
utils/pool_params.$(OBJEXT): utils/$(am__dirstamp)
|
||||||
|
utils/ps_status.$(OBJEXT): utils/$(am__dirstamp)
|
||||||
|
diff --git a/src/libs/pcp/Makefile.in b/src/libs/pcp/Makefile.in
|
||||||
|
index 5ea3213a..5689fb33 100644
|
||||||
|
--- a/src/libs/pcp/Makefile.in
|
||||||
|
+++ b/src/libs/pcp/Makefile.in
|
||||||
|
@@ -129,7 +129,7 @@ libpcp_la_LIBADD =
|
||||||
|
am__dirstamp = $(am__leading_dot)dirstamp
|
||||||
|
dist_libpcp_la_OBJECTS = pcp.lo ../../utils/pool_path.lo \
|
||||||
|
../../tools/fe_port.lo ../../tools/fe_memutils.lo \
|
||||||
|
- ../../utils/strlcpy.lo ../../utils/pool_health_check_stats.lo
|
||||||
|
+ ../../utils/pool_health_check_stats.lo
|
||||||
|
nodist_libpcp_la_OBJECTS = pcp_stream.lo md5.lo json.lo
|
||||||
|
libpcp_la_OBJECTS = $(dist_libpcp_la_OBJECTS) \
|
||||||
|
$(nodist_libpcp_la_OBJECTS)
|
||||||
|
@@ -347,7 +347,6 @@ dist_libpcp_la_SOURCES = pcp.c \
|
||||||
|
../../utils/pool_path.c \
|
||||||
|
../../tools/fe_port.c \
|
||||||
|
../../tools/fe_memutils.c \
|
||||||
|
- ../../utils/strlcpy.c \
|
||||||
|
../../utils/pool_health_check_stats.c
|
||||||
|
|
||||||
|
nodist_libpcp_la_SOURCES = pcp_stream.c \
|
||||||
|
@@ -437,7 +436,6 @@ clean-libLTLIBRARIES:
|
||||||
|
@: > ../../tools/$(am__dirstamp)
|
||||||
|
../../tools/fe_port.lo: ../../tools/$(am__dirstamp)
|
||||||
|
../../tools/fe_memutils.lo: ../../tools/$(am__dirstamp)
|
||||||
|
-../../utils/strlcpy.lo: ../../utils/$(am__dirstamp)
|
||||||
|
../../utils/pool_health_check_stats.lo: ../../utils/$(am__dirstamp)
|
||||||
|
|
||||||
|
libpcp.la: $(libpcp_la_OBJECTS) $(libpcp_la_DEPENDENCIES) $(EXTRA_libpcp_la_DEPENDENCIES)
|
||||||
|
diff --git a/src/tools/pgenc/Makefile.in b/src/tools/pgenc/Makefile.in
|
||||||
|
index ad117a5e..5c5fc838 100644
|
||||||
|
--- a/src/tools/pgenc/Makefile.in
|
||||||
|
+++ b/src/tools/pgenc/Makefile.in
|
||||||
|
@@ -101,7 +101,7 @@ PROGRAMS = $(bin_PROGRAMS)
|
||||||
|
am__dirstamp = $(am__leading_dot)dirstamp
|
||||||
|
dist_pg_enc_OBJECTS = pg_enc.$(OBJEXT) ../fe_port.$(OBJEXT)
|
||||||
|
nodist_pg_enc_OBJECTS = ssl_utils.$(OBJEXT) md5.$(OBJEXT) \
|
||||||
|
- base64.$(OBJEXT) pool_passwd.$(OBJEXT) strlcpy.$(OBJEXT) \
|
||||||
|
+ base64.$(OBJEXT) pool_passwd.$(OBJEXT) \
|
||||||
|
regex_array.$(OBJEXT) pool_config_variables.$(OBJEXT) \
|
||||||
|
pool_config.$(OBJEXT) fe_memutils.$(OBJEXT) \
|
||||||
|
pool_path.$(OBJEXT)
|
||||||
|
@@ -320,7 +320,6 @@ nodist_pg_enc_SOURCES = ssl_utils.c \
|
||||||
|
md5.c \
|
||||||
|
base64.c \
|
||||||
|
pool_passwd.c \
|
||||||
|
- strlcpy.c \
|
||||||
|
regex_array.c \
|
||||||
|
pool_config_variables.c \
|
||||||
|
pool_config.c \
|
||||||
|
@@ -664,8 +663,6 @@ base64.h: ../../../src/include/utils/base64.h
|
||||||
|
rm -f $@ && ln -s $< .
|
||||||
|
ssl_utils.h: ../../../src/include/utils/ssl_utils.h
|
||||||
|
rm -f $@ && ln -s $< .
|
||||||
|
-strlcpy.c: ../../../src/utils/strlcpy.c
|
||||||
|
- rm -f $@ && ln -s $< .
|
||||||
|
regex_array.c: ../../../src/utils/regex_array.c
|
||||||
|
rm -f $@ && ln -s $< .
|
||||||
|
pool_config_variables.c: ../../../src/config/pool_config_variables.c
|
||||||
|
diff --git a/src/tools/pgmd5/Makefile.in b/src/tools/pgmd5/Makefile.in
|
||||||
|
index 275f39e5..d3af1e25 100644
|
||||||
|
--- a/src/tools/pgmd5/Makefile.in
|
||||||
|
+++ b/src/tools/pgmd5/Makefile.in
|
||||||
|
@@ -101,7 +101,7 @@ PROGRAMS = $(bin_PROGRAMS)
|
||||||
|
am__dirstamp = $(am__leading_dot)dirstamp
|
||||||
|
dist_pg_md5_OBJECTS = pg_md5.$(OBJEXT) ../fe_port.$(OBJEXT)
|
||||||
|
nodist_pg_md5_OBJECTS = md5.$(OBJEXT) pool_passwd.$(OBJEXT) \
|
||||||
|
- strlcpy.$(OBJEXT) regex_array.$(OBJEXT) \
|
||||||
|
+ regex_array.$(OBJEXT) \
|
||||||
|
pool_config_variables.$(OBJEXT) pool_config.$(OBJEXT) \
|
||||||
|
fe_memutils.$(OBJEXT) pool_path.$(OBJEXT)
|
||||||
|
pg_md5_OBJECTS = $(dist_pg_md5_OBJECTS) $(nodist_pg_md5_OBJECTS)
|
||||||
|
@@ -317,7 +317,6 @@ dist_pg_md5_SOURCES = pg_md5.c \
|
||||||
|
|
||||||
|
nodist_pg_md5_SOURCES = md5.c \
|
||||||
|
pool_passwd.c \
|
||||||
|
- strlcpy.c \
|
||||||
|
regex_array.c \
|
||||||
|
pool_config_variables.c \
|
||||||
|
pool_config.c \
|
||||||
|
@@ -653,8 +652,6 @@ pool_passwd.c: ../../../src/auth/pool_passwd.c
|
||||||
|
rm -f $@ && ln -s $< .
|
||||||
|
pool_path.c: ../../../src/utils/pool_path.c
|
||||||
|
rm -f $@ && ln -s $< .
|
||||||
|
-strlcpy.c: ../../../src/utils/strlcpy.c
|
||||||
|
- rm -f $@ && ln -s $< .
|
||||||
|
regex_array.c: ../../../src/utils/regex_array.c
|
||||||
|
rm -f $@ && ln -s $< .
|
||||||
|
pool_config_variables.c: ../../../src/config/pool_config_variables.c
|
||||||
|
diff --git a/src/tools/watchdog/Makefile.in b/src/tools/watchdog/Makefile.in
|
||||||
|
index 3e578b44..c7fbce4e 100644
|
||||||
|
--- a/src/tools/watchdog/Makefile.in
|
||||||
|
+++ b/src/tools/watchdog/Makefile.in
|
||||||
|
@@ -105,7 +105,7 @@ nodist_wd_cli_OBJECTS = ssl_utils.$(OBJEXT) wd_ipc_conn.$(OBJEXT) \
|
||||||
|
wd_commands.$(OBJEXT) json_writer.$(OBJEXT) json.$(OBJEXT) \
|
||||||
|
pool_config_variables.$(OBJEXT) pool_config.$(OBJEXT) \
|
||||||
|
pool_path.$(OBJEXT) fe_memutils.$(OBJEXT) stringinfo.$(OBJEXT) \
|
||||||
|
- strlcpy.$(OBJEXT) socket_stream.$(OBJEXT) \
|
||||||
|
+ socket_stream.$(OBJEXT) \
|
||||||
|
regex_array.$(OBJEXT) psprintf.$(OBJEXT) md5.$(OBJEXT)
|
||||||
|
wd_cli_OBJECTS = $(dist_wd_cli_OBJECTS) $(nodist_wd_cli_OBJECTS)
|
||||||
|
wd_cli_LDADD = $(LDADD)
|
||||||
|
@@ -359,7 +359,6 @@ nodist_wd_cli_SOURCES = ssl_utils.c \
|
||||||
|
fe_memutils.c \
|
||||||
|
stringinfo.h \
|
||||||
|
stringinfo.c \
|
||||||
|
- strlcpy.c \
|
||||||
|
socket_stream.c \
|
||||||
|
regex_array.c \
|
||||||
|
psprintf.c \
|
||||||
|
@@ -732,8 +731,6 @@ md5.h: ../../../src/include/auth/md5.h
|
||||||
|
rm -f $@ && ln -s $< .
|
||||||
|
socket_stream.c: ../../../src/utils/socket_stream.c
|
||||||
|
rm -f $@ && ln -s $< .
|
||||||
|
-strlcpy.c: ../../../src/utils/strlcpy.c
|
||||||
|
- rm -f $@ && ln -s $< .
|
||||||
|
regex_array.c: ../../../src/utils/regex_array.c
|
||||||
|
rm -f $@ && ln -s $< .
|
||||||
|
wd_ipc_conn.c: ../../../src/watchdog/wd_ipc_conn.c
|
|
@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
|
||||||
"sysconfdir=\${out}/etc"
|
"sysconfdir=\${out}/etc"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = lib.optionals (stdenv.isDarwin) [
|
||||||
|
# Build checks for strlcpy being available in the system, but doesn't
|
||||||
|
# actually exclude its own copy from being built
|
||||||
|
./darwin-strlcpy.patch
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
hash = "sha256-jGmOEmdj3n4bCoTJH/4DEsjTBiaEmaxBt1kA19HctU8=";
|
hash = "sha256-jGmOEmdj3n4bCoTJH/4DEsjTBiaEmaxBt1kA19HctU8=";
|
||||||
};
|
};
|
||||||
wordpress6_1 = {
|
wordpress6_1 = {
|
||||||
version = "6.1.1";
|
version = "6.1.2";
|
||||||
hash = "sha256-IR6FSmm3Pd8cCHNQTH1oIaLYsEP1obVjr0bDJkD7H60=";
|
hash = "sha256-ozpuCVeni71CUylmUBk8wVo5ygZAKY7IdZ12DKbpSrw=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "spaceship-prompt";
|
pname = "spaceship-prompt";
|
||||||
version = "4.13.3";
|
version = "4.14.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "denysdovhan";
|
owner = "denysdovhan";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-uFmGld5paCLNnE9yWgBLtthEBfwwMzlGCJFX6KqGJdw=";
|
sha256 = "sha256-aoifMAjJvv1WAlINNkMwCCop6znxyivoD3vQDo/ZbfQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "exoscale-cli";
|
pname = "exoscale-cli";
|
||||||
version = "1.68.0";
|
version = "1.69.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "exoscale";
|
owner = "exoscale";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-GDnHwHKbe+8Qv2zxcKqHQ9s9dS9jvE6qNXe35FeQEKQ=";
|
sha256 = "sha256-TPsi03SKlcy6QJ91vtgpDwTD2YMfo2fPgKnbmkZG9NQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = null;
|
vendorHash = null;
|
||||||
|
|
|
@ -4,17 +4,19 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, ffmpeg
|
, ffmpeg
|
||||||
, poco
|
, poco
|
||||||
|
, ocl-icd
|
||||||
|
, opencl-clhpp
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sanjuuni";
|
pname = "sanjuuni";
|
||||||
version = "0.3";
|
version = "0.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MCJack123";
|
owner = "MCJack123";
|
||||||
repo = "sanjuuni";
|
repo = "sanjuuni";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-8IbdLXWUtT2VN6Eu1b8x4DnyI8JOd/12t0XDa6o3N+A=";
|
sha256 = "sha256-wgtyrik4Z5AXd8MHkiMuxMpGh/xcEtNqivyhvL68aac=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -24,6 +26,8 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
ffmpeg
|
ffmpeg
|
||||||
poco
|
poco
|
||||||
|
ocl-icd
|
||||||
|
opencl-clhpp
|
||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
, xcbutilwm
|
, xcbutilwm
|
||||||
, xcb-imdkit
|
, xcb-imdkit
|
||||||
, libxkbfile
|
, libxkbfile
|
||||||
|
, nixosTests
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
enDictVer = "20121020";
|
enDictVer = "20121020";
|
||||||
|
@ -89,7 +90,12 @@ stdenv.mkDerivation rec {
|
||||||
libxkbfile
|
libxkbfile
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru.updateScript = ./update.py;
|
passthru = {
|
||||||
|
updateScript = ./update.py;
|
||||||
|
tests = {
|
||||||
|
inherit (nixosTests) fcitx5;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Next generation of fcitx";
|
description = "Next generation of fcitx";
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
, gettext
|
, gettext
|
||||||
, fcitx5
|
, fcitx5
|
||||||
, libhangul
|
, libhangul
|
||||||
|
, nixosTests
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -30,6 +31,10 @@ stdenv.mkDerivation rec {
|
||||||
libhangul
|
libhangul
|
||||||
];
|
];
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
inherit (nixosTests) fcitx5;
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Hangul wrapper for Fcitx5";
|
description = "Hangul wrapper for Fcitx5";
|
||||||
homepage = "https://github.com/fcitx/fcitx5-hangul";
|
homepage = "https://github.com/fcitx/fcitx5-hangul";
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
, m17n_db
|
, m17n_db
|
||||||
, gettext
|
, gettext
|
||||||
, fmt
|
, fmt
|
||||||
|
, nixosTests
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -36,6 +37,10 @@ stdenv.mkDerivation rec {
|
||||||
fmt
|
fmt
|
||||||
];
|
];
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
inherit (nixosTests) fcitx5;
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "m17n support for Fcitx5";
|
description = "m17n support for Fcitx5";
|
||||||
homepage = "https://github.com/fcitx/fcitx5-m17n";
|
homepage = "https://github.com/fcitx/fcitx5-m17n";
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchgit
|
{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchgit
|
||||||
, python3Packages, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5
|
, python3Packages, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5
|
||||||
, jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad }:
|
, jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad, nixosTests }:
|
||||||
let
|
let
|
||||||
inherit (python3Packages) python gyp six;
|
inherit (python3Packages) python gyp six;
|
||||||
utdic = fetchurl {
|
utdic = fetchurl {
|
||||||
|
@ -115,6 +115,10 @@ in clangStdenv.mkDerivation rec {
|
||||||
wrapQtApp $out/lib/mozc/mozc_tool
|
wrapQtApp $out/lib/mozc/mozc_tool
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
inherit (nixosTests) fcitx5;
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)";
|
description = "Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)";
|
||||||
homepage = "https://github.com/fcitx/mozc";
|
homepage = "https://github.com/fcitx/mozc";
|
||||||
|
|
|
@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
description = "Tool to convert Markdown files into Anki Decks";
|
description = "Tool to convert Markdown files into Anki Decks";
|
||||||
homepage = "https://github.com/lukesmurray/markdown-anki-decks";
|
homepage = "https://github.com/lukesmurray/markdown-anki-decks";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://git.kernel.org/pub/scm/network/ofono/ofono.git";
|
homepage = "https://git.kernel.org/pub/scm/network/ofono/ofono.git";
|
||||||
changelog = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/plain/ChangeLog?h=${version}";
|
changelog = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/plain/ChangeLog?h=${version}";
|
||||||
license = licenses.gpl2Only;
|
license = licenses.gpl2Only;
|
||||||
maintainers = with maintainers; [ jtojnar ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue