Merge staging-next into staging
This commit is contained in:
commit
8e50248719
|
@ -226,6 +226,12 @@
|
||||||
</listitem>
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<literal>programs.x2goserver</literal> is now
|
||||||
|
<literal>services.x2goserver</literal>
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
<section xml:id="other-notable-changes">
|
<section xml:id="other-notable-changes">
|
||||||
|
|
|
@ -64,4 +64,6 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
- ExcelDnaRegistration
|
- ExcelDnaRegistration
|
||||||
- MathNetNumerics
|
- MathNetNumerics
|
||||||
|
|
||||||
|
* `programs.x2goserver` is now `services.x2goserver`
|
||||||
|
|
||||||
## Other Notable Changes
|
## Other Notable Changes
|
||||||
|
|
|
@ -198,7 +198,6 @@
|
||||||
./programs/waybar.nix
|
./programs/waybar.nix
|
||||||
./programs/wireshark.nix
|
./programs/wireshark.nix
|
||||||
./programs/wshowkeys.nix
|
./programs/wshowkeys.nix
|
||||||
./programs/x2goserver.nix
|
|
||||||
./programs/xfs_quota.nix
|
./programs/xfs_quota.nix
|
||||||
./programs/xonsh.nix
|
./programs/xonsh.nix
|
||||||
./programs/xss-lock.nix
|
./programs/xss-lock.nix
|
||||||
|
@ -855,6 +854,7 @@
|
||||||
./services/networking/xandikos.nix
|
./services/networking/xandikos.nix
|
||||||
./services/networking/xinetd.nix
|
./services/networking/xinetd.nix
|
||||||
./services/networking/xl2tpd.nix
|
./services/networking/xl2tpd.nix
|
||||||
|
./services/networking/x2goserver.nix
|
||||||
./services/networking/xrdp.nix
|
./services/networking/xrdp.nix
|
||||||
./services/networking/yggdrasil.nix
|
./services/networking/yggdrasil.nix
|
||||||
./services/networking/zerobin.nix
|
./services/networking/zerobin.nix
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.programs.x2goserver;
|
cfg = config.services.x2goserver;
|
||||||
|
|
||||||
defaults = {
|
defaults = {
|
||||||
superenicer = { enable = cfg.superenicer.enable; };
|
superenicer = { enable = cfg.superenicer.enable; };
|
||||||
|
@ -17,7 +17,11 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
in {
|
in {
|
||||||
options.programs.x2goserver = {
|
imports = [
|
||||||
|
(mkRenamedOptionModule [ "programs" "x2goserver" ] [ "services" "x2goserver" ])
|
||||||
|
];
|
||||||
|
|
||||||
|
options.services.x2goserver = {
|
||||||
enable = mkEnableOption "x2goserver" // {
|
enable = mkEnableOption "x2goserver" // {
|
||||||
description = ''
|
description = ''
|
||||||
Enables the x2goserver module.
|
Enables the x2goserver module.
|
||||||
|
@ -63,6 +67,14 @@ in {
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
|
# x2goserver can run X11 program even if "services.xserver.enable = false"
|
||||||
|
xdg = {
|
||||||
|
autostart.enable = true;
|
||||||
|
menus.enable = true;
|
||||||
|
mime.enable = true;
|
||||||
|
icons.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.x2goserver ];
|
environment.systemPackages = [ pkgs.x2goserver ];
|
||||||
|
|
||||||
users.groups.x2go = {};
|
users.groups.x2go = {};
|
|
@ -61,6 +61,12 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
openFirewall = mkOption {
|
||||||
|
default = false;
|
||||||
|
type = types.bool;
|
||||||
|
description = "Whether to open the firewall for the specified RDP port.";
|
||||||
|
};
|
||||||
|
|
||||||
sslKey = mkOption {
|
sslKey = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "/etc/xrdp/key.pem";
|
default = "/etc/xrdp/key.pem";
|
||||||
|
@ -99,6 +105,8 @@ in
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
|
||||||
|
|
||||||
# xrdp can run X11 program even if "services.xserver.enable = false"
|
# xrdp can run X11 program even if "services.xserver.enable = false"
|
||||||
xdg = {
|
xdg = {
|
||||||
autostart.enable = true;
|
autostart.enable = true;
|
||||||
|
|
|
@ -1,4 +1,8 @@
|
||||||
{ lib, fetchFromGitHub, python3Packages }:
|
{ lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
, python3Packages
|
||||||
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "chia";
|
pname = "chia";
|
||||||
|
@ -14,6 +18,12 @@ python3Packages.buildPythonApplication rec {
|
||||||
patches = [
|
patches = [
|
||||||
# tweak version requirements to what's available in Nixpkgs
|
# tweak version requirements to what's available in Nixpkgs
|
||||||
./dependencies.patch
|
./dependencies.patch
|
||||||
|
# Allow later websockets release, https://github.com/Chia-Network/chia-blockchain/pull/6304
|
||||||
|
(fetchpatch {
|
||||||
|
name = "later-websockets.patch";
|
||||||
|
url = "https://github.com/Chia-Network/chia-blockchain/commit/a188f161bf15a30e8e2efc5eec824e53e2a98a5b.patch";
|
||||||
|
sha256 = "1s5qjhd4kmi28z6ni7pc5n09czxvh8qnbwmnqsmms7cpw700g78s";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -47,8 +57,8 @@ python3Packages.buildPythonApplication rec {
|
||||||
websockets
|
websockets
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = with python3Packages; [
|
||||||
python3Packages.pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "trezor-suite";
|
pname = "trezor-suite";
|
||||||
version = "21.5.1";
|
version = "21.6.1";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
suffix = {
|
suffix = {
|
||||||
|
@ -20,8 +20,8 @@ let
|
||||||
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
||||||
# sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml
|
# sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml
|
||||||
sha512 = {
|
sha512 = {
|
||||||
aarch64-linux = "sha512-nqwfonWySc+wBSJjC8BW9vm+v5zHbKqbbrTTRmoZdEYBJg2SthMtTULNLVpXaX9NHxr6guZnOWdBlzVk2dQkfQ==";
|
aarch64-linux = "sha512-IxWiOJEk2PHdKf4QPHH9Y5rdyhKF3aQCHJe1crS4sYrE+4BLj3rFwRPIIGhJLqzqPyW24Hw/A4lnRnDd/UpsNA==";
|
||||||
x86_64-linux = "sha512-tfvdNXsjMe8YXJwTuujz4tKTdfsCuR/9VECF8EkcRP95YM7vuDV8dumru1jKtdiv0gaS1GT3SPEeAfmczY5jGg==";
|
x86_64-linux = "sha512-pSJ+4y9v1ltXun3F4UyQoSTJdaFSelIHx49DBbd180MSbpETecVa7OFadKjlSUKD1sknNXG9MDb2hv7SRNdDYw==";
|
||||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -57,6 +57,7 @@ appimageTools.wrapType2 rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Trezor Suite - Desktop App for managing crypto";
|
description = "Trezor Suite - Desktop App for managing crypto";
|
||||||
homepage = "https://suite.trezor.io";
|
homepage = "https://suite.trezor.io";
|
||||||
|
changelog = "https://github.com/trezor/trezor-suite/releases/tag/v${version}";
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
maintainers = with maintainers; [ prusnak ];
|
maintainers = with maintainers; [ prusnak ];
|
||||||
platforms = [ "aarch64-linux" "x86_64-linux" ];
|
platforms = [ "aarch64-linux" "x86_64-linux" ];
|
||||||
|
|
|
@ -18,9 +18,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"beta": {
|
"beta": {
|
||||||
"version": "92.0.4515.40",
|
"version": "92.0.4515.51",
|
||||||
"sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p",
|
"sha256": "0x9c5fy95wnri9z0s8pbwyq1lw684n7d70l1s2rp5yxh0snannxg",
|
||||||
"sha256bin64": "0i3plysx51n2gsm5vbf9666rz73pqbbns7v09wznbbncvw9zngrf",
|
"sha256bin64": "036km5dp7asq5n86qx7c9119mdch7sl89lhq1ffss0f4mzcq42yd",
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2021-05-07",
|
"version": "2021-05-07",
|
||||||
|
|
|
@ -6,6 +6,6 @@
|
||||||
|
|
||||||
callPackage ./generic.nix {
|
callPackage ./generic.nix {
|
||||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||||
version = "1.0.6";
|
version = "1.0.7";
|
||||||
sha256 = "1nzaw4014bndxv042dkxdj492b21r5v5f06vav2kr1azk4m9sf07";
|
sha256 = "12izilr2x9qw8dxhjqcivakwzhf6jc86g0pmxf52fr9rwaqmpc95";
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,6 @@
|
||||||
|
|
||||||
callPackage ./generic.nix {
|
callPackage ./generic.nix {
|
||||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||||
version = "1.1.0";
|
version = "1.1.1";
|
||||||
sha256 = "0sz6blyxyxi5iq170s9v4nndb1hpz603z5ps2cxkdkaafal39767";
|
sha256 = "0y7p85dvxfgzaafgzdmnw3fp9h87zx3z8m1ka4qaiacwah5xwqlv";
|
||||||
}
|
}
|
||||||
|
|
|
@ -235,10 +235,11 @@
|
||||||
},
|
},
|
||||||
"ct": {
|
"ct": {
|
||||||
"owner": "poseidon",
|
"owner": "poseidon",
|
||||||
|
"provider-source-address": "registry.terraform.io/poseidon/ct",
|
||||||
"repo": "terraform-provider-ct",
|
"repo": "terraform-provider-ct",
|
||||||
"rev": "v0.6.1",
|
"rev": "v0.8.0",
|
||||||
"sha256": "0hh3hvi8lwb0h8x9viz5p991w94gn7354nw95b51rdmir9qi2x89",
|
"sha256": "1mm86q3rl81dm2yfg2hdf88x8g5mhwwixrxgrffpkjvjqy42a8h7",
|
||||||
"version": "0.6.1"
|
"version": "0.8.0"
|
||||||
},
|
},
|
||||||
"datadog": {
|
"datadog": {
|
||||||
"owner": "terraform-providers",
|
"owner": "terraform-providers",
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
{ lib, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
|
{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh
|
||||||
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
|
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
|
||||||
|
|
||||||
mkDerivation {
|
mkDerivation rec {
|
||||||
pname = "x2goclient";
|
pname = "x2goclient";
|
||||||
version = "unstable-2019-07-24";
|
version = "4.1.2.2";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchurl {
|
||||||
url = "git://code.x2go.org/x2goclient.git";
|
url = "https://code.x2go.org/releases/source/${pname}/${pname}-${version}.tar.gz";
|
||||||
rev = "704c4ab92d20070dd160824c9b66a6d1c56dcc49";
|
sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=";
|
||||||
sha256 = "1pndp3lfzwifyxqq0gps3p1bwakw06clbk6n8viv020l4bsfmq5f";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
|
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
|
||||||
qtbase qtsvg qtx11extras qttools phonon pkg-config ];
|
qtbase qtsvg qtx11extras qttools phonon pkg-config ];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd"
|
||||||
substituteInPlace Makefile \
|
substituteInPlace Makefile \
|
||||||
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \
|
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \
|
||||||
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
|
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
|
||||||
|
@ -33,6 +33,7 @@ mkDerivation {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Graphical NoMachine NX3 remote desktop client";
|
description = "Graphical NoMachine NX3 remote desktop client";
|
||||||
homepage = "http://x2go.org/";
|
homepage = "http://x2go.org/";
|
||||||
|
maintainers = with maintainers; [ mkg20001 ];
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
|
|
|
@ -8,8 +8,8 @@ let
|
||||||
version = "4.1.0.3";
|
version = "4.1.0.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://code.x2go.org/releases/source/x2goserver/${pname}-${version}.tar.gz";
|
url = "https://code.x2go.org/releases/source/${pname}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7";
|
sha256 = "Z3aqo1T1pE40nws8F21JiMiKYYwu30bJijeuicBp3NA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
x2go-perl = perlPackages.buildPerlPackage rec {
|
x2go-perl = perlPackages.buildPerlPackage rec {
|
||||||
|
@ -26,7 +26,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
perlEnv = perl.withPackages (p: with p; [
|
perlEnv = perl.withPackages (p: with p; [
|
||||||
x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch
|
x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch FileWhich
|
||||||
]);
|
]);
|
||||||
|
|
||||||
binaryDeps = [
|
binaryDeps = [
|
||||||
|
@ -88,6 +88,6 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "http://x2go.org/";
|
homepage = "http://x2go.org/";
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = [ maintainers.averelld ];
|
maintainers = with maintainers; [ averelld mkg20001 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
let Dune = if args.useDune2 or false then dune_2 else dune_1; in
|
let Dune = if args.useDune2 or false then dune_2 else dune_1; in
|
||||||
|
|
||||||
if args ? minimumOCamlVersion &&
|
if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) ||
|
||||||
! lib.versionAtLeast ocaml.version args.minimumOCamlVersion
|
(args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion)
|
||||||
then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
|
then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
|
||||||
else
|
else
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation ({
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
} // args // {
|
} // (builtins.removeAttrs args [ "minimalOCamlVersion" ]) // {
|
||||||
|
|
||||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "babashka";
|
pname = "babashka";
|
||||||
version = "0.4.3";
|
version = "0.4.5";
|
||||||
|
|
||||||
reflectionJson = fetchurl {
|
reflectionJson = fetchurl {
|
||||||
name = "reflection.json";
|
name = "reflection.json";
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||||
sha256 = "sha256-teZKAwSv9wliVFKdT76yQjMC5g7SGPAqcq/jZ07sYjQ=";
|
sha256 = "sha256-SnKs30c6VTp1yzW2Glooi6ghSUIZgF6nsob1hDljTA8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "olm";
|
pname = "olm";
|
||||||
version = "3.2.2";
|
version = "3.2.4";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.matrix.org";
|
domain = "gitlab.matrix.org";
|
||||||
owner = "matrix-org";
|
owner = "matrix-org";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy";
|
sha256 = "1rl7j26li1irb1lqnnkzan7jrj38kvmdn69rlwbbp390v3z15lvh";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "qtstyleplugin-kvantum";
|
pname = "qtstyleplugin-kvantum";
|
||||||
version = "0.11.2";
|
version = "0.20.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tsujan";
|
owner = "tsujan";
|
||||||
repo = "Kvantum";
|
repo = "Kvantum";
|
||||||
rev = "V${version}";
|
rev = "V${version}";
|
||||||
sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc";
|
sha256 = "133m5ifs8ylhdh78m99n0y76q0nix68xsqfwcsrak4yr1n5pj9qp";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://github.com/tsujan/Kvantum";
|
homepage = "https://github.com/tsujan/Kvantum";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
broken = lib.versionOlder qtbase.version "5.14";
|
||||||
maintainers = [ maintainers.bugworm ];
|
maintainers = [ maintainers.bugworm ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "amqtt";
|
pname = "amqtt";
|
||||||
version = "0.10.0-alpha.3";
|
version = "0.10.0-alpha.4";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||||
owner = "Yakifo";
|
owner = "Yakifo";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0wz85ykjgi2174qcdgpakmc4m0p96v62az7pvc9hyallq1v1k4n6";
|
sha256 = "1v5hlcciyicnhwk1xslh3kxyjqaw526fb05pvhjpp3zqrmbxya4d";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ poetry-core ];
|
nativeBuildInputs = [ poetry-core ];
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
{ lib, python, buildPythonPackage, fetchPypi, flask }:
|
{ lib, python, isPy3k, buildPythonPackage, fetchPypi, flask }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "Flask-HTTPAuth";
|
pname = "Flask-HTTPAuth";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
|
disabled = !isPy3k;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "05j1mckwhgicrlj4j7ni2rhcf9w4i7phll06jbjjyvs3rj1l4q1f";
|
sha256 = "0fl1if91hg2c92b6sic7h2vhxxvb06ri7wflmwp0pfiwbaisgamw";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ flask ];
|
propagatedBuildInputs = [ flask ];
|
||||||
|
|
45
pkgs/development/python-modules/github-to-sqlite/default.nix
Normal file
45
pkgs/development/python-modules/github-to-sqlite/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, isPy3k
|
||||||
|
, pytestCheckHook
|
||||||
|
, pyyaml
|
||||||
|
, requests
|
||||||
|
, requests-mock
|
||||||
|
, sqlite-utils
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "github-to-sqlite";
|
||||||
|
version = "2.8.2";
|
||||||
|
disabled = !isPy3k;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "dogsheep";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "16mw429ppnhgsa98qs3fhprqvdpqbr5q1biq3ql8rsf38difdbl8";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
sqlite-utils
|
||||||
|
pyyaml
|
||||||
|
requests
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
requests-mock
|
||||||
|
];
|
||||||
|
|
||||||
|
disabledTests = [
|
||||||
|
"test_scrape_dependents"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Save data from GitHub to a SQLite database";
|
||||||
|
homepage = "https://github.com/dogsheep/github-to-sqlite";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ sarcasticadmin ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -19,12 +19,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "mocket";
|
pname = "mocket";
|
||||||
version = "3.9.41";
|
version = "3.9.42";
|
||||||
disabled = !isPy3k;
|
disabled = !isPy3k;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "19zxqh0xk08gj0jf6im9vh53z22yf17ywzykk0fjs9g7m29x8i5j";
|
sha256 = "1vvlbnbypd4z1pjlvhwhd89fn0mis5acfx4v25f1mfl04k63ffah";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -21,7 +21,9 @@ buildPythonPackage rec {
|
||||||
sha256 = "sha256-OtyulpSHUWERtcIRT5j3YtHciIxFiIFYKqtlEd1NSFw=";
|
sha256 = "sha256-OtyulpSHUWERtcIRT5j3YtHciIxFiIFYKqtlEd1NSFw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pytest ];
|
buildInputs = [
|
||||||
|
pytest
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
aiohttp
|
aiohttp
|
||||||
|
@ -36,6 +38,12 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# https://github.com/yunstanford/pytest-sanic/issues/55
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace "websockets>=8.1,<9.0" "websockets>=9.1,<10.0"
|
||||||
|
'';
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
# https://github.com/yunstanford/pytest-sanic/issues/51
|
# https://github.com/yunstanford/pytest-sanic/issues/51
|
||||||
"test_fixture_sanic_client_get"
|
"test_fixture_sanic_client_get"
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, httpcore
|
|
||||||
, httpx
|
, httpx
|
||||||
, pytest-asyncio
|
, pytest-asyncio
|
||||||
, sanic
|
, sanic
|
||||||
|
@ -11,22 +10,31 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "sanic-testing";
|
pname = "sanic-testing";
|
||||||
version = "0.3.1";
|
version = "0.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sanic-org";
|
owner = "sanic-org";
|
||||||
repo = "sanic-testing";
|
repo = "sanic-testing";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs=";
|
sha256 = "0li984imqmqc001iw4m4b6cqik3d9nb4b3yvamvbwkb6hgd94sck";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
propagatedBuildInputs = [
|
||||||
substituteInPlace setup.py \
|
httpx
|
||||||
--replace 'httpx>=0.16, <0.18' 'httpx' \
|
sanic
|
||||||
--replace 'httpcore==0.12.*' 'httpcore'
|
websockets
|
||||||
'';
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ httpx sanic websockets httpcore ];
|
checkInputs = [
|
||||||
|
pytest-asyncio
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# https://github.com/sanic-org/sanic-testing/issues/19
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace '"websockets==8.1",' '"websockets>=9.1",'
|
||||||
|
'';
|
||||||
|
|
||||||
# `sanic` is explicitly set to null when building `sanic` itself
|
# `sanic` is explicitly set to null when building `sanic` itself
|
||||||
# to prevent infinite recursion. In that case we skip running
|
# to prevent infinite recursion. In that case we skip running
|
||||||
|
@ -34,7 +42,6 @@ buildPythonPackage rec {
|
||||||
doCheck = sanic != null;
|
doCheck = sanic != null;
|
||||||
dontUsePythonImportsCheck = sanic == null;
|
dontUsePythonImportsCheck = sanic == null;
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook pytest-asyncio ];
|
|
||||||
pythonImportsCheck = [ "sanic_testing" ];
|
pythonImportsCheck = [ "sanic_testing" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -1,24 +1,52 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, doCheck ? true
|
{ lib
|
||||||
, aiofiles, httptools, multidict, sanic-routing, ujson, uvloop, websockets
|
, aiofiles
|
||||||
, pytestCheckHook, beautifulsoup4, gunicorn, uvicorn, sanic-testing
|
, beautifulsoup4
|
||||||
, pytest-benchmark, pytest-sanic, pytest-sugar, pytestcov
|
, buildPythonPackage
|
||||||
|
, doCheck ? true
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
, gunicorn
|
||||||
|
, httptools
|
||||||
|
, multidict
|
||||||
|
, pytest-asyncio
|
||||||
|
, pytest-benchmark
|
||||||
|
, pytest-sanic
|
||||||
|
, pytest-sugar
|
||||||
|
, pytestCheckHook
|
||||||
|
, sanic-routing
|
||||||
|
, sanic-testing
|
||||||
|
, ujson
|
||||||
|
, uvicorn
|
||||||
|
, uvloop
|
||||||
|
, websockets
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "sanic";
|
pname = "sanic";
|
||||||
version = "21.3.4";
|
version = "21.3.4";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchFromGitHub {
|
||||||
inherit pname version;
|
owner = "sanic-org";
|
||||||
sha256 = "1cbd12b9138b3ca69656286b0be91fff02b826e8cb72dd76a2ca8c5eb1288d8e";
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0vldlic8gqcf56fqb31igycqf11syd9csk66v34w6dim54lcny2b";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Allow later websockets release, https://github.com/sanic-org/sanic/pull/2154
|
||||||
|
(fetchpatch {
|
||||||
|
name = "later-websockets.patch";
|
||||||
|
url = "https://github.com/sanic-org/sanic/commit/5fb820b5c1ce395e86a1ee11996790c65ec7bc65.patch";
|
||||||
|
sha256 = "1glvq23pf1sxqjnrz0w8rr7nsnyz82k1479b3rm8szfkjg9q5d1w";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Loosen dependency requirements.
|
# Loosen dependency requirements.
|
||||||
substituteInPlace setup.py \
|
substituteInPlace setup.py \
|
||||||
--replace '"pytest==5.2.1"' '"pytest"' \
|
--replace '"pytest==5.2.1"' '"pytest"' \
|
||||||
--replace '"gunicorn==20.0.4"' '"gunicorn"' \
|
--replace '"gunicorn==20.0.4"' '"gunicorn"' \
|
||||||
--replace '"pytest-sanic",' ""
|
--replace '"pytest-sanic",' "" \
|
||||||
# Patch a request headers test to allow brotli encoding
|
# Patch a request headers test to allow brotli encoding
|
||||||
# (we build httpx with brotli support, upstream doesn't).
|
# (we build httpx with brotli support, upstream doesn't).
|
||||||
substituteInPlace tests/test_headers.py \
|
substituteInPlace tests/test_headers.py \
|
||||||
|
@ -26,25 +54,36 @@ buildPythonPackage rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
sanic-routing httptools uvloop ujson aiofiles websockets multidict
|
aiofiles
|
||||||
|
httptools
|
||||||
|
multidict
|
||||||
|
sanic-routing
|
||||||
|
ujson
|
||||||
|
uvloop
|
||||||
|
websockets
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
sanic-testing gunicorn pytestcov beautifulsoup4 pytest-sanic pytest-sugar
|
beautifulsoup4
|
||||||
pytest-benchmark pytestCheckHook uvicorn
|
gunicorn
|
||||||
|
pytest-asyncio
|
||||||
|
pytest-benchmark
|
||||||
|
pytest-sanic
|
||||||
|
pytest-sugar
|
||||||
|
pytestCheckHook
|
||||||
|
sanic-testing
|
||||||
|
uvicorn
|
||||||
];
|
];
|
||||||
|
|
||||||
inherit doCheck;
|
inherit doCheck;
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
# No "examples" directory in pypi distribution
|
# Tests are flaky
|
||||||
"test_gunicorn"
|
|
||||||
"test_zero_downtime"
|
|
||||||
# flaky
|
|
||||||
"test_keep_alive_client_timeout"
|
"test_keep_alive_client_timeout"
|
||||||
"test_check_timeouts_request_timeout"
|
"test_check_timeouts_request_timeout"
|
||||||
"test_check_timeouts_response_timeout"
|
"test_check_timeouts_response_timeout"
|
||||||
"test_reloader_live"
|
"test_reloader_live"
|
||||||
|
"test_zero_downtime"
|
||||||
];
|
];
|
||||||
|
|
||||||
__darwinAllowLocalNetworking = true;
|
__darwinAllowLocalNetworking = true;
|
||||||
|
@ -52,7 +91,7 @@ buildPythonPackage rec {
|
||||||
pythonImportsCheck = [ "sanic" ];
|
pythonImportsCheck = [ "sanic" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A microframework based on uvloop, httptools, and learnings of flask";
|
description = "Web server and web framework";
|
||||||
homepage = "https://github.com/sanic-org/sanic/";
|
homepage = "https://github.com/sanic-org/sanic/";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ costrouc AluisioASG ];
|
maintainers = with maintainers; [ costrouc AluisioASG ];
|
||||||
|
|
|
@ -21,14 +21,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "slack-sdk";
|
pname = "slack-sdk";
|
||||||
version = "3.5.0";
|
version = "3.6.0";
|
||||||
disabled = !isPy3k;
|
disabled = !isPy3k;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "slackapi";
|
owner = "slackapi";
|
||||||
repo = "python-slack-sdk";
|
repo = "python-slack-sdk";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-5ZBaF/6p/eOWjAmo+IlF9zCb9xBr2bP6suPZblRogUg=";
|
sha256 = "sha256-OSRz8yH1yrWhN2a6ir4nxsPahwg8oHfVlJ020Swlb+Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "systembridge";
|
pname = "systembridge";
|
||||||
version = "1.1.1";
|
version = "1.2.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "timmo001";
|
owner = "timmo001";
|
||||||
repo = "system-bridge-connector-py";
|
repo = "system-bridge-connector-py";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0vyfi7nyzkzsgg84n5wh4hzwvx6fybgqdzbabnsmvszb9sm1vlb2";
|
sha256 = "sha256-dZOtvJXBXMKC+VOyQRMyaWAXg8lHjLcM2Zz9P0/ILT8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -34,8 +34,8 @@ buildPythonPackage rec {
|
||||||
rich
|
rich
|
||||||
tkinter
|
tkinter
|
||||||
] ++
|
] ++
|
||||||
# pandas is not supported on i686
|
# pandas is not supported on i686 or risc-v
|
||||||
lib.optional (!stdenv.isi686) pandas;
|
lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas;
|
||||||
|
|
||||||
# Remove performance testing.
|
# Remove performance testing.
|
||||||
# Too sensitive for on Hydra.
|
# Too sensitive for on Hydra.
|
||||||
|
|
|
@ -1,37 +1,45 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromGitHub
|
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, python
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, pytest
|
|
||||||
, stdenv
|
, stdenv
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "websockets";
|
pname = "websockets";
|
||||||
version = "8.1";
|
version = "9.1";
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aaugustin";
|
owner = "aaugustin";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "05jbqcbjg50ydwl0fijhdlqcq7fl6v99kjva66kmmzzza7vwa872";
|
sha256 = "sha256-7Y12IUG+ulD4+CTRlY+NE6qYZyI9gCPDydwpt+uyYZk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
disabled = pythonOlder "3.3";
|
|
||||||
|
|
||||||
# Tests fail on Darwin with `OSError: AF_UNIX path too long`
|
# Tests fail on Darwin with `OSError: AF_UNIX path too long`
|
||||||
doCheck = !stdenv.isDarwin;
|
doCheck = !stdenv.isDarwin;
|
||||||
|
|
||||||
# Disable all tests that need to terminate within a predetermined amount of
|
# Disable all tests that need to terminate within a predetermined amount of
|
||||||
# time. This is nondeterministic.
|
# time. This is nondeterministic.
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
sed -i 's/with self.assertCompletesWithin.*:/if True:/' \
|
sed -i 's/with self.assertCompletesWithin.*:/if True:/' \
|
||||||
tests/test_protocol.py
|
tests/legacy/test_protocol.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
${python.interpreter} -m unittest discover
|
||||||
|
runHook postCheck
|
||||||
|
'';
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "websockets" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "WebSocket implementation in Python 3";
|
description = "WebSocket implementation in Python";
|
||||||
homepage = "https://github.com/aaugustin/websockets";
|
homepage = "https://websockets.readthedocs.io/";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "yangson";
|
pname = "yangson";
|
||||||
version = "1.4.8";
|
version = "1.4.9";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "11w4aq0w2rnkz1axgmw003z2snd4kc49dil6kp1ajlqnfh1pcx8m";
|
sha256 = "1qb8zssyj504yrj1jnkrzv65xlfv5bl14knan76pjzbpl0xpaq6z";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -28,13 +28,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "radare2";
|
pname = "radare2";
|
||||||
version = "5.3.0";
|
version = "5.3.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "radare";
|
owner = "radare";
|
||||||
repo = "radare2";
|
repo = "radare2";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-xndnRVlqTB/NH1ROo7xkftLP7DufsJu4CCA9MCOEeng=";
|
sha256 = "sha256-VS8eG5RXwKtJSLmyaSifopJU7WYGMUcznn+burPqEYE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
|
@ -95,33 +95,33 @@ rec {
|
||||||
headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6";
|
headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6";
|
||||||
};
|
};
|
||||||
|
|
||||||
electron_11 = mkElectron "11.4.7" {
|
electron_11 = mkElectron "11.4.8" {
|
||||||
x86_64-linux = "05005d351a1b08a550a8186efba6f4fdd96842355a634934d9a9d7d31c2cd539";
|
x86_64-linux = "742cfa025fa64cfa02c4eb8584e9f2f15321b795688a5c1a6597b1e1da1e98e7";
|
||||||
x86_64-darwin = "e6445ad3d7e851fc3227785788d0706d58c9c8ea3821afa7f871c6254c463043";
|
x86_64-darwin = "b251b02f70a9a0e63866836c0638200cca05392cdec1b5271ebbe0c016276364";
|
||||||
i686-linux = "5473f36eb2a9772da7e4f1a162a724b4a5335e8f78fb51d585bac3bd50ff12fc";
|
i686-linux = "a7813cfa785e8e9a440db4cfb0d98dcd5ba52041fb018856d9c544a43ae55357";
|
||||||
armv7l-linux = "0de0d74b1206f7ffd9e4c75754bbf6fdf27c83a0ce6b4cd8a6b5af81d7a20ba7";
|
armv7l-linux = "a72e346a569f582fc40e9ebbfd6f6faf5c32dd6e83fdcd5335c46e332dbe5ee6";
|
||||||
aarch64-linux = "f2261dde71197c358aff85d7a320cbd2315a5adf228218fd9a2f5c8561589323";
|
aarch64-linux = "acd4e32851cc0fdfe1a62df90a6c8b02139e510b7c3212bd4ac57f767e85dfe4";
|
||||||
aarch64-darwin = "a2abc83c21402e30f4f42f4615cccc4369884faa2f2fa576d71f423834988622";
|
aarch64-darwin = "ee28b1d525ae5be60253430200692f3fe6b4d588921aedd246bfc851014127ea";
|
||||||
headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry";
|
headers = "0l8pc4grabj641wf1q37bc19w0y9913v4c9s8pbniz7py1a6rpmn";
|
||||||
};
|
};
|
||||||
|
|
||||||
electron_12 = mkElectron "12.0.10" {
|
electron_12 = mkElectron "12.0.11" {
|
||||||
x86_64-linux = "b5383b5818062de42536a7966df875ae781433a7ee991da34643bc6fda4ad038";
|
x86_64-linux = "e3bac4b81f0d99447f8ff7edf88f2e9941699d30cf1f41a41af7a93b199e805b";
|
||||||
x86_64-darwin = "3d4111280bf50dbfb141b46551974b0e4e39eb0d1f8ef789d71f7d3295a8e24f";
|
x86_64-darwin = "eeee59eb751e0d95538a40c74aa1563ee4485903eb028c462872004cc8dfdabb";
|
||||||
i686-linux = "6fd10db8d896ef82ac8f2a1d796942dc56f5b41e504c86121d83eababa0cccb8";
|
i686-linux = "97fe1b7f7414a9cf1416d4a2d61139cc71f50765f48df02b6ccb4c1af62f0d97";
|
||||||
armv7l-linux = "5820ac7e70488507417122aaa0381439f929da1819c2c710ba74569a609cc972";
|
armv7l-linux = "c43b28d5d15b303a7643e7d2320f03577e27d90a13f4fa1dc3e14f81630ab62e";
|
||||||
aarch64-linux = "022ff009969d9f270704e918fe2dda6cd395c3e9d9e9515e99eca628d996a503";
|
aarch64-linux = "b5f17959b8cb55f0557f4a0a37cd99c1c6d1d48fad839402383d9087175b4f44";
|
||||||
aarch64-darwin = "d2af4870a79866621469043e44a2a0e995abc5530d4aaf1add567b00eb286b01";
|
aarch64-darwin = "e5f88751bfb1344ea2f1345b56e95093ebfa850761b53752fbcf8c6d8de0f824";
|
||||||
headers = "1vl3cnhf2j5g4xhk17rag0vzbxwba5fq54mhvv0hp3hqbiqhdds6";
|
headers = "11801qplb7s7zs0yjmk4436yp3xg2szn7hzag75v3g026k2ay1xz";
|
||||||
};
|
};
|
||||||
|
|
||||||
electron_13 = mkElectron "13.1.0" {
|
electron_13 = mkElectron "13.1.2" {
|
||||||
x86_64-linux = "6681078971d2e99e9f8b3c598de65869d3596356af901bbbabcc4860c0496bb4";
|
x86_64-linux = "1391bae19ff6446fb56f00ba5597bb92a509b6e808534087c153b9fcebddbeef";
|
||||||
x86_64-darwin = "d62a561e80fcbcb0f249e74c487313192451046f288478add65be997793831de";
|
x86_64-darwin = "b8c5eca90864ce4a91e1fdb8a932598fad31922407b502eeb868a508fd26347f";
|
||||||
i686-linux = "e4d8cc19689b1f9c00894bb776083f8543abeba9203d3297268c1644f1300355";
|
i686-linux = "40d6c373b5e77b80285715fb66acb6562ea1d685f6644d463fb427f846f09fdc";
|
||||||
armv7l-linux = "ac5a19e31fd83db5775a2af57f742c7b3e5fc4528958329ec3c81f82e7bd611a";
|
armv7l-linux = "ce31a8d455663f6e85ed75fa9ac1007b55d6fd0b9445d9e51e2a103706e49e94";
|
||||||
aarch64-linux = "0ed0cc3afae5cc7e1e6c6204866a1cecdf97e0ab658789e8951842bd0d28e1bb";
|
aarch64-linux = "06965ade2aaf4dce78b5d5b075fc09c225d7d83817297338fc26eb4d33ebb289";
|
||||||
aarch64-darwin = "6da46d2861011263af2953a3e0186735e54708c01c50967ff5f8ed71b73f7fea";
|
aarch64-darwin = "dde2b3fd2ac52097481ff5bfd54c358432f7f2402b0b20ae32681ae6e5a4d451";
|
||||||
headers = "1h4saavsy97kmbfaw6xcya5l0iybr37vyw7bv539c7a064kam07b";
|
headers = "1qrw1cpj63757c582zzz0gchaq0w0xq1mm5702q34xyv06mh5h93";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "act";
|
pname = "act";
|
||||||
version = "0.2.22";
|
version = "0.2.23";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nektos";
|
owner = "nektos";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-a+yw7QSLNX3hO2GnFCifYMbPWYwtleUZS1AqPsxw9t8=";
|
sha256 = "sha256-PBhlBWycAYuczfP0D+Gf1pDvrfI9gz3JyGe5FBq782Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-6jD+gY/TmO/Ot507IlTLNdWv7G4BHYlk/E9rVoRD65A=";
|
vendorSha256 = "sha256-dLIsVWN/PjcH0CUYRmn4YaF8Pczf/gaWhD3lulqGiuA=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
@ -22,6 +22,6 @@ buildGoModule rec {
|
||||||
homepage = "https://github.com/nektos/act";
|
homepage = "https://github.com/nektos/act";
|
||||||
changelog = "https://github.com/nektos/act/releases/tag/v${version}";
|
changelog = "https://github.com/nektos/act/releases/tag/v${version}";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ Br1ght0ne ];
|
maintainers = with maintainers; [ Br1ght0ne SuperSandro2000 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,25 +2,30 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "terraform-ls";
|
pname = "terraform-ls";
|
||||||
version = "0.16.2";
|
version = "0.18.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hashicorp";
|
owner = "hashicorp";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY=";
|
sha256 = "sha256-JctiWJ2HeFtrrOwCe1MCzxTkE2855FsgFocaAgK4fMk=";
|
||||||
};
|
};
|
||||||
vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os=";
|
vendorSha256 = "sha256-r4/WTzI1unvmjKOSJsaHVkws2/qWLuRrHLlzwckrm2Q=";
|
||||||
|
|
||||||
# tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
|
preBuild = ''
|
||||||
doCheck = false;
|
buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version} -X main.prerelease=")
|
||||||
|
'';
|
||||||
|
|
||||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
preCheck = ''
|
||||||
|
# Remove test that requires networking
|
||||||
|
rm internal/terraform/exec/exec_test.go
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Terraform Language Server (official)";
|
description = "Terraform Language Server (official)";
|
||||||
homepage = "https://github.com/hashicorp/terraform-ls";
|
homepage = "https://github.com/hashicorp/terraform-ls";
|
||||||
|
changelog = "https://github.com/hashicorp/terraform-ls/blob/v${version}/CHANGELOG.md";
|
||||||
license = licenses.mpl20;
|
license = licenses.mpl20;
|
||||||
maintainers = with maintainers; [ mbaillie ];
|
maintainers = with maintainers; [ mbaillie jk ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "vsliveshare";
|
name = "vsliveshare";
|
||||||
publisher = "ms-vsliveshare";
|
publisher = "ms-vsliveshare";
|
||||||
version = "1.0.4272";
|
version = "1.0.4360";
|
||||||
sha256 = "kH8ZiNzpAfR1BnKjYc+hcNMEmhBNyHlnOlj8fCdNGjY=";
|
sha256 = "0d39b94nxp5brr8ljb5flfn49zms083vp5i7xlrqhz7pskb9dpz8";
|
||||||
};
|
};
|
||||||
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
|
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
|
||||||
nativeBuildInputs = nativeBuildInputs ++ [
|
nativeBuildInputs = nativeBuildInputs ++ [
|
||||||
|
|
|
@ -1,32 +1,32 @@
|
||||||
{
|
{
|
||||||
"4.14": {
|
"4.14": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-4.14.235-hardened1.patch",
|
"name": "linux-hardened-4.14.236-hardened1.patch",
|
||||||
"sha256": "0m49pg27pnp6kwkbawg0fw3lzm5nchqjhqkfgprckwgb9v5bgbcc",
|
"sha256": "08wnc1acx8fnnrpaz5hxw9gakgk7qxf3kq1pycljl7396dnsy6xg",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.235-hardened1/linux-hardened-4.14.235-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.236-hardened1/linux-hardened-4.14.236-hardened1.patch"
|
||||||
},
|
},
|
||||||
"4.19": {
|
"4.19": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-4.19.193-hardened1.patch",
|
"name": "linux-hardened-4.19.194-hardened1.patch",
|
||||||
"sha256": "0r2rxl08x2l1yimaqksrc79s36rnp77xm5in9cvp7ff24y9r9g0j",
|
"sha256": "102w5algxybffy5176zzgz7knafpdc0lp9y5wjdrf6yr65l4j5rj",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.193-hardened1/linux-hardened-4.19.193-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.194-hardened1/linux-hardened-4.19.194-hardened1.patch"
|
||||||
},
|
},
|
||||||
"5.10": {
|
"5.10": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-5.10.42-hardened1.patch",
|
"name": "linux-hardened-5.10.43-hardened1.patch",
|
||||||
"sha256": "1hignnqy0d7nrfnh5j8h1xkj15kvx80h55qzzq1wlmyjxpr6c0ix",
|
"sha256": "0hx2g4brpk32phiin96w4kgsbibrcb69a22p0rsqcanxl76v48sz",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.42-hardened1/linux-hardened-5.10.42-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.43-hardened1/linux-hardened-5.10.43-hardened1.patch"
|
||||||
},
|
},
|
||||||
"5.12": {
|
"5.12": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-5.12.9-hardened1.patch",
|
"name": "linux-hardened-5.12.10-hardened1.patch",
|
||||||
"sha256": "08ijifhl8sl858ik32ny47h7pq0r160sv55a07igkbhrh60arfqa",
|
"sha256": "0wyw33kg3xih2j19hsff9mapxjll8ad38il74gkcbnhwci0ys1mc",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.9-hardened1/linux-hardened-5.12.9-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.10-hardened1/linux-hardened-5.12.10-hardened1.patch"
|
||||||
},
|
},
|
||||||
"5.4": {
|
"5.4": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-5.4.124-hardened1.patch",
|
"name": "linux-hardened-5.4.125-hardened1.patch",
|
||||||
"sha256": "1bn7fa09kzgv6v9d3gl66l8wg6z23chjhk6g219cqb7mfd4m5ykl",
|
"sha256": "1vc6jgiglc4i5my9iw24yw16wi0x1lxkvyb6i619z3k3zh39gm04",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.124-hardened1/linux-hardened-5.4.124-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.125-hardened1/linux-hardened-5.4.125-hardened1.patch"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "4.14.235";
|
version = "4.14.236";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||||
sha256 = "03k793hj294zf7jncs1h8zh5dh6xagkfvnydd9jadxvq2z8vvl8f";
|
sha256 = "0albmgxj3cb1dvjagj54l0ffa7kwi8brh7bqwj6gvzpylsby5sp4";
|
||||||
};
|
};
|
||||||
|
|
||||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];
|
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "4.19.193";
|
version = "4.19.194";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||||
sha256 = "17ci49ak5iw01kfkn3fcgncg9hm4j188417bxi3bnsq9il5ymhl4";
|
sha256 = "15l80psfgffa756vpjxmjkwjqif2gpx441hpzr473xwryp6bvbma";
|
||||||
};
|
};
|
||||||
|
|
||||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
|
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "4.4.271";
|
version = "4.4.272";
|
||||||
extraMeta.branch = "4.4";
|
extraMeta.branch = "4.4";
|
||||||
extraMeta.broken = stdenv.isAarch64;
|
extraMeta.broken = stdenv.isAarch64;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||||
sha256 = "0n5h2lv1p542a45pas3pi0vkhgrk096vwrps79a7v3a6c1q2dxx6";
|
sha256 = "1ar468ymk96v2pq9x209z2z4wbypppb91jpw8g22aa30pr9aagyi";
|
||||||
};
|
};
|
||||||
|
|
||||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
|
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "4.9.271";
|
version = "4.9.272";
|
||||||
extraMeta.branch = "4.9";
|
extraMeta.branch = "4.9";
|
||||||
extraMeta.broken = stdenv.isAarch64;
|
extraMeta.broken = stdenv.isAarch64;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||||
sha256 = "1480miixphkf0b8w00m753ar7yp1rnl3zyr9wp4inngi2f90553r";
|
sha256 = "0n0hrszaijdpnbdvd8bvz15m7g268is0zw84w4vaf37418whrgzq";
|
||||||
};
|
};
|
||||||
|
|
||||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
|
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "5.10.42";
|
version = "5.10.43";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "1r86v6q7ml7zv001f25w3h667nqqy39439s94vnqsyyn7g3jg84b";
|
sha256 = "00yl1g6irpwy3sy0d43qvlk7x1gfk4v1dyv460afxy527d1ixf43";
|
||||||
};
|
};
|
||||||
|
|
||||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
|
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "5.12.9";
|
version = "5.12.10";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "0vg71h8r90fl01a8khyf1776y76rgqisxafky89cswa2fpsvxyn7";
|
sha256 = "03v3wzpbxb78gf4wsnc5wv6683g439cm2bzcjj4q657dagy9km68";
|
||||||
};
|
};
|
||||||
|
|
||||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
|
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "5.4.124";
|
version = "5.4.125";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "10kxa1ng9w9xd2d5xh48fbhp1kri650p90nihrcpnb845gd9vwpp";
|
sha256 = "0g73xfkmj4sahrk7gx72hm2i4m98gqghswqyf8yqh77b9857bvhp";
|
||||||
};
|
};
|
||||||
|
|
||||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
|
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
common = { edition, sha256 }:
|
common = { edition, sha256 }:
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation (rec {
|
||||||
pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}";
|
pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}";
|
||||||
version = "1.14.0";
|
version = "1.16.0";
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
nativeBuildInputs = [ unzip ];
|
||||||
|
|
||||||
|
@ -50,10 +50,10 @@
|
||||||
in {
|
in {
|
||||||
rainloop-community = common {
|
rainloop-community = common {
|
||||||
edition = "community";
|
edition = "community";
|
||||||
sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y";
|
sha256 = "sha256-25ScQ2OwSKAuqg8GomqDhpebhzQZjCk57h6MxUNiymc=";
|
||||||
};
|
};
|
||||||
rainloop-standard = common {
|
rainloop-standard = common {
|
||||||
edition = "";
|
edition = "";
|
||||||
sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch";
|
sha256 = "sha256-aYCwqFqhJEeakn4R0MUDGcSp+M47JbbCrbYaML8aeSs=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nncp";
|
pname = "nncp";
|
||||||
version = "6.4.0";
|
version = "6.5.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
|
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
|
||||||
sha256 = "16xrwhr7avss238k83ih1njl0gfca57ghg360ba9ixlssrb1239x";
|
sha256 = "16hbcwwf65h2avgdyya2bk42bmmqnfl1m5v7y23cyp174ykjl794";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ go redo-apenwarr ];
|
nativeBuildInputs = [ go redo-apenwarr ];
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "ctop";
|
pname = "ctop";
|
||||||
version = "0.7.5";
|
version = "0.7.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bcicen";
|
owner = "bcicen";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = version;
|
||||||
sha256 = "0mm1gapnz67mwc346jr530xwpiajq1b2f295s8gz5nrb2a23mqln";
|
sha256 = "sha256-ceRyYrqmgdTnV8m9LkLlR6iTrC5F81X/V3fWI2CiKBw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "0a5rwnf251jbp7jz2ln8z9hqp0112c6kx0y09nncvlcki35qq9sh";
|
vendorSha256 = "sha256-UCeMy4iT0c2sTcCDPg0TIYCLYfrIUvHluUuGIpzluSg=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
@ -21,6 +21,6 @@ buildGoModule rec {
|
||||||
description = "Top-like interface for container metrics";
|
description = "Top-like interface for container metrics";
|
||||||
homepage = "https://ctop.sh/";
|
homepage = "https://ctop.sh/";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ apeyroux marsam ];
|
maintainers = with maintainers; [ apeyroux marsam SuperSandro2000 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1529,6 +1529,8 @@ in
|
||||||
|
|
||||||
github-commenter = callPackage ../development/tools/github-commenter { };
|
github-commenter = callPackage ../development/tools/github-commenter { };
|
||||||
|
|
||||||
|
github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite;
|
||||||
|
|
||||||
gitless = callPackage ../applications/version-management/gitless { python = python3; };
|
gitless = callPackage ../applications/version-management/gitless { python = python3; };
|
||||||
|
|
||||||
gitter = callPackage ../applications/networking/instant-messengers/gitter { };
|
gitter = callPackage ../applications/networking/instant-messengers/gitter { };
|
||||||
|
|
|
@ -2797,8 +2797,9 @@ in {
|
||||||
|
|
||||||
github3_py = callPackage ../development/python-modules/github3_py { };
|
github3_py = callPackage ../development/python-modules/github3_py { };
|
||||||
|
|
||||||
github-webhook = callPackage ../development/python-modules/github-webhook { };
|
github-to-sqlite = callPackage ../development/python-modules/github-to-sqlite { };
|
||||||
|
|
||||||
|
github-webhook = callPackage ../development/python-modules/github-webhook { };
|
||||||
GitPython = callPackage ../development/python-modules/GitPython { };
|
GitPython = callPackage ../development/python-modules/GitPython { };
|
||||||
|
|
||||||
git-revise = callPackage ../development/python-modules/git-revise { };
|
git-revise = callPackage ../development/python-modules/git-revise { };
|
||||||
|
|
Loading…
Reference in a new issue