mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
f4ec0a418f
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
@ -65,6 +65,7 @@
|
||||
/nixos/doc/manual/development/writing-modules.xml @nbp
|
||||
/nixos/doc/manual/man-nixos-option.xml @nbp
|
||||
/nixos/modules/installer/tools/nixos-option.sh @nbp
|
||||
/nixos/modules/system @dasJ
|
||||
|
||||
# NixOS integration test driver
|
||||
/nixos/lib/test-driver @tfc
|
||||
|
||||
@ -8920,6 +8920,12 @@
|
||||
githubId = 11365056;
|
||||
name = "Kevin Liu";
|
||||
};
|
||||
pnmadelaine = {
|
||||
name = "Paul-Nicolas Madelaine";
|
||||
email = "pnm@pnm.tf";
|
||||
github = "pnmadelaine";
|
||||
githubId = 21977014;
|
||||
};
|
||||
pnotequalnp = {
|
||||
email = "kevin@pnotequalnp.com";
|
||||
github = "pnotequalnp";
|
||||
|
||||
@ -56,7 +56,7 @@ in
|
||||
corsOrigins = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = "List of URLs that can access the API for Cross-Origin Resource Sharing (CORS)";
|
||||
example = [ "http://localhost" "http://localhost:5000" ];
|
||||
default = [ "http://localhost" "http://localhost:5000" ];
|
||||
};
|
||||
|
||||
authenticationRequired = mkOption {
|
||||
|
||||
@ -61,7 +61,7 @@ in
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.path;
|
||||
example = "/var/lib/kapacitor";
|
||||
default = "/var/lib/kapacitor";
|
||||
description = "Location where Kapacitor stores its state";
|
||||
};
|
||||
|
||||
|
||||
@ -106,6 +106,7 @@ in
|
||||
path = optional ecfg.enableNotifications pkgs.dbus;
|
||||
serviceConfig = {
|
||||
StandardOutput = "null";
|
||||
StandardError = "journal";
|
||||
ExecStart = ''
|
||||
${pkgs.earlyoom}/bin/earlyoom \
|
||||
-m ${toString ecfg.freeMemThreshold} \
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "samplv1";
|
||||
version = "0.9.20";
|
||||
version = "0.9.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-9tm72lV9i/155TVweNwO2jpPsCJkh6r82g7Z1wCI1ho=";
|
||||
sha256 = "sha256-eJA6ixH20Wv+cD2CKGomncyfJ4tfpOL3UrTeCkb5/q0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qttools pkg-config ];
|
||||
|
||||
@ -17,11 +17,11 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "particl-core";
|
||||
version = "0.19.2.13";
|
||||
version = "0.19.2.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
|
||||
sha256 = "sha256-eXlTfSjxOGZi/0/b7myqILJZYNcbK+QqQmq+PVkh1e8=";
|
||||
sha256 = "sha256-UMU3384r4RGVl0/7OPwdDva09vhQr+9Lqb1oD/PTva8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
@ -4,8 +4,8 @@ let
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/nix-community/emacs2nix.git";
|
||||
fetchSubmodules = true;
|
||||
rev = "703b144eeb490e87133c777f82e198b4e515c312";
|
||||
sha256 = "sha256-YBbRh/Cb8u9+Pn6/Bc0atI6knKVjr8jiTGgFkD2FNGI=";
|
||||
rev = "8612e136199b29201703e3e28eba26ddc53f297e";
|
||||
sha256 = "sha256-p15KuXS18j8nqy69LPnHcj6ciHLxa/nibshts0HMZ0A=";
|
||||
};
|
||||
in
|
||||
pkgs.mkShell {
|
||||
|
||||
@ -18,13 +18,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-8";
|
||||
version = "7.1.0-9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
sha256 = "17kgq0ja3bvc6b9lq3p29pk5j3w9f66nq6d8aidnq5qs6jwm1h5c";
|
||||
sha256 = "sha256-9eeOY6TvNykWA3yyQH1UR3ahdhOja87I9rsie9fMbso=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kratos";
|
||||
version = "0.7.1-alpha.1";
|
||||
version = "0.7.6-alpha.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ory";
|
||||
repo = "kratos";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n0qjnwavr34g8b6vr000wgpbnmyq7n1grcy79cvzdrnc8jxkgxi";
|
||||
sha256 = "1412jckfsm0d5gn7fhjpj212xbsf43sfpd8hgcz3pxc0q37dzfgh";
|
||||
};
|
||||
|
||||
vendorSha256 = "14x2flimhvd2wdkajvsm5bqbqikgirynzxs27mzlx0bvhliv247s";
|
||||
vendorSha256 = "1gcdahs8x26kpwlng3wijqi12yjwj19v413wyyviim4vn1r4c0m7";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmium-tool";
|
||||
version = "1.13.1";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmcode";
|
||||
repo = "osmium-tool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IeFbcgwayBl3xxv3onCJr0f1oeveyyNlLxXQlzOoVq0=";
|
||||
sha256 = "sha256-dLYmY2bS+DycYBLZdLw8CsRIIE8EfDJEx6RZ/r9yMS8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "node-problem-detector";
|
||||
version = "0.8.9";
|
||||
version = "0.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P7niTGe0uzg2R1UHrPWbU4tOhOA1OwlP3dslZPwuF0A=";
|
||||
sha256 = "sha256-phuXsioSLO/jl1l5dwV/emoirJfgGXQSmeQHSImxm2U=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -39,25 +39,28 @@ let
|
||||
passthru = data;
|
||||
};
|
||||
|
||||
# These providers are managed with the ./update-all script
|
||||
automated-providers = lib.mapAttrs (_: attrs:
|
||||
# Our generic constructor to build new providers
|
||||
mkProvider = attrs:
|
||||
(if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else buildWithGoPackage)
|
||||
attrs) list;
|
||||
attrs;
|
||||
|
||||
# These providers are managed with the ./update-all script
|
||||
automated-providers = lib.mapAttrs (_: attrs: mkProvider attrs) list;
|
||||
|
||||
# These are the providers that don't fall in line with the default model
|
||||
special-providers = {
|
||||
# Packages that don't fit the default model
|
||||
ansible = callPackage ./ansible {};
|
||||
cloudfoundry = callPackage ./cloudfoundry {};
|
||||
gandi = callPackage ./gandi {};
|
||||
hcloud = callPackage ./hcloud {};
|
||||
libvirt = callPackage ./libvirt {};
|
||||
linuxbox = callPackage ./linuxbox {};
|
||||
lxd = callPackage ./lxd {};
|
||||
vpsadmin = callPackage ./vpsadmin {};
|
||||
vercel = callPackage ./vercel {};
|
||||
ansible = callPackage ./ansible { };
|
||||
cloudfoundry = callPackage ./cloudfoundry { };
|
||||
gandi = callPackage ./gandi { };
|
||||
hcloud = callPackage ./hcloud { };
|
||||
libvirt = callPackage ./libvirt { };
|
||||
linuxbox = callPackage ./linuxbox { };
|
||||
lxd = callPackage ./lxd { };
|
||||
vpsadmin = callPackage ./vpsadmin { };
|
||||
vercel = callPackage ./vercel { };
|
||||
} // (lib.optionalAttrs (config.allowAliases or false) {
|
||||
kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details";
|
||||
});
|
||||
in
|
||||
automated-providers // special-providers
|
||||
automated-providers // special-providers // { inherit mkProvider; }
|
||||
|
||||
@ -114,7 +114,7 @@ let
|
||||
passthru = {
|
||||
withPlugins = newplugins:
|
||||
withPlugins (x: newplugins x ++ actualPlugins);
|
||||
full = withPlugins lib.attrValues;
|
||||
full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p));
|
||||
|
||||
# Ouch
|
||||
overrideDerivation = f:
|
||||
|
||||
@ -21,7 +21,7 @@ let
|
||||
x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F";
|
||||
x64suffix = "21";
|
||||
x86suffix = "21";
|
||||
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html";
|
||||
};
|
||||
|
||||
"20.06.0" = {
|
||||
@ -32,7 +32,7 @@ let
|
||||
x86hash = "1di29hrimbw3myjnf2nn26a14klidhdwvjqla6yxhwd3s6lil194";
|
||||
x64suffix = "15";
|
||||
x86suffix = "15";
|
||||
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html";
|
||||
};
|
||||
|
||||
"20.09.0" = {
|
||||
@ -43,7 +43,7 @@ let
|
||||
x86hash = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4";
|
||||
x64suffix = "15";
|
||||
x86suffix = "15";
|
||||
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html";
|
||||
};
|
||||
|
||||
"20.10.0" = {
|
||||
@ -54,7 +54,7 @@ let
|
||||
x86hash = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx";
|
||||
x64suffix = "6";
|
||||
x86suffix = "6";
|
||||
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2010.html";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2010.html";
|
||||
};
|
||||
|
||||
"20.12.0" = {
|
||||
@ -65,7 +65,7 @@ let
|
||||
x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf";
|
||||
x64suffix = "12";
|
||||
x86suffix = "12";
|
||||
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html";
|
||||
};
|
||||
|
||||
"21.01.0" = {
|
||||
@ -76,7 +76,7 @@ let
|
||||
x86hash = "1mmx5r3wi9i6bwh4kdlpw446m8kijkaar8shi0q1n21fv0ygg3r5";
|
||||
x64suffix = "14";
|
||||
x86suffix = "14";
|
||||
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2101.html";
|
||||
};
|
||||
|
||||
"21.03.0" = {
|
||||
@ -87,7 +87,7 @@ let
|
||||
x86hash = "11nn9734a515dm1q880z9wmhvx8ikyh3riayyn42z22q4kd852n3";
|
||||
x64suffix = "38";
|
||||
x86suffix = "38";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2103.html";
|
||||
};
|
||||
|
||||
"21.06.0" = {
|
||||
@ -98,7 +98,7 @@ let
|
||||
x86hash = "c2d9652ad9488a9ff171e62df8455ebe6890bcfade1cc289893ee35322d9d812";
|
||||
x64suffix = "28";
|
||||
x86suffix = "28";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2106.html";
|
||||
};
|
||||
|
||||
"21.08.0" = {
|
||||
@ -109,7 +109,7 @@ let
|
||||
x86hash = "b6d1bde5a8533f22374e1f5bbb3f5949e5b89773d0703e021fbe784b455aad3f";
|
||||
x64suffix = "40";
|
||||
x86suffix = "40";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2108.html";
|
||||
};
|
||||
|
||||
"21.09.0" = {
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "qnotero";
|
||||
|
||||
version = "2.1.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ealbiter";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "16ckcjxa3dgmz1y8gd57q2h84akra3j4bgl4fwv4m05bam3ml1xs";
|
||||
sha256 = "0y2xph4ha07slni039s034cn1wsk3q2d86hihy97h4ch47ignv20";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.pyqt5 wrapQtAppsHook ];
|
||||
|
||||
@ -17,19 +17,20 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fstar";
|
||||
version = "2021.09.11";
|
||||
version = "2021.09.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FStarLang";
|
||||
repo = "FStar";
|
||||
rev = "v${version}";
|
||||
sha256 = "1aqk6fx77zcb7mcm78dk4l4zzd323qiv7yc7hvc38494yf6gk8a0";
|
||||
sha256 = "gqy9iaLZlTyv9ufHrUG87ta2xyc1OaZ/KRGhAzB+wsQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
buildInputs = [
|
||||
z3
|
||||
sedlex-2_3
|
||||
] ++ (with ocamlPackages; [
|
||||
ocaml
|
||||
findlib
|
||||
@ -42,7 +43,6 @@ stdenv.mkDerivation rec {
|
||||
menhir
|
||||
menhirLib
|
||||
pprint
|
||||
sedlex-2_3
|
||||
ppxlib
|
||||
ppx_deriving
|
||||
ppx_deriving_yojson
|
||||
@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildFlags = [ "libs" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ulib/gen_mllib.sh
|
||||
substituteInPlace src/ocaml-output/Makefile --replace '$(COMMIT)' 'v${version}'
|
||||
@ -74,6 +76,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.asl20;
|
||||
changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md";
|
||||
platforms = with platforms; darwin ++ linux;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
maintainers = with maintainers; [ gebner pnmadelaine ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@ let
|
||||
useLLVM = stdenv.hostPlatform.useLLVM or false;
|
||||
bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none";
|
||||
haveLibc = stdenv.cc.libc != null;
|
||||
inherit (stdenv.hostPlatform) isMusl;
|
||||
inherit (stdenv.hostPlatform) isMusl isAarch64;
|
||||
|
||||
in
|
||||
|
||||
@ -27,10 +27,11 @@ stdenv.mkDerivation {
|
||||
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
|
||||
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
|
||||
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
|
||||
] ++ lib.optionals (useLLVM || bareMetal || isMusl || isAarch64) [
|
||||
"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
|
||||
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
|
||||
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
|
||||
"-DCOMPILER_RT_BUILD_XRAY=OFF"
|
||||
"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
|
||||
"-DCOMPILER_RT_BUILD_PROFILE=OFF"
|
||||
] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [
|
||||
"-DCMAKE_C_COMPILER_WORKS=ON"
|
||||
@ -110,7 +111,5 @@ stdenv.mkDerivation {
|
||||
# "All of the code in the compiler-rt project is dual licensed under the MIT
|
||||
# license and the UIUC License (a BSD-like license)":
|
||||
license = with lib.licenses; [ mit ncsa ];
|
||||
# TODO/FIXME: Build fails on Hydra:
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/makefile b/makefile
|
||||
index a5f3d75..f617e25 100644
|
||||
--- a/makefile
|
||||
+++ b/makefile
|
||||
@@ -109,9 +109,7 @@ ${bd}/%.o: src/builtins/%.c
|
||||
|
||||
|
||||
src/gen/customRuntime:
|
||||
- @echo "Copying precompiled bytecode from the bytecode branch"
|
||||
- git checkout remotes/origin/bytecode src/gen/{compiler,formatter,runtime0,runtime1,src}
|
||||
- git reset src/gen/{compiler,formatter,runtime0,runtime1,src}
|
||||
+ @echo "src/gen/ files retrieved externally"
|
||||
${bd}/load.o: src/gen/customRuntime
|
||||
|
||||
-include $(bd)/*.d
|
||||
@ -29,23 +29,18 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
patches = [
|
||||
# self-explaining
|
||||
./001-remove-vendoring.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/SHELL =.*/ d' makefile
|
||||
'';
|
||||
|
||||
preBuild =
|
||||
if genBytecode
|
||||
then ''
|
||||
${bqn-path} genRuntime ${mbqn-source}
|
||||
''
|
||||
else ''
|
||||
cp ${cbqn-bytecode-files}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/
|
||||
'';
|
||||
preBuild = ''
|
||||
# inform make we are providing the runtime ourselves
|
||||
touch src/gen/customRuntime
|
||||
'' + (if genBytecode then ''
|
||||
${bqn-path} genRuntime ${mbqn-source}
|
||||
'' else ''
|
||||
cp ${cbqn-bytecode-files}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/
|
||||
'');
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, lib
|
||||
, fetchurl
|
||||
, unzip
|
||||
, version ? "2.13.1"
|
||||
, version ? "2.14.3"
|
||||
, sources ? let
|
||||
base = "https://storage.googleapis.com/dart-archive/channels";
|
||||
x86_64 = "x64";
|
||||
@ -10,24 +10,24 @@
|
||||
aarch64 = "arm64";
|
||||
# Make sure that if the user overrides version parameter they're
|
||||
# also need to override sources, to avoid mistakes
|
||||
version = "2.13.1";
|
||||
version = "2.14.3";
|
||||
in
|
||||
{
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||
sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya";
|
||||
sha256 = "0is4gz99i06yb4jisxcz2c15jqkaz6ayhg9b8zb3s0s8yp59r2iq";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||
sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq";
|
||||
sha256 = "0wg1mnj4qrv22z510032jnwb3z39gvzlrv5wic2ci5mg7316xlya";
|
||||
};
|
||||
"${version}-i686-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
|
||||
sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj";
|
||||
sha256 = "0gnjk3lh63m0naaw67g9w7wys5cgx2ipzd1dznqnlvxp2vj1gj5p";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||
sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc";
|
||||
sha256 = "1j7snnf3a0jly85njq8npqikrdhz9lkirhvik1hkpd9sv7qfbvd6";
|
||||
};
|
||||
}
|
||||
}:
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.dartlang.org/";
|
||||
maintainers = with maintainers; [ grburst thiagokokada ];
|
||||
maintainers = with maintainers; [ grburst thiagokokada flexagoon ];
|
||||
description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps";
|
||||
longDescription = ''
|
||||
Dart is a class-based, single inheritance, object-oriented language
|
||||
|
||||
@ -3,6 +3,6 @@
|
||||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "24.1.1";
|
||||
sha256 = "sha256-y5QtLCrYeMT4WdHkFngKv02CZ35eYZF3sjfI5OZNAH0=";
|
||||
version = "24.1.2";
|
||||
sha256 = "sha256-P0XU+gqDyhW0QQf1UzO+CV9Yc6YP70MRf3MLgdKzeU4=";
|
||||
}
|
||||
|
||||
@ -35,6 +35,6 @@ mkDerivation rec {
|
||||
homepage = "https://supercollider.github.io";
|
||||
maintainers = with maintainers; [ mrmebelman ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = [ "x686-linux" "x86_64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtksourceview";
|
||||
version = "5.0.0";
|
||||
version = "5.2.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1hyrmh9r1zd5kjh5ch9d7bhk2kphbqhm7ijfxfkcdln8q0rnd0k4";
|
||||
sha256 = "ybNPoCZU9WziL6CIJ9idtLqBYxsubX0x6mXRPHKUMOk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libosmium";
|
||||
version = "2.17.0";
|
||||
version = "2.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmcode";
|
||||
repo = "libosmium";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q938WA+vJDqGVutVzWdEP7ujDAmfj3vluliomVd0om0=";
|
||||
sha256 = "sha256-riNcIC60gw9qxF8UmPjq03XuD3of0BxKbZpgwjMNh3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, removeReferencesTo
|
||||
, python3
|
||||
, meson
|
||||
@ -99,6 +100,12 @@ let
|
||||
./0090-pipewire-config-template-paths.patch
|
||||
# Place SPA data files in lib output to avoid dependency cycles
|
||||
./0095-spa-data-dir.patch
|
||||
# Fix compilation on AArch64
|
||||
# XXX: REMOVE ON NEXT RELEASE
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f8817b439433798bd7217dc4ae72197887b0fc96.diff";
|
||||
sha256 = "0j4xds01h20mc606xp90h5v56kf17hf7n06k0xfa9qmmmfrh7i04";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, "@nerdwallet/shepherd"
|
||||
, "@nestjs/cli"
|
||||
, "@squoosh/cli"
|
||||
, "@tailwindcss/language-server"
|
||||
, "@vue/cli"
|
||||
, "@webassemblyjs/cli"
|
||||
, "@webassemblyjs/repl"
|
||||
|
||||
1158
pkgs/development/node-packages/node-packages.nix
generated
1158
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.18.31"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
version = "1.18.54"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-WURdDh1VyMlnVpfqQcmKDYIImkvjB26mDjqHy+lNwUE=";
|
||||
sha256 = "sha256-LYHcSEAgBZ/HOBZZhDBBB9TbHGd0tjENCMiSoXUfaYA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.21.31"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
version = "1.21.54"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-WM0xXirglxrNs9fNqcnDa0HHMYH0GUOnRDgS1tPJrRg=";
|
||||
sha256 = "sha256-RhJ7OjhdDsc9GZS4lYsjt54GE+EsSGNxoQDfmStyobk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, tkinter, supercollider }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, tkinter
|
||||
, supercollider
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "FoxDot";
|
||||
@ -9,7 +15,10 @@ buildPythonPackage rec {
|
||||
sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ tkinter supercollider ];
|
||||
propagatedBuildInputs = [ tkinter ]
|
||||
# we currently build SuperCollider only on Linux
|
||||
# but FoxDot is totally usable on macOS with the official SuperCollider binary
|
||||
++ lib.optionals stdenv.isLinux [ supercollider ];
|
||||
|
||||
# Requires a running SuperCollider instance
|
||||
doCheck = false;
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "junos-eznc";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "878c479c933346cc8cc60b6d145973568ac23e7c453e193cf55625e7921a9b62";
|
||||
sha256 = "4eee93d0af203af7cee54a8f0c7bd28af683e829edf1fd68feba85d0ad737395";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -26,12 +26,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter_server";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-irT0hKSiaY91fP8HadJ7XZkeAjKmZtVPTWraTmphMws=";
|
||||
sha256 = "ab7ab1cc38512f15026cbcbb96300fb46ec8b24aa162263d9edd00e0a749b1e8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.18.53";
|
||||
version = "1.18.54";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4579f837aa87b439014c8aa40ff0cf2510a6d01dcb370179a19c5c45c8aecb9c";
|
||||
sha256 = "fdbb7ff1687fba8e7ac521502cb2d2ca4b845e1a331f5b4fe55aff7c17e1f985";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "packageurl-python";
|
||||
version = "0.9.4";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0mpvj8imsaqhrgfq1cxx16flc5201y78kqa7bh2i5zxsc29843mx";
|
||||
sha256 = "c01fbaf62ad2eb791e97158d1f30349e830bee2dd3e9503a87f6c3ffae8d1cf0";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.50";
|
||||
version = "2.1.51";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c67365b26060452631c0083a0f5d50af3cba9287b84b2c157404c959cb4bb74d";
|
||||
sha256 = "32c5bf3926c1ac001d57f6b7569fc1fdd7ccfe747190f2e61d6baf610811beb8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -35,14 +35,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-lsp-server";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-lsp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RuZfCvYeO4mthZrg06UhwPp57qvuUI1yYyne5nzIHhE=";
|
||||
sha256 = "sha256-zoKJ9g7cXcQhickkhRjYwl6SqOar2Kautg5dHf3PqGk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvesync";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-xvHvZx22orJR94cRMyyXey27Ksh2/ULHRvv7xxXv11k=";
|
||||
sha256 = "f8bc6ebbe2c2bf37009b50b16e34747b0cfe35dd249aed4525b68c3af061941f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rdflib-jsonld";
|
||||
version = "0.5.0";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4f7d55326405071c7bce9acf5484643bcb984eadb84a6503053367da207105ed";
|
||||
sha256 = "107cd3019d41354c31687e64af5e3fd3c3e3fa5052ce635f5ce595fd31853a63";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nose ];
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.59.6";
|
||||
version = "2.59.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4bf7a6c541dbb0d29af9a7fba0159946f67974fbc8e76d2587e601d59f83fd45";
|
||||
sha256 = "sha256-6tNUI08Fp2zITH1ILfVVEU0VhgvLogWfXPr9dkAKQEk=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrapy-splash";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488";
|
||||
sha256 = "a7c17735415151ae01f07b03c7624e7276a343779b3c5f4546f655f6133df42f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ scrapy six ];
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "somecomfort";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CbV8NOpCXzVz0dBKhUclUCPrD4530zv5HIYxsbNO+OA=";
|
||||
sha256 = "f201109104a61d05624022d3d0ebf23bf487570408517cac5f3f79dbde4b225d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "azure-storage-azcopy";
|
||||
version = "10.12.1";
|
||||
version = "10.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-storage-azcopy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kujY7Qgis2pie0WVQAokVopD3TYkjjBnqhw6XZTG16o=";
|
||||
sha256 = "sha256-NmWCaTmQlCAKaVDumDlubHQhUjhY7uYawkjrP2ggczk=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "azure-functions-core-tools";
|
||||
version = "3.0.3568";
|
||||
version = "3.0.3734";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip";
|
||||
sha256 = "0yxdqc5d1xsixjj2dlvs32d6fz4vh58ih2l00lc456fg15mfw3lg";
|
||||
sha256 = "sha256-27kUnXSnDKZ/m8d1KAZG5DrFzB5uqlCLgtN7lXJ+eTY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt-extras";
|
||||
rev = "bd4c3e80a0a07c78407422de13039ce5889fb4b0";
|
||||
version = "2021-09-15";
|
||||
rev = "aff36a23f7213d94189aabfcc47a32b11f3a6fba";
|
||||
version = "2021-09-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulp";
|
||||
repo = "sbt-extras";
|
||||
inherit rev;
|
||||
sha256 = "NBERpDSY1FoGzD0AXJx1yTG37fjzw+VsTAgkIBfJdhs=";
|
||||
sha256 = "CBPiA9UdTc31EbfCdG70j88sn53CfZBr8rlt6+ViivI=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nexus";
|
||||
version = "3.30.0-01";
|
||||
version = "3.32.0-03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
|
||||
sha256 = "sha256-axhuw1FNut+JqS1WCxyQmP08qh0tXn9UAvz2Gj1kGPs=";
|
||||
sha256 = "17cgbpv1id4gbp3c42pqc3dxnh36cm1c77y7dysskyml4qfh5f7m";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet-prosody";
|
||||
version = "1.0.5056";
|
||||
version = "1.0.5307";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "06qxa9h2ry92xrk2jklp76nv3sl8nvykdvsqmhn33lz6q6vmw2xr";
|
||||
sha256 = "VsOoW8h7yFgMRVTP6AHs2HOqSwXMnRNgJI8FM/rHp2I=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -281,12 +281,12 @@ final: prev:
|
||||
|
||||
barbar-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "barbar.nvim";
|
||||
version = "2021-09-29";
|
||||
version = "2021-10-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "romgrk";
|
||||
repo = "barbar.nvim";
|
||||
rev = "52f3c85027a7fe851e27fd267dfe29900e50bbdf";
|
||||
sha256 = "1nyraagc3m2dx1qx3wmr0s89rq12kz5mjmkiqm353mf4f9jxf5n3";
|
||||
rev = "6e638309efcad2f308eb9c5eaccf6f62b794bbab";
|
||||
sha256 = "0kvhwn3gr5x5vf2cgjda22naf8cvgkc43zalvxvr99s9jcjyynki";
|
||||
};
|
||||
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
|
||||
};
|
||||
@ -449,12 +449,12 @@ final: prev:
|
||||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-10-03";
|
||||
version = "2021-10-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "b224cc55bee059dfa1bcfd7cdb188f0b6f09c5af";
|
||||
sha256 = "04x3jfbhn8r8yi68m0xa6j768ypnxbxxab4pn4l8asbbxv9mrl3l";
|
||||
rev = "33828c635ef856919889b229ab771268089d4c36";
|
||||
sha256 = "0645p6mwgnhdp5lnri4c4h6ryyfn1s3487ydnhkr4p629vnrsl4k";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
@ -1074,12 +1074,12 @@ final: prev:
|
||||
|
||||
crates-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "crates.nvim";
|
||||
version = "2021-10-03";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saecki";
|
||||
repo = "crates.nvim";
|
||||
rev = "331776e240e14c54f98428a31b830b12062b3275";
|
||||
sha256 = "1cygri250v41g99w1vjkfmxnw9n1knsi6bljkfg8cy60zn6ig8wm";
|
||||
rev = "ab2c491a941dda7fcec50fe58f472c024fac96e9";
|
||||
sha256 = "0h9d8i525cafxvdqxygfx9mchmcjlaq1kza3d4jiaa8azx9bfpzr";
|
||||
};
|
||||
meta.homepage = "https://github.com/saecki/crates.nvim/";
|
||||
};
|
||||
@ -1604,12 +1604,12 @@ final: prev:
|
||||
|
||||
edge = buildVimPluginFrom2Nix {
|
||||
pname = "edge";
|
||||
version = "2021-09-28";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "edge";
|
||||
rev = "3c4d98eec6604fdbbfec9dd86e8fd2a3d3c4b113";
|
||||
sha256 = "1624gwlkvr6myw0l7srha0dk9053g0dsnfkbxsyrq1s17day69zf";
|
||||
rev = "73671fbfc70f0b78c743894b31c009b22a6ddaa3";
|
||||
sha256 = "0mbz6901l0i0cy49d63542jfvzk93d2xnbkpnih65x8whhx35vdc";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/edge/";
|
||||
};
|
||||
@ -1979,12 +1979,12 @@ final: prev:
|
||||
|
||||
fzf-lsp-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "fzf-lsp.nvim";
|
||||
version = "2021-10-01";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gfanto";
|
||||
repo = "fzf-lsp.nvim";
|
||||
rev = "880de9e83a3390a1c15fb20ad24fa48006d8cefd";
|
||||
sha256 = "1xrhqb8dsfhf2v0kb0k8fdmizaxsyf1dlryrynyn8v4s644h7zyl";
|
||||
rev = "8ffc845bdd546ff3a6f5d90096a52542a1463de0";
|
||||
sha256 = "0d98hhhyxknimppp144kj3432xxd284zs0xxiilwybsx0pzpl3qk";
|
||||
};
|
||||
meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";
|
||||
};
|
||||
@ -2135,12 +2135,12 @@ final: prev:
|
||||
|
||||
gitsigns-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2021-09-27";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "805b12a9b7b1997a47b185cdb2938e0f3e428714";
|
||||
sha256 = "0lvf9i2px2s54rn0ahp0z0adn8d9qm051jaxqxmpn718kibknl7k";
|
||||
rev = "ceb2dcb23f569ce337deb1b1ce7d4a51434cec32";
|
||||
sha256 = "0q7a2pa6am99656a07zpnhqlgzjkn9z0jg6lvc45c7mqavl21xis";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
@ -2267,12 +2267,12 @@ final: prev:
|
||||
|
||||
gruvbox-material = buildVimPluginFrom2Nix {
|
||||
pname = "gruvbox-material";
|
||||
version = "2021-09-28";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "gruvbox-material";
|
||||
rev = "b8be59288d8f120bd24c456c6ec62b6ea03d0fa0";
|
||||
sha256 = "158sd6n6hali2zaxq8wnjp4qd0nndfkv84fvlln7mm6mp22ynq7k";
|
||||
rev = "8f95a04c0a8d4d7b84b089a11a2c41d58693d89c";
|
||||
sha256 = "1nzr0148zi89mq4yil77ns2nrs0ldnl3fh8aqxa89fivy8lg9p64";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
|
||||
};
|
||||
@ -2495,12 +2495,12 @@ final: prev:
|
||||
|
||||
indent-blankline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "indent-blankline.nvim";
|
||||
version = "2021-09-29";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukas-reineke";
|
||||
repo = "indent-blankline.nvim";
|
||||
rev = "a5c8b551e290113b0e54530f7d5bdee14bcdedff";
|
||||
sha256 = "057qf4c5vxn5vf6x4i4crmqlcl8kw6qavncsk9h9gyq0h8zaqv1g";
|
||||
rev = "31fe9b4ac3eaaac0bf5e90d607662c32f59dc0b7";
|
||||
sha256 = "1fwyrp5w7q4pz4a5dh24j2v8qrm4pr71p7qm14hj7xw3a80s9bci";
|
||||
};
|
||||
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
|
||||
};
|
||||
@ -2784,12 +2784,12 @@ final: prev:
|
||||
|
||||
LeaderF = buildVimPluginFrom2Nix {
|
||||
pname = "LeaderF";
|
||||
version = "2021-09-19";
|
||||
version = "2021-10-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yggdroot";
|
||||
repo = "LeaderF";
|
||||
rev = "f80ff99c434d4d233a4a8bf2d116289b6619fbcd";
|
||||
sha256 = "0l0jy9wj95vz86rzmf5yvrvmbapg8g6rfx8ls21i95kzbm02c435";
|
||||
rev = "583358ec0dd9a6a1937eb3e46614ebad017325b9";
|
||||
sha256 = "1ngf54bz0v940y0sf9axbvsf3vcnajdrp4lhvbh0zw28piqxlkap";
|
||||
};
|
||||
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
|
||||
};
|
||||
@ -3024,12 +3024,12 @@ final: prev:
|
||||
|
||||
lsp_signature-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp_signature.nvim";
|
||||
version = "2021-09-26";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "lsp_signature.nvim";
|
||||
rev = "8f89ab239ef2569096b6805ea093a322985b8e4e";
|
||||
sha256 = "0cjx5xbmwkjbvcg0ak33lbz14ssqn84rikwkc0615fsrz323r36j";
|
||||
rev = "24bea0c8697a360f96f7050b15b46e5f1ab8383a";
|
||||
sha256 = "0xdr9n6jq9ma1bkck05xcpxja1wwvqwhg36s2v5kl11anb67vqhz";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
|
||||
};
|
||||
@ -3084,12 +3084,12 @@ final: prev:
|
||||
|
||||
luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "luasnip";
|
||||
version = "2021-10-03";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "90b509ccd12c3aee211a322c60b44f6eba60832c";
|
||||
sha256 = "0aykgqmdl83d6qg02rzxj6w01c91nq9i073yq1hj25ljqspzfsqz";
|
||||
rev = "2f7e2b173386c9a5f26fbc22a765301784893e1c";
|
||||
sha256 = "02w690fhlhmbjb03958kz5migh8iv5rnmhh3lg8sb08haclh14g3";
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
};
|
||||
@ -3768,12 +3768,12 @@ final: prev:
|
||||
|
||||
nightfox-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "nightfox.nvim";
|
||||
version = "2021-10-01";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdenEast";
|
||||
repo = "nightfox.nvim";
|
||||
rev = "84c1d22f2108034f3597045155ac8fac230c90db";
|
||||
sha256 = "0bz6h1c6hfw80nw1y1b89gnlbdnb2zjn4inn6fkhdvyg04yi8sn5";
|
||||
rev = "15dfe546111a96e5f30198d5bd163658acdbbe3b";
|
||||
sha256 = "0a03i8i5fjzffqv4pp29x32ld3h5azvia2a1b3sc5i0bbzishxb5";
|
||||
};
|
||||
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
|
||||
};
|
||||
@ -4164,24 +4164,24 @@ final: prev:
|
||||
|
||||
nvim-lightbulb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lightbulb";
|
||||
version = "2021-09-21";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kosayoda";
|
||||
repo = "nvim-lightbulb";
|
||||
rev = "5b265fe19a3a60b6429b34c8cfdb0284ce52de33";
|
||||
sha256 = "0m2kq0rs0rkif8d8783dbd9dwahzih67zfz3wi58r5lsm4fnai9h";
|
||||
rev = "fb7fa4adf6c6464784e248b3a12e6ca0b3f4855a";
|
||||
sha256 = "1p7i1vq6w9ghp9xhv78rbjj9c5sp01b3qqyhskqdzn1pkgj4pwr8";
|
||||
};
|
||||
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
|
||||
};
|
||||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-10-01";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "507f8a570ac2b8b8dabdd0f62da3b3194bf822f8";
|
||||
sha256 = "11jcmvma2lbqrpgznhgid25l8angfjrn0qwnjwcbnv0l34amlw62";
|
||||
rev = "30442900db62ff875013b3f1584e8c0a832c43d2";
|
||||
sha256 = "1v0hmf5sv884l1svvfb20yb5q9vfbc4ap0268hcxc7393al4fs2f";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
@ -4308,12 +4308,12 @@ final: prev:
|
||||
|
||||
nvim-treesitter-context = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter-context";
|
||||
version = "2021-09-28";
|
||||
version = "2021-10-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "romgrk";
|
||||
repo = "nvim-treesitter-context";
|
||||
rev = "d4f0193c2a5e947247c2fc407c266bfb09b55a7b";
|
||||
sha256 = "1pg3yc1vlx7a0iwx1cgkzs3jpmg1rlw6db7dyjxkp0926vz7dv0k";
|
||||
rev = "e1f54e1627176337b3803a11403ac0e9d09de818";
|
||||
sha256 = "0xg3c8msd9fsmwlxgpxwbz2h9aizc3f7jn9p1q23pjlpcxr8xwll";
|
||||
};
|
||||
meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
|
||||
};
|
||||
@ -4476,12 +4476,12 @@ final: prev:
|
||||
|
||||
onedark-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onedark.nvim";
|
||||
version = "2021-09-27";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "onedark.nvim";
|
||||
rev = "092e270b76940dff9a8270f97c2cec7eca97d31e";
|
||||
sha256 = "0c3axfdr2mz5sgmpsk510z9yj62iw58ds3amkbqd03nywn3s6bjv";
|
||||
rev = "5675f60acdf31fef35acf066ff754173d0cffa44";
|
||||
sha256 = "1q1d6b8yyknhsfaqk2805hivxv7rq6y0fsj45n7hwgqll195hcci";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/onedark.nvim/";
|
||||
};
|
||||
@ -5294,12 +5294,12 @@ final: prev:
|
||||
|
||||
sonokai = buildVimPluginFrom2Nix {
|
||||
pname = "sonokai";
|
||||
version = "2021-09-28";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "sonokai";
|
||||
rev = "3f34e4a1e78ab1049aa6b350008f8902f2855467";
|
||||
sha256 = "1hzqrx7dp9yv276fr9sddwpds50n1vmfik9fiq44djdqwd0z092v";
|
||||
rev = "81e19fc3db1af37ec5acf2d7cb11b97ae48c34b6";
|
||||
sha256 = "1g67hpnk366z71an7kl0g8x0ikn9v4yiaqv87b5n6s2ax6h3z9lr";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/sonokai/";
|
||||
};
|
||||
@ -5716,12 +5716,12 @@ final: prev:
|
||||
|
||||
telescope-frecency-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-frecency.nvim";
|
||||
version = "2021-09-01";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-frecency.nvim";
|
||||
rev = "cf3a1deb9cf165c60d54b3c05ef6b08ac9eb0056";
|
||||
sha256 = "05fjh17si1gv31da64m9qfdsy492c3njrp6l4l6qsf7n6dwjjsi6";
|
||||
rev = "4c46d468595d28d92bf340256e6cbbc3748ae6f0";
|
||||
sha256 = "1kkmac237n0if5hssjxw1gwdwdrhaf4kppg5zrpaqgva5bgg5idj";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
|
||||
};
|
||||
@ -5801,12 +5801,12 @@ final: prev:
|
||||
|
||||
telescope-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope.nvim";
|
||||
version = "2021-09-30";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "440c598de419858a056e7d9d42a0a6829cd5bb05";
|
||||
sha256 = "08rv6jd7r07n1pj7wjnwlq2wh25vp1hv5kkfywjavrvmb1ka6ik6";
|
||||
rev = "ec487779909ebc8bffbbe054a2e8a4fbe05c0e51";
|
||||
sha256 = "0xwl54wfh78s0gs6hdqhj7k3smdqsjdifxibkb9543msdnpvh0y0";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
@ -6174,12 +6174,12 @@ final: prev:
|
||||
|
||||
vifm-vim = buildVimPluginFrom2Nix {
|
||||
pname = "vifm.vim";
|
||||
version = "2021-09-29";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vifm";
|
||||
repo = "vifm.vim";
|
||||
rev = "6898b7fcbc36324c127ba42cabe488ab15c785f4";
|
||||
sha256 = "0wrp5ja8vrqv0cpzvs6czfmv0kih25ac9xxzb9q2y1zb2ran3lim";
|
||||
rev = "69d1d341e6e8c5424be178cc60375b517c9e4d4e";
|
||||
sha256 = "1zh6jg0ycalwq0dz7b65lrvhr5af6317j12k1s2xl7piabjbhxrx";
|
||||
};
|
||||
meta.homepage = "https://github.com/vifm/vifm.vim/";
|
||||
};
|
||||
@ -7710,12 +7710,12 @@ final: prev:
|
||||
|
||||
vim-go = buildVimPluginFrom2Nix {
|
||||
pname = "vim-go";
|
||||
version = "2021-10-03";
|
||||
version = "2021-10-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatih";
|
||||
repo = "vim-go";
|
||||
rev = "2578f7fd4a431fcb12ad2700ddd5a042457103a9";
|
||||
sha256 = "18js4znanr8hln9xldyayk82rx3rm4dp4hpb4qr1ps5clj3lc66x";
|
||||
rev = "81f8cd0ca270a7f6e3773644e163ac7de263e24c";
|
||||
sha256 = "08y3maidpya4qb5n7rrywnzk551m2dky428aw69r44597a2ivnqr";
|
||||
};
|
||||
meta.homepage = "https://github.com/fatih/vim-go/";
|
||||
};
|
||||
@ -8743,6 +8743,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/LnL7/vim-nix/";
|
||||
};
|
||||
|
||||
vim-noctu = buildVimPluginFrom2Nix {
|
||||
pname = "vim-noctu";
|
||||
version = "2015-06-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "noahfrederick";
|
||||
repo = "vim-noctu";
|
||||
rev = "de2ff9855bccd72cd9ff3082bc89e4a4f36ea4fe";
|
||||
sha256 = "14z1mwmvq0crvljsk6x29bxxhbavbjsggjr68f6aiz3635yih8vy";
|
||||
};
|
||||
meta.homepage = "https://github.com/noahfrederick/vim-noctu/";
|
||||
};
|
||||
|
||||
vim-nong-theme = buildVimPluginFrom2Nix {
|
||||
pname = "vim-nong-theme";
|
||||
version = "2020-12-16";
|
||||
@ -10018,12 +10030,12 @@ final: prev:
|
||||
|
||||
vim-tmux = buildVimPluginFrom2Nix {
|
||||
pname = "vim-tmux";
|
||||
version = "2020-07-25";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmux-plugins";
|
||||
repo = "vim-tmux";
|
||||
rev = "7e7680fb1bb05bca1c800213b265f45433ed1e33";
|
||||
sha256 = "19al4a4g8wfz43am32ncz8dg58wxhzn30p7r4n1780pv8hzkdrsb";
|
||||
rev = "cfe76281efc29890548cf9eedd42ad51c7a1faf0";
|
||||
sha256 = "0z263z1iwbxms90sp6jwk8kc4cf0zj1y3qfyh5p410ghadjnci99";
|
||||
};
|
||||
meta.homepage = "https://github.com/tmux-plugins/vim-tmux/";
|
||||
};
|
||||
@ -10583,12 +10595,12 @@ final: prev:
|
||||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2021-10-03";
|
||||
version = "2021-10-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "2d032e54c95593f1ea8bd458fc940a20a8f390f9";
|
||||
sha256 = "02vfbfgr8ipf20n0046h7wx66r15wvxdj5xcw80qv12zshdd0qi4";
|
||||
rev = "fc51b70d818a1df807f414b6ee47e7e0fbf74903";
|
||||
sha256 = "1n7390x33pk48sxiyhp0nsw87mj837535is3dmz8si5jj7nf6lb8";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
||||
@ -510,6 +510,7 @@ nicoe/deoplete-khard
|
||||
nishigori/increment-activator
|
||||
nixprime/cpsm
|
||||
NLKNguyen/papercolor-theme
|
||||
noahfrederick/vim-noctu
|
||||
noc7c9/vim-iced-coffee-script
|
||||
norcalli/nvim-colorizer.lua
|
||||
norcalli/nvim-terminal.lua
|
||||
|
||||
60
pkgs/os-specific/linux/autosuspend/default.nix
Normal file
60
pkgs/os-specific/linux/autosuspend/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "autosuspend";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "languitar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "03qca6avn7bwxcavif7q2nqfzivzp0py7qw3i4hsb28gjrq9nz36";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace '--cov-config=setup.cfg' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
portalocker
|
||||
psutil
|
||||
dbus-python
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
python-dbusmock
|
||||
pytest-httpserver
|
||||
dateutils
|
||||
freezegun
|
||||
pytest-mock
|
||||
requests
|
||||
requests-file
|
||||
icalendar
|
||||
tzlocal
|
||||
jsonpath-ng
|
||||
mpd2
|
||||
lxml
|
||||
pytest-datadir
|
||||
];
|
||||
|
||||
# Disable tests that need root
|
||||
disabledTests = [
|
||||
"test_smoke"
|
||||
"test_multiple_sessions"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib ; {
|
||||
description = "A daemon to automatically suspend and wake up a system";
|
||||
homepage = "https://autosuspend.readthedocs.io";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.bzizou ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "system76-firmware";
|
||||
# Check Makefile when updating, make sure postInstall matches make install
|
||||
version = "1.0.29";
|
||||
version = "1.0.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4wvVls6Z42GtC/MVFTvCv1UV/w5nt4p9oTMU4Bqh4JU=";
|
||||
sha256 = "sha256-agtaQ5Te4WcbIdCt8TDK4Y2y/9aHrDCUWuPRE5+aFjc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
cargoSha256 = "sha256-x2FO4UWtsvUeKgPxaqjdxtp9vWJq9vLIqQPyGF8nQG4=";
|
||||
cargoSha256 = "sha256-QFHyrvLR1v09RNlXiO/E+blvxPukKwPRRX+vQvlZSNQ=";
|
||||
|
||||
# Purposefully don't install systemd unit file, that's for NixOS
|
||||
postInstall = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dict-db-wiktionary";
|
||||
version = "20210901";
|
||||
version = "20210920";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
|
||||
sha256 = "S87E0aAFITOTugvsXOmbq8+P/LS2J+GmFvJYeYj79PM=";
|
||||
sha256 = "UeufbpSpRL+JrU3SkhxzWJncEsrM1es88grRmFwGABk=";
|
||||
};
|
||||
|
||||
# script in nixpkgs does not support python2
|
||||
|
||||
@ -9,35 +9,28 @@
|
||||
, luaSupport ? false, lua5
|
||||
}:
|
||||
|
||||
let inherit (lib) optional;
|
||||
in
|
||||
|
||||
assert sslSupport -> aprutil.sslSupport && openssl != null;
|
||||
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
|
||||
assert http2Support -> nghttp2 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.49";
|
||||
pname = "apache-httpd";
|
||||
version = "2.4.50";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
|
||||
sha256 = "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5";
|
||||
sha256 = "6a2817c070c606682eb53ed963511407d3c3d7a379cdf855971467b00fb3890f";
|
||||
};
|
||||
|
||||
# FIXME: -dev depends on -doc
|
||||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
setOutputFlags = false; # it would move $out/modules, etc.
|
||||
|
||||
buildInputs = [perl] ++
|
||||
optional brotliSupport brotli ++
|
||||
optional sslSupport openssl ++
|
||||
optional ldapSupport openldap ++ # there is no --with-ldap flag
|
||||
optional libxml2Support libxml2 ++
|
||||
optional http2Support nghttp2 ++
|
||||
optional stdenv.isDarwin libiconv;
|
||||
buildInputs = [ perl ] ++
|
||||
lib.optional brotliSupport brotli ++
|
||||
lib.optional sslSupport openssl ++
|
||||
lib.optional ldapSupport openldap ++ # there is no --with-ldap flag
|
||||
lib.optional libxml2Support libxml2 ++
|
||||
lib.optional http2Support nghttp2 ++
|
||||
lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
prePatch = ''
|
||||
postPatch = ''
|
||||
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
|
||||
sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|'
|
||||
'';
|
||||
@ -93,9 +86,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Apache HTTPD, the world's most popular web server";
|
||||
homepage = "http://httpd.apache.org/";
|
||||
homepage = "https://httpd.apache.org/";
|
||||
license = licenses.asl20;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ lovek323 peti ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
with python3Packages; buildPythonApplication rec {
|
||||
pname = "synadm";
|
||||
version = "0.29";
|
||||
version = "0.30";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1vy30nwsns4jnv0s5i9jpyplxpclgwyw0gldpywv4z3fljs0lzik";
|
||||
sha256 = "9e7c2e2540fb786c1064a9a2bfe6ef3ec8b0ed27f6fd6beda80ed615c72a6103";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -54,6 +54,7 @@ in python.pkgs.buildPythonPackage rec {
|
||||
pillow
|
||||
lxml
|
||||
setuptools
|
||||
prometheus-client
|
||||
] ++ lib.optionals withE2BE [
|
||||
asyncpg
|
||||
python-olm
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "do-agent";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digitalocean";
|
||||
repo = "do-agent";
|
||||
rev = version;
|
||||
sha256 = "sha256-boEgCC3uWvJvb6VKpNhh6vHCfeE7oun5oneI2ITKh9g=";
|
||||
sha256 = "sha256-Up7HBG6h24XIjBRvQYZpuB5lWXYTipQql9loykwwd1k=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -26,6 +26,5 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/unifi-poller/unifi-poller";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,16 +11,17 @@ let
|
||||
inotify-simple
|
||||
libnacl
|
||||
paho-mqtt
|
||||
pycurl
|
||||
]);
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "moonraker";
|
||||
version = "unstable-2021-09-04";
|
||||
version = "unstable-2021-09-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arksine";
|
||||
repo = "moonraker";
|
||||
rev = "db3f69e0dddcc8ac07e895a9a65906a8e08707e7";
|
||||
sha256 = "uam3Vp/NA8HWxqqy6l8UkeaR5OSqHMwb5uXUL4E0jBQ=";
|
||||
rev = "2447ccab6252fddc829da3eec8b29d1abe3dee60";
|
||||
sha256 = "qaorF26e2pkOCxiUfo8MOPQVpZjx5G1uo66jFoQpMcs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_repack";
|
||||
version = "1.4.6";
|
||||
version = "1.4.7";
|
||||
|
||||
buildInputs = [ postgresql openssl zlib readline ];
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "reorg";
|
||||
repo = "pg_repack";
|
||||
rev = "refs/tags/ver_${version}";
|
||||
sha256 = "01n320cvn0z48ac4mbclpbzspdraaqzzw4xdcns7fj33vqq8nqm7";
|
||||
sha256 = "12j8crgljvkm9dz790xcsr8l7sv8ydvb2imrb0jh1jvj0r9yg1v5";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "done";
|
||||
version = "1.16.3";
|
||||
version = "1.16.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "franciscolourenco";
|
||||
repo = "done";
|
||||
rev = version;
|
||||
sha256 = "Xld66z9vVp3kxikndZ9k/zlNvP0YSoSCNTBkJ8rT3uo=";
|
||||
sha256 = "E0wveeDw1VzEH2kzn63q9hy1xkccfxQHBV2gVpu2IdQ=";
|
||||
};
|
||||
|
||||
checkPlugins = [ fishtape ];
|
||||
|
||||
@ -5,15 +5,15 @@
|
||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2021-09-22";
|
||||
version = "2021-10-05";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "5b3d2b2f0c02ef059fcbcbdb619b22318b8cc13a";
|
||||
rev = "e5b9b80008a2fd71b441ef39fe620ed47dad82e5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "SSvPU/YWFcGN8oyOyQXZhNOuOS7Z8a6Vel94z9EoyAU=";
|
||||
sha256 = "09oTsUYLLZAoUwM63gAVYLWFvp0aKTM9K79alTISEJw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aws-nuke";
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rebuy-de";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FntHZi+L0Ti2QFbd8keF1sxcdXc01hs13Np23hF/pVc=";
|
||||
sha256 = "sha256-8ILjEWr91YMUUN2GMXnS3sRrwGvUsYjDmRnM+fY5PkY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VtsHUxI5RuKbQOSu55qPCJHsDO5+cNGT92y9dlibXlc=";
|
||||
vendorSha256 = "sha256-sAII1RD9CG3Ape9OwD0956atlmaJVzSpRRBdo+ozTuk=";
|
||||
|
||||
preBuild = ''
|
||||
if [ "x$outputHashAlgo" != "x" ]; then
|
||||
|
||||
@ -21,11 +21,11 @@ let
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli";
|
||||
version = "1.20.31"; # N.B: if you change this, change botocore and boto3 to a matching version too
|
||||
version = "1.20.54"; # N.B: if you change this, change botocore and boto3 to a matching version too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-qDKnxh4M+LOXYp1xCvW0S0IE5NnwvFpYelUCCjA18zQ=";
|
||||
sha256 = "sha256-stnuPobBKIpKA4iTKGTO5kmMEl7grFdZNryz40S599M=";
|
||||
};
|
||||
|
||||
# https://github.com/aws/aws-cli/issues/4837
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unionfs-fuse";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpodgorny";
|
||||
repo = "unionfs-fuse";
|
||||
rev = "v${version}";
|
||||
sha256 = "0bwx70x834qgqh53vqp18bhbxbsny80hz922rbgj8k9wj7cbfilm";
|
||||
sha256 = "sha256-EJryML6E0CW4kvsqMRqV3cq77j50HuylNzgaHD6CL/o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluent-bit";
|
||||
version = "1.7.9";
|
||||
version = "1.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluent";
|
||||
repo = "fluent-bit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rL2IJYTMs0Yzo/oqrcI56krmVnxxxRWCebSjjbjiP/k=";
|
||||
sha256 = "sha256-JYE4ReFiYSDx/0dlA8OkQw3rEpUEQDguTWoHC1r1fUc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "infracost";
|
||||
version = "0.9.6";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infracost";
|
||||
rev = "v${version}";
|
||||
repo = "infracost";
|
||||
sha256 = "sha256-lcvpNhfSgr8ky03sTo7kjnaLUJeIrzFqpYUjvQpT1Po=";
|
||||
sha256 = "sha256-8XS30fRxHPady/snr3gfo8Ryiw9O7EeDezcYYZjod1w=";
|
||||
};
|
||||
vendorSha256 = "sha256-TKs3xuZaO9PvlAcV5GDa3Jb36zeVWX3LcdcPxWR6KzE=";
|
||||
vendorSha256 = "sha256-8r7v3526kY+rFHkl1+KEwNbFrSnXPlpZD6kiK4ea+Zg=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
|
||||
|
||||
@ -18,9 +18,16 @@ buildGoModule rec {
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
checkInputs = [ terraform ];
|
||||
# Short only runs the unit-tests tagged short
|
||||
checkFlags = [ "-v" "-short" ];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make test
|
||||
|
||||
# Remove tests that require networking
|
||||
rm cmd/infracost/{breakdown_test,diff_test}.go
|
||||
# ldflags are required for some of the version testing
|
||||
go test ./... $checkFlags ''${ldflags:+-ldflags="$ldflags"}
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
|
||||
@ -40,13 +40,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpm-ostree";
|
||||
version = "2021.2";
|
||||
version = "2021.9";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-msu5LReTYupgoS6Rm2nrMz9jauciAD99hh+w8BhSYn4=";
|
||||
sha256 = "sha256-DvATvvAliJhEItbOlK1CA/ibhzImw651pkplqpRG+OQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,27 +1,46 @@
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper, rustPlatform
|
||||
, openssl, pkg-config, darwin, libiconv }:
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, ronn
|
||||
, openssl
|
||||
, stdenv
|
||||
, libiconv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httplz";
|
||||
version = "1.9.2";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thecoshman";
|
||||
repo = "http";
|
||||
rev = "v${version}";
|
||||
sha256 = "154alxxclz78r29m656c8yahnzq0vd64s4sp19h0ca92dfw4s46y";
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
pname = "https";
|
||||
sha256 = "sha256-vMhQHWzsZlqMVkEQHCZTB8T4ETTaf8iAS9QhgYdfcx0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv darwin.apple_sdk.frameworks.Security
|
||||
cargoSha256 = "sha256-9gnKVZ3HQs3kNj4i1cgC+Jl3dhjx7QRaHSih1HOB3nI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
pkg-config
|
||||
ronn
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--bin httplz" ];
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
cargoSha256 = "0r33vg9431jv32r03ryxb3rc4mp6h1kc00d3h1knssfvkwsh31yn";
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
Security
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--bin" "httplz" ];
|
||||
|
||||
postInstall = ''
|
||||
sed -E 's/http(`| |\(|$)/httplz\1/g' http.md > httplz.1.ronn
|
||||
RUBYOPT=-Eutf-8:utf-8 ronn --organization "http developers" -r httplz.1.ronn
|
||||
installManPage httplz.1
|
||||
wrapProgram $out/bin/httplz \
|
||||
--prefix PATH : "${openssl}/bin"
|
||||
'';
|
||||
@ -30,6 +49,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A basic http server for hosting a folder fast and simply";
|
||||
homepage = "https://github.com/thecoshman/http";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
||||
31
pkgs/tools/networking/mole/default.nix
Normal file
31
pkgs/tools/networking/mole/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mole";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davrodpin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "11q48wfsr35xf2gmvh4biq4hlpba3fh6lrm3p9wni0rl1nxy40i7";
|
||||
};
|
||||
|
||||
vendorSha256 = "1qm328ldkaifj1vsrz025vsa2wqzii9rky00b6wh8jf31f4ljbzv";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/davrodpin/mole/cmd.version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI application to create SSH tunnels";
|
||||
homepage = "https://github.com/davrodpin/mole";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -3,32 +3,18 @@
|
||||
, iptables, bash }:
|
||||
|
||||
let
|
||||
sshuttle-telepresence =
|
||||
let
|
||||
sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
|
||||
in
|
||||
lib.overrideDerivation sshuttle (p: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "datawire";
|
||||
repo = "sshuttle";
|
||||
rev = sshuttleTelepresenceRev;
|
||||
sha256 = "1lp5b0h9v59igf8wybjn42w6ajw08blhiqmjwp4r7qnvmvmyaxhh";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION="${sshuttleTelepresenceRev}";
|
||||
|
||||
postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
|
||||
postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
|
||||
});
|
||||
sshuttle-telepresence = lib.overrideDerivation sshuttle (p: {
|
||||
postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
|
||||
});
|
||||
in pythonPackages.buildPythonPackage rec {
|
||||
pname = "telepresence";
|
||||
version = "0.108";
|
||||
version = "0.109";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telepresenceio";
|
||||
repo = "telepresence";
|
||||
rev = version;
|
||||
sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g=";
|
||||
sha256 = "1ccc8bzcdxp6rh6llk7grcnmyc05fq7dz5w0mifdzjv3a473hsky";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ytcc";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woefe";
|
||||
repo = "ytcc";
|
||||
rev = "v${version}";
|
||||
sha256 = "00fx1zlfz4gj46ahgvawc21rx6s49qrzd8am3p2yzmc12ibfqyhv";
|
||||
sha256 = "013dhw7kn1s3r6w7kfvhqh0l74kgijfni47l71p7wicg3hzhm3mr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, lib, fetchFromGitHub }:
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-gUjFFxzkHHhNMDAgFmmIAuEACSCn1YXuauvjGAkrK6k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp --recursive ./* $out/bin
|
||||
cp ./.searchsploit_rc $out/bin
|
||||
mkdir -p $out/bin $out/share
|
||||
cp --recursive . $out/share/exploitdb
|
||||
makeWrapper $out/share/exploitdb/searchsploit $out/bin/searchsploit
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vaultwarden-vault";
|
||||
version = "2.21.1";
|
||||
version = "2.22.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
|
||||
sha256 = "sha256-hKHOnQiVq2uSqJmhTWPJXaz2F6GO9/bMy7G9BkZ2puI=";
|
||||
sha256 = "sha256-cPyh6Hyvqw6ygmOP+qiyhSNAwdryC4nowm8n2ULOJxs=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -5,7 +5,7 @@ with skawarePackages;
|
||||
buildPackage {
|
||||
pname = "s6-rc";
|
||||
version = "0.5.2.3";
|
||||
sha256 = "1f92dxw1n8r8avamixi9k0gqbnkpm0r3fmwzz7jd82g6bb2vsg5z";
|
||||
sha256 = "1xyaplwzvqnb53mg59a7jklakzwsiqivp6qggsry3sbaw4hf3d5j";
|
||||
|
||||
description = "A service manager for s6-based systems";
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@ -1289,6 +1289,8 @@ with pkgs;
|
||||
|
||||
autospotting = callPackage ../applications/misc/autospotting { };
|
||||
|
||||
autosuspend = callPackage ../os-specific/linux/autosuspend { };
|
||||
|
||||
avfs = callPackage ../tools/filesystems/avfs { };
|
||||
|
||||
aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {};
|
||||
@ -6117,7 +6119,9 @@ with pkgs;
|
||||
|
||||
httping = callPackage ../tools/networking/httping {};
|
||||
|
||||
httplz = callPackage ../tools/networking/httplz { };
|
||||
httplz = callPackage ../tools/networking/httplz {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
httpfs2 = callPackage ../tools/filesystems/httpfs { };
|
||||
|
||||
@ -7419,6 +7423,8 @@ with pkgs;
|
||||
docbook-xsl = docbook_xsl;
|
||||
};
|
||||
|
||||
mole = callPackage ../tools/networking/mole { };
|
||||
|
||||
mosh = callPackage ../tools/networking/mosh { };
|
||||
|
||||
mpage = callPackage ../tools/text/mpage { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user