cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-10-31 00:02:05 +00:00 committed by GitHub
commit fdcee2eb3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 430 additions and 261 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
pkgs/applications/misc/hunter/default.nix
View file

@ -1,77 +0,0 @@
{ lib, stdenv, pkg-config, rustPlatform, fetchFromGitHub, fetchpatch
, makeWrapper, glib, gst_all_1, CoreServices, IOKit, Security }:
rustPlatform.buildRustPackage rec {
pname = "hunter";
version = "2020-05-25-unstable";
src = fetchFromGitHub {
owner = "rabite0";
repo = "hunter";
rev = "355d9a3101f6d8dc375807de79e368602f1cb87d";
sha256 = "sha256-R2wNkG8bFP7X2pdlebHK6GD15qmD/zD3L0MwVthvzzQ=";
};
patches = [
(fetchpatch {
name = "remove-dependencies-on-rust-nightly";
url = "https://github.com/06kellyjac/hunter/commit/a5943578e1ee679c8bc51b0e686c6dddcf74da2a.diff";
sha256 = "sha256-eOwBFfW5m8tPnu+whWY/53X9CaqiVj2WRr25G+Yy7qE=";
})
(fetchpatch {
name = "fix-accessing-core-when-moved-with-another-clone";
url = "https://github.com/06kellyjac/hunter/commit/2e95cc567c751263f8c318399f3c5bb01d36962a.diff";
sha256 = "sha256-yTzIXUw5qEaR2QZHwydg0abyZVXfK6fhJLVHBI7EAro=";
})
(fetchpatch {
name = "fix-resolve-breaking-changes-from-package-updates";
url = "https://github.com/06kellyjac/hunter/commit/2484f0db580bed1972fd5000e1e949a4082d2f01.diff";
sha256 = "sha256-K+WUxEr1eE68XejStj/JwQpMHlhkiOw6PmiSr1GO0kc=";
})
];
cargoPatches = [
(fetchpatch {
name = "chore-cargo-update";
url = "https://github.com/06kellyjac/hunter/commit/b0be49a82191a4420b6900737901a71140433efd.diff";
sha256 = "sha256-ctxoDwyIJgEhMbMUfrjCTy2SeMUQqMi971szrqEOJeg=";
})
(fetchpatch {
name = "chore-cargo-upgrade-+-cargo-update";
url = "https://github.com/06kellyjac/hunter/commit/1b8de9248312878358afaf1dac569ebbccc4321a.diff";
sha256 = "sha256-+4DZ8SaKwKNmr2SEgJJ7KZBIctnYFMQFKgG+yCkbUv0=";
})
];
RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [
glib
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gst-plugins-bad
]) ++ lib.optionals stdenv.isDarwin [ CoreServices IOKit Security ];
cargoBuildFlags = [ "--no-default-features" "--features=img,video" ];
postInstall = ''
wrapProgram $out/bin/hunter --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
cargoSha256 = "sha256-Bd/gilebxC4H+/1A41OSSfWBlHcSczsFcU2b+USnI74=";
meta = with lib; {
description = "The fastest file manager in the galaxy!";
homepage = "https://github.com/rabite0/hunter";
license = licenses.wtfpl;
maintainers = with maintainers; [ fufexan ];
# error[E0308]: mismatched types
# --> src/files.rs:502:62
# expected raw pointer `*const u8`, found raw pointer `*const i8`
broken = stdenv.isAarch64;
};
}

6
pkgs/applications/networking/cluster/terraform-docs/default.nix
View file

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terraform-docs";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PzGlEEhootf2SCOy7+11aST7NMTNhNMQWeZO40mrMYQ=";
sha256 = "sha256-zSSK2WfcbD1DvqsFUKdTydLfyApWzm1h+ihSnLUmq2E=";
};
vendorSha256 = "sha256-T/jgFPBUQMATX7DoWsDR/VFjka7Vxk7F4taE25cdnTk=";
vendorSha256 = "sha256-0Bkjx/gq2MAWjxoMSGtBcRzv40SSUVDZBh4PzEtKj5o=";
subPackages = [ "." ];

6
pkgs/applications/version-management/git-and-tools/delta/default.nix
View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "sha256-LyKkkQlYdCyvlru+o/QeA7CDWYgCRTFKAdAjJxJX+oM=";
sha256 = "sha256-DJG8C7oSTf4YKeSVytN4pVF4qVImg1bsTYbnfkR+U94=";
};
cargoSha256 = "sha256-+ao2nVRkXNWs00oUiATgzsDTfPo09BV66AioZQqBhGk=";
cargoSha256 = "sha256-mweH+ZIcNGGmoGUhnmZzaB5y14eO/XkHqrL8Nz/b3Jg=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
View file

@ -2,6 +2,8 @@
, rustPlatform
, fetchFromGitHub
, withOpenCL ? true
, stdenv
, OpenCL
, ocl-icd
}:
@ -18,7 +20,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY=";
buildInputs = lib.optional withOpenCL [ ocl-icd ];
buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd);
cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features";

15
pkgs/desktops/arcan/arcan/000-openal.patch Normal file
View file

@ -0,0 +1,15 @@
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
@@ -362,10 +360,8 @@
if (EXISTS ${EXTERNAL_SRC_DIR}/git/openal AND STATIC_OPENAL)
amsg("${CL_YEL}Building OpenAL static from external/git mirror${CL_RST}")
ExternalProject_Add(OpenAL
- SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/openal
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/openal"
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/openal_static
- UPDATE_COMMAND ""
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/openal"
${EXTERNAL_DEFS}
${CMAKE_EXTERNAL_DEFS}
-DALSOFT_BACKEND_DSOUND=OFF

17
pkgs/desktops/arcan/arcan/001-luajit.patch Normal file
View file

@ -0,0 +1,17 @@
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
@@ -419,12 +415,7 @@
set(LUA_TAG "luajit51")
if (EXISTS ${EXTERNAL_SRC_DIR}/git/luajit)
ExternalProject_Add(luajit
- SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/luajit
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/luajit"
- CONFIGURE_COMMAND ""
- GIT_TAG "v2.1.0-beta3"
- UPDATE_COMMAND ""
- INSTALL_COMMAND ""
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/luajit"
BUILD_IN_SOURCE 1
BUILD_COMMAND "${EXTMAKE_CMD}"
DEFAULT_CC=${CMAKE_C_COMPILER}

15
pkgs/desktops/arcan/arcan/002-libuvc.patch Normal file
View file

@ -0,0 +1,15 @@
diff -Naur source-old/src/frameserver/decode/default/CMakeLists.txt source-new/src/frameserver/decode/default/CMakeLists.txt
--- source-old/src/frameserver/decode/default/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
+++ source-new/src/frameserver/decode/default/CMakeLists.txt 2021-10-29 12:01:31.989933725 -0300
@@ -62,10 +62,8 @@
if (STATIC_LIBUVC)
pkg_check_modules(LIBUSB_1 REQUIRED libusb-1.0)
ExternalProject_Add(libuvc
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/frameserver/decode/libuvc"
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/libuvc"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/libuvc_static"
- UPDATE_COMMAND ""
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/libuvc"
${EXTERNAL_DEFS}
${CMAKE_EXTERNAL_DEFS}
-DBUILD_UVC_STATIC=ON

14
pkgs/desktops/arcan/arcan/003-freetype.patch Normal file
View file

@ -0,0 +1,14 @@
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
@@ -317,9 +317,7 @@
find_package(BZip2 REQUIRED QUIET)
pkg_check_modules(HARFBUZZ REQUIRED QUIET harfbuzz)
ExternalProject_Add(Freetype
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/freetype"
- UPDATE_COMMAND ""
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/freetype"
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/freetype"
${EXTERNAL_DEFS}
${CMAKE_EXTERNAL_DEFS}
-DWITH_ZLIB=OFF

25
pkgs/desktops/arcan/arcan/clone-sources.nix Normal file
View file

@ -0,0 +1,25 @@
{ fetchgit, fetchFromGitHub }:
{
letoram-openal-src = fetchFromGitHub {
owner = "letoram";
repo = "openal";
rev = "1c7302c580964fee9ee9e1d89ff56d24f934bdef";
hash = "sha256-InqU59J0zvwJ20a7KU54xTM7d76VoOlFbtj7KbFlnTU=";
};
freetype-src = fetchgit {
url = "git://git.sv.nongnu.org/freetype/freetype2.git";
rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57";
sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg=";
};
libuvc-src = fetchgit {
owner = "libuvc";
repo = "libuvc";
rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837";
sha256 = "sha256-2zCTjyodRARkHM/Q0r4bdEH9LO1Z9xPCnY2xE4KZddA=";
};
luajit-src = fetchgit {
url = "https://luajit.org/git/luajit-2.0.git";
rev = "d3294fa63b344173db68dd612c6d3801631e28d4";
sha256 = "sha256-1iHBXcbYhWN4M8g5oH09S1j1WrjYzI6qcRbHsdfpRkk=";
};
}

98
pkgs/desktops/arcan/arcan/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchgit
, SDL2
, cmake
, espeak
@ -23,6 +24,7 @@
, libvncserver
, libxcb
, libxkbcommon
, lua
, luajit
, makeWrapper
, mesa
@ -36,22 +38,16 @@
, xcbutil
, xcbutilwm
, xz
, buildManpages ? true, ruby
, buildManPages ? true, ruby
, useBuiltinLua ? true
, useStaticFreetype ? false
, useStaticLibuvc ? false
, useStaticOpenAL ? true
, useStaticSqlite ? false
}:
let
# TODO: investigate vendoring, especially OpenAL
# WARN: vendoring of OpenAL is required for running arcan_lwa
# INFO: maybe it needs leaveDotGit, but it is dangerous/impure
letoram-openal-src = fetchFromGitHub {
owner = "letoram";
repo = "openal";
rev = "1c7302c580964fee9ee9e1d89ff56d24f934bdef";
hash = "sha256-InqU59J0zvwJ20a7KU54xTM7d76VoOlFbtj7KbFlnTU=";
};
in
stdenv.mkDerivation rec {
pname = "arcan";
pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
version = "0.6.1pre1+unstable=2021-10-16";
src = fetchFromGitHub {
@ -61,28 +57,11 @@ stdenv.mkDerivation rec {
hash = "sha256-4FodFuO51ehvyjH4YaF/xBY9dwA6cP/e6/BvEsH4w7U=";
};
postUnpack = ''
pushd .
cd $sourceRoot/external/git/
cp -a ${letoram-openal-src}/ openal/
chmod --recursive 744 openal/
popd
'';
# TODO: work with upstream in order to get rid of these hardcoded paths
postPatch = ''
substituteInPlace ./src/platform/posix/paths.c \
--replace "/usr/bin" "$out/bin" \
--replace "/usr/share" "$out/share"
substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID"
'';
nativeBuildInputs = [
cmake
makeWrapper
pkg-config
] ++ lib.optionals buildManpages [
] ++ lib.optionals buildManPages [
ruby
];
@ -108,6 +87,7 @@ stdenv.mkDerivation rec {
libvncserver
libxcb
libxkbcommon
lua
luajit
mesa
openal
@ -121,11 +101,54 @@ stdenv.mkDerivation rec {
xz
];
patches = [
# Nixpkgs-specific: redirect vendoring
./000-openal.patch
./001-luajit.patch
./002-libuvc.patch
./003-freetype.patch
];
# Emulate external/git/clone.sh
postUnpack = let
inherit (import ./clone-sources.nix { inherit fetchFromGitHub fetchgit; })
letoram-openal-src freetype-src libuvc-src luajit-src;
in
''
pushd $sourceRoot/external/git/
''
+ (lib.optionalString useStaticOpenAL ''
cp -a ${letoram-openal-src}/ openal
chmod --recursive 744 openal
'')
+ (lib.optionalString useStaticFreetype ''
cp -a ${freetype-src}/ freetype
chmod --recursive 744 freetype
'')
+ (lib.optionalString useStaticLibuvc ''
cp -a ${libuvc-src}/ libuvc
chmod --recursive 744 libuvc
'')
+ (lib.optionalString useBuiltinLua ''
cp -a ${luajit-src}/ luajit
chmod --recursive 744 luajit
'') +
''
popd
'';
postPatch = ''
substituteInPlace ./src/platform/posix/paths.c \
--replace "/usr/bin" "$out/bin" \
--replace "/usr/share" "$out/share"
substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID"
'';
# INFO: According to the source code, the manpages need to be generated before
# the configure phase
preConfigure = lib.optionalString buildManpages ''
pushd .
cd doc
preConfigure = lib.optionalString buildManPages ''
pushd doc
ruby docgen.rb mangen
popd
'';
@ -136,7 +159,12 @@ stdenv.mkDerivation rec {
"-DDISTR_TAG=Nixpkgs"
"-DENGINE_BUILDTAG=${version}"
"-DHYBRID_SDL=on"
"-DSTATIC_OPENAL=off"
"-DBUILTIN_LUA=${if useBuiltinLua then "on" else "off"}"
"-DDISABLE_JIT=${if useBuiltinLua then "on" else "off"}"
"-DSTATIC_FREETYPE=${if useStaticFreetype then "on" else "off"}"
"-DSTATIC_LIBUVC=${if useStaticLibuvc then "on" else "off"}"
"-DSTATIC_OPENAL=${if useStaticOpenAL then "on" else "off"}"
"-DSTATIC_SQLite3=${if useStaticSqlite then "on" else "off"}"
"../src"
];

4
pkgs/desktops/gnome/misc/gpaste/default.nix
View file

@ -17,14 +17,14 @@
}:
stdenv.mkDerivation rec {
version = "3.42.0";
version = "3.42.1";
pname = "gpaste";
src = fetchFromGitHub {
owner = "Keruspe";
repo = "GPaste";
rev = "v${version}";
sha256 = "sha256-YsAA487Q2BwDh4V2TPN/YwAFCw+F11OKMjatcNR98/c=";
sha256 = "sha256-yoJ/k9cXXF5ELKF0JXGtxsUjfQ/S1sccLRQOQG7YMXo=";
};
patches = [

10
pkgs/development/coq-modules/hierarchy-builder/default.nix
View file

@ -1,6 +1,6 @@
{ lib, mkCoqDerivation, which, coq, coq-elpi, version ? null }:
with lib; mkCoqDerivation {
with lib; let hb = mkCoqDerivation {
pname = "hierarchy-builder";
owner = "math-comp";
inherit version;
@ -21,8 +21,6 @@ with lib; mkCoqDerivation {
mlPlugin = true;
buildPhase = "make build";
installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ];
extraInstallFlags = [ "VFILES=structures.v" ];
@ -31,4 +29,8 @@ with lib; mkCoqDerivation {
maintainers = with maintainers; [ cohencyril siraben ];
license = licenses.mit;
};
}
}; in
hb.overrideAttrs (o:
optionalAttrs (versions.isGe "1.2.0" o.version || o.version == "dev")
{ buildPhase = "make build"; }
)

6
pkgs/development/libraries/qtutilities/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "qtutilities";
version = "6.5.0";
version = "6.5.1";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+W5EdnB0QbI22iDWRyj+ntp/l/Kc6VHca2LwmHA7pgA=";
sha256 = "sha256-J5yPezXU+AIvmLTBs4lWU35DvfP+0EuuhOJpxAzwRtw=";
};
buildInputs = [ qtbase cpp-utilities ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/Martchus/qtutilities";
description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities";
description = "Common Qt related C++ classes and routines used by @Martchus' applications such as dialogs, widgets and models Topics";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.linux;

7
pkgs/development/ocaml-modules/awa/default.nix
View file

@ -8,21 +8,21 @@
buildDunePackage rec {
pname = "awa";
version = "0.0.3";
version = "0.0.4";
minimumOCamlVersion = "4.07";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-v${version}.tbz";
sha256 = "5a7927363ffe672cccf12d5425386e84f6f553a17ffec2b01ae5dc28180c831a";
sha256 = "1l7nsd8jifxjq78xyzcc0z9igc02m2qlvv4cxzsgdim6n1jfzxj2";
};
nativeBuildInputs = [ ppx_sexp_conv ppx_cstruct ];
propagatedBuildInputs = [
mirage-crypto mirage-crypto-rng mirage-crypto-pk x509
cstruct cstruct-sexp sexplib rresult mtime
cstruct cstruct-sexp sexplib mtime
logs base64 hacl_x25519 zarith
];
@ -33,6 +33,7 @@ buildDunePackage rec {
description = "SSH implementation in OCaml";
license = licenses.isc;
homepage = "https://github.com/mirage/awa-ssh";
changelog = "https://github.com/mirage/awa-ssh/raw/v${version}/CHANGES.md";
maintainers = [ maintainers.sternenseemann ];
};
}

4
pkgs/development/python-modules/adafruit-platformdetect/default.nix
View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.16.1";
version = "3.17.1";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
sha256 = "sha256-09EzoV+212Nj3abhfS82tRE+KDJQT/tujUtmuo2h2Wk=";
sha256 = "sha256-M+0q1u/ZcAg2Pii/B2n0v+rw/zIAjeVej/VThi9NLwI=";
};
nativeBuildInputs = [ setuptools-scm ];

4
pkgs/development/python-modules/asn1/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "asn1";
version = "2.4.1";
version = "2.4.2";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "andrivet";
repo = "python-asn1";
rev = "v${version}";
sha256 = "0g2d5cr1pxsm5ackba7padf7gvlgrgv807kh0312s5axjd2cww2l";
sha256 = "sha256-fx/kWOnh5Gk1DjeX0xiCJYnd5teD18RvKyOnawcfWWA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/casbin/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "1.9.3";
version = "1.9.4";
disabled = isPy27;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
sha256 = "sha256-PN31/1BpXcNqsqBZ8sS/MM3UL47/Bi24bUh+jGOJevk=";
sha256 = "1d8wxj2hi68yr303v4h5wh4q7iv8gb2qm1q054vnf0kgczxnl732";
};
propagatedBuildInputs = [

13
pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
View file

@ -2,16 +2,16 @@
, acme
, certbot
, cloudflare
, isPy3k
, pytest
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
inherit (certbot) src version;
pname = "certbot-dns-cloudflare";
inherit (certbot) src version;
disabled = pythonOlder "3.6";
propagatedBuildInputs = [
acme
certbot
@ -19,15 +19,12 @@ buildPythonPackage rec {
];
checkInputs = [
pytest
pytestCheckHook
];
disabled = !isPy3k;
pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
sourceRoot = "source/${pname}";
sourceRoot = "source/certbot-dns-cloudflare";
meta = certbot.meta // {
description = "Cloudflare DNS Authenticator plugin for Certbot";

35
pkgs/development/python-modules/certbot-dns-google/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ buildPythonPackage
, acme
, certbot
, google-api-python-client
, isPy3k
, oauth2client
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "certbot-dns-google";
inherit (certbot) src version;
disabled = pythonOlder "3.6";
propagatedBuildInputs = [
acme
certbot
google-api-python-client
oauth2client
];
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
sourceRoot = "source/certbot-dns-google";
meta = certbot.meta // {
description = "Google Cloud DNS Authenticator plugin for Certbot";
};
}

12
pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
View file

@ -3,15 +3,16 @@
, certbot
, dnspython
, isPy3k
, pytest
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
inherit (certbot) src version;
pname = "certbot-dns-rfc2136";
inherit (certbot) src version;
disabled = pythonOlder "3.6";
propagatedBuildInputs = [
acme
certbot
@ -19,15 +20,12 @@ buildPythonPackage rec {
];
checkInputs = [
pytest
pytestCheckHook
];
disabled = !isPy3k;
pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
sourceRoot = "source/${pname}";
sourceRoot = "source/certbot-dns-rfc2136";
meta = certbot.meta // {
description = "RFC 2136 DNS Authenticator plugin for Certbot";

12
pkgs/development/python-modules/certbot-dns-route53/default.nix
View file

@ -3,15 +3,16 @@
, boto3
, certbot
, isPy3k
, pytest
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
inherit (certbot) src version;
pname = "certbot-dns-route53";
inherit (certbot) src version;
disabled = pythonOlder "3.6";
propagatedBuildInputs = [
acme
boto3
@ -19,15 +20,12 @@ buildPythonPackage rec {
];
checkInputs = [
pytest
pytestCheckHook
];
disabled = !isPy3k;
pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
sourceRoot = "source/${pname}";
sourceRoot = "source/certbot-dns-route53";
meta = certbot.meta // {
description = "Route53 DNS Authenticator plugin for Certbot";

4
pkgs/development/python-modules/dulwich/default.nix
View file

@ -15,12 +15,12 @@
}:
buildPythonPackage rec {
version = "0.20.25";
version = "0.20.26";
pname = "dulwich";
src = fetchPypi {
inherit pname version;
sha256 = "79baea81583eb61eb7bd4a819ab6096686b362c626a4640d84d4fc5539139353";
sha256 = "sha256-OKpQ+FnI6lMHGgScPx1cxU99xgpBNqGrYxdWp59lgrU=";
};
LC_ALL = "en_US.UTF-8";

9
pkgs/development/python-modules/herepy/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "herepy";
version = "3.5.5";
version = "3.5.6";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -18,14 +18,9 @@ buildPythonPackage rec {
owner = "abdullahselek";
repo = "HerePy";
rev = version;
sha256 = "sha256-nZ+91i+IBdRDN1TsDwmk9pNceFvcV6C155Ds1MQc9z4=";
sha256 = "sha256-I5u5PKB29jQNFdsx+y5ZJOE837D7Hpcsf3pwlCvmEqU=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "requests==2.25.1" "requests>=2.25.1"
'';
propagatedBuildInputs = [
requests
];

4
pkgs/development/python-modules/msal/default.nix
View file

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msal";
version = "1.15.0";
version = "1.16.0";
src = fetchPypi {
inherit pname version;
sha256 = "00d3cc77c3bcd8e2accaf178aa58a1d036918faa9c0f3039772cc16a470bdacc";
sha256 = "240fb04dba46a27fd6a3178db8334412d0d02e0be85166f9e05bb45d03399084";
};
propagatedBuildInputs = [

25
pkgs/development/python-modules/pycangjie/default.nix
View file

@ -1,19 +1,32 @@
{ lib, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie
, sqlite, buildPythonPackage, cython
{ lib
, fetchFromGitHub
, bash
, autoconf
, automake
, libtool
, pkg-config
, libcangjie
, sqlite
, buildPythonPackage
, cython
}:
let
rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";
in buildPythonPackage {
in
buildPythonPackage {
pname = "pycangjie";
version = "1.3_rev_${rev}";
format = "other";
src = fetchurl {
url = "https://github.com/Cangjians/pycangjie/archive/${rev}.tar.gz";
sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05";
src = fetchFromGitHub {
owner = "Cangjians";
repo = "pycangjie";
inherit rev;
sha256 = "sha256-sS0Demzm89WtEIN4Efz0OTsUQ/c3gIX+/koekQGOca4=";
};
nativeBuildInputs = [ pkg-config libtool autoconf automake cython ];
buildInputs = [ libcangjie sqlite ];

11
pkgs/development/python-modules/pyside/default.nix
View file

@ -1,14 +1,15 @@
{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa, libGL }:
{ lib, fetchFromGitHub, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa, libGL }:
# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
buildPythonPackage rec {
pname = "pyside";
version = "1.2.4";
format = "other";
src = fetchurl {
url = "https://github.com/PySide/PySide/archive/${version}.tar.gz";
sha256 = "90f2d736e2192ac69e5a2ac798fce2b5f7bf179269daa2ec262986d488c3b0f7";
src = fetchFromGitHub {
owner = "PySide";
repo = "PySide";
rev = version;
sha256 = "sha256-14XbihJRMk9WaeK6NUBV/4OMFZF8EBIJgEJEaCU8Ecg=";
};
outputs = [ "out" "dev" ];

19
pkgs/development/python-modules/pyspotify/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv
{ lib
, stdenv
, buildPythonPackage
, fetchurl
, fetchFromGitHub
, cffi
, pkgs
}:
@ -9,9 +10,11 @@ buildPythonPackage rec {
pname = "pyspotify";
version = "2.1.3";
src = fetchurl {
url = "https://github.com/mopidy/pyspotify/archive/v${version}.tar.gz";
sha256 = "1y1zqkqi9jz5m9bb2z7wmax7g40c1snm3c6di6b63726qrf26rb7";
src = fetchFromGitHub {
owner = "mopidy";
repo = "pyspotify";
rev = "v${version}";
sha256 = "sha256-CjIRwSlR5HPOJ9tp7lrdcDPiKH3p/PxvEJ8sqVD5s3Q=";
};
propagatedBuildInputs = [ cffi ];
@ -34,11 +37,11 @@ buildPythonPackage rec {
doCheck = false;
meta = with lib; {
homepage = "http://pyspotify.mopidy.com";
homepage = "http://pyspotify.mopidy.com";
description = "A Python interface to Spotify’s online music streaming service";
license = licenses.unfree;
license = licenses.unfree;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
platforms = platforms.unix;
};
}

12
pkgs/development/python-modules/sfepy/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchurl
, fetchFromGitHub
, numpy
, scipy
, matplotlib
@ -17,13 +17,15 @@
}:
buildPythonPackage rec {
name = "sfepy";
pname = "sfepy";
version = "2021.2";
disabled = pythonOlder "3.8";
src = fetchurl {
url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz";
sha256 = "1vnynxzbspj900wjyy6020l71jdv2l1wkyax7nhi6w5wvav4kfwz";
src = fetchFromGitHub {
owner = "sfepy";
repo = "sfepy";
rev = "release_${version}";
sha256 = "sha256-zFtm4KrpqjYfxVHcMrTU4tMyHYnD9VPEvuId2lR1MHU=";
};
propagatedBuildInputs = [

10
pkgs/development/python-modules/upass/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchurl
, fetchFromGitHub
, pyperclip
, urwid
}:
@ -9,9 +9,11 @@ buildPythonPackage rec {
version = "0.1.4";
pname = "upass";
src = fetchurl {
url = "https://github.com/Kwpolska/upass/archive/v${version}.tar.gz";
sha256 = "0f2lyi7xhvb60pvzx82dpc13ksdj5k92ww09czclkdz8k0dxa7hb";
src = fetchFromGitHub {
owner = "Kwpolska";
repo = "upass";
rev = "v${version}";
sha256 = "sha256-1y/OE8Gbc8bShEiLWg8w4J6icAcoldYQLI10WSQuO1Y=";
};
propagatedBuildInputs = [ pyperclip urwid ];

10
pkgs/development/python-modules/usbtmc/default.nix
View file

@ -1,12 +1,14 @@
{ lib, fetchurl, buildPythonPackage, pyusb }:
{ lib, fetchFromGitHub, buildPythonPackage, pyusb }:
buildPythonPackage rec {
pname = "usbtmc";
version = "0.8";
src = fetchurl {
url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";
sha256 = "14f4j77ljr45crnjwlp1dqbxwa45s20y2fpq5rg59r60w15al4yw";
src = fetchFromGitHub {
owner = "python-ivi";
repo = "python-usbtmc";
rev = "v${version}";
sha256 = "sha256-69kqBTqnVqdWC2mqlXylzb9VkdhwTGZI0Ykf6lqbypI=";
};
propagatedBuildInputs = [ pyusb ];

12
pkgs/development/tools/build-managers/rebar/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, erlang }:
{ lib, stdenv, fetchFromGitHub, erlang }:
stdenv.mkDerivation rec {
pname = "rebar";
version = "2.6.4";
src = fetchurl {
url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
sha256 = "01xxq1f1vrwca00pky2van26hi2hhr05ghfhy71v5cifzax4cwjp";
src = fetchFromGitHub {
owner = "rebar";
repo = "rebar";
rev = version;
sha256 = "sha256-okvG7X2uHtZ1p+HUoFOmslrWvYjk0QWBAvAMAW2E40c=";
};
buildInputs = [ erlang ];
@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
work. rebar also provides dependency management, enabling
application writers to easily re-use common libraries from a
variety of locations (git, hg, etc).
'';
'';
platforms = lib.platforms.unix;
license = lib.licenses.asl20;

85
pkgs/development/tools/haskell/vaultenv/default.nix
View file

@ -1,15 +1,39 @@
{ mkDerivation, async, base, bytestring, connection, containers
, directory, hpack, hspec, hspec-discover, hspec-expectations
, http-client, http-conduit, lens, lens-aeson, megaparsec, mtl
, optparse-applicative, parser-combinators, retry, lib, text
, unix, unordered-containers, utf8-string, fetchzip, dotenv
{ mkDerivation
, async
, base
, bytestring
, connection
, containers
, directory
, hpack
, hspec
, hspec-discover
, hspec-expectations
, http-client
, http-conduit
, lens
, lens-aeson
, megaparsec
, mtl
, optparse-applicative
, parser-combinators
, retry
, lib
, text
, unix
, unordered-containers
, utf8-string
, fetchFromGitHub
, dotenv
}:
mkDerivation rec {
pname = "vaultenv";
version = "0.13.3";
src = fetchzip {
url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz";
src = fetchFromGitHub {
owner = "channable";
repo = "vaultenv";
rev = "v${version}";
sha256 = "sha256-17tdlqG8z4GviI7kkLbktC6SqnQFDdZhWtejscG0n48=";
};
@ -23,16 +47,49 @@ mkDerivation rec {
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
async base bytestring connection containers http-client
http-conduit lens lens-aeson megaparsec mtl optparse-applicative
parser-combinators retry text unix unordered-containers utf8-string
async
base
bytestring
connection
containers
http-client
http-conduit
lens
lens-aeson
megaparsec
mtl
optparse-applicative
parser-combinators
retry
text
unix
unordered-containers
utf8-string
dotenv
];
testHaskellDepends = [
async base bytestring connection containers directory hspec
hspec-discover hspec-expectations http-client http-conduit lens
lens-aeson megaparsec mtl optparse-applicative parser-combinators
retry text unix unordered-containers utf8-string
async
base
bytestring
connection
containers
directory
hspec
hspec-discover
hspec-expectations
http-client
http-conduit
lens
lens-aeson
megaparsec
mtl
optparse-applicative
parser-combinators
retry
text
unix
unordered-containers
utf8-string
];
preConfigure = "hpack";
homepage = "https://github.com/channable/vaultenv#readme";

12
pkgs/development/tools/ocaml/obuild/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchzip, ocaml }:
{ lib, stdenv, fetchFromGitHub, ocaml }:
stdenv.mkDerivation rec {
pname = "obuild";
version = "0.1.10";
src = fetchzip {
url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz";
sha256 = "15arsgbhk1c39vd8qhpa3pag94m44bwvzggdvkibx6hnpkv8z9bn";
src = fetchFromGitHub {
owner = "ocaml-obuild";
repo = "obuild";
rev = "obuild-v${version}";
sha256 = "sha256-dqWP9rwWmr7i3O29v/kipJL01B3qQozaToOFCdfTWZU=";
};
buildInputs = [ ocaml ];
@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/ocaml-obuild/obuild";
platforms = ocaml.meta.platforms or [];
platforms = ocaml.meta.platforms or [ ];
description = "Simple package build system for OCaml";
license = lib.licenses.lgpl21;
maintainers = with lib.maintainers; [ volth ];

10
pkgs/development/tools/ocaml/ocaml-top/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchzip, ncurses, ocamlPackages }:
{ lib, fetchFromGitHub, ncurses, ocamlPackages }:
with ocamlPackages; buildDunePackage rec {
pname = "ocaml-top";
@ -6,9 +6,11 @@ with ocamlPackages; buildDunePackage rec {
useDune2 = true;
src = fetchzip {
url = "https://github.com/OCamlPro/ocaml-top/archive/${version}.tar.gz";
sha256 = "1r290m9vvr25lgaanivz05h0kf4fd3h5j61wj4hpp669zffcyyb5";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocaml-top";
rev = "1.2.0-rc";
sha256 = "sha256-ZXnPnPvJmHshkTwYWeBojrgJYAF/R6vUo0XkvVMFSeQ=";
};
buildInputs = [ ncurses ocp-build lablgtk3-sourceview3 ocp-index ];

10
pkgs/development/tools/ocaml/ocp-indent/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchzip, buildDunePackage, cmdliner }:
{ lib, fetchFromGitHub, buildDunePackage, cmdliner }:
buildDunePackage rec {
version = "1.8.2";
@ -6,9 +6,11 @@ buildDunePackage rec {
useDune2 = true;
src = fetchzip {
url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz";
sha256 = "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-indent";
rev = version;
sha256 = "sha256-IyvURw/6R0eKrnahV1fqLV0iIeypykrmxDbliECgbLc=";
};
minimumOCamlVersion = "4.02";

11
pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
View file

@ -1,7 +1,6 @@
{ lib, stdenv, fetchzip, ocamlPackages }:
{ lib, stdenv, fetchFromGitHub, ocamlPackages }:
stdenv.mkDerivation rec
{
stdenv.mkDerivation rec {
pname = "ocsigen-i18n";
version = "3.7.0";
@ -14,8 +13,10 @@ stdenv.mkDerivation rec
make bindir=$out/bin install
'';
src = fetchzip {
url = "https://github.com/besport/${pname}/archive/${version}.tar.gz";
src = fetchFromGitHub {
owner = "besport";
repo = "ocsigen-i18n";
rev = version;
sha256 = "sha256-PmdDyn+MUcNFrZpP/KLGQzdXUFRr+dYRAZjTZxHSeaw=";
};

3
pkgs/development/tools/udis86/default.nix
View file

@ -8,7 +8,6 @@ stdenv.mkDerivation rec {
owner = "vmt";
repo = "udis86";
rev = "v${version}";
url = "https://github.com/vmt/udis86/archive/v${version}.tar.gz";
sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1";
};
@ -27,6 +26,6 @@ stdenv.mkDerivation rec {
description = ''
Easy-to-use, minimalistic x86 disassembler library (libudis86)
'';
platforms = platforms.all ;
platforms = platforms.all;
};
}

20
pkgs/development/web/remarkjs/default.nix
View file

@ -1,12 +1,13 @@
{ stdenv, lib, fetchgit, fetchurl, nodejs, phantomjs2, pkgs }:
{ stdenv, lib, fetchFromGitHub, nodejs, phantomjs2, pkgs }:
with lib;
let
# highlight.js is a git submodule of remark
highlightjs = fetchgit {
url = "https://github.com/isagalaev/highlight.js";
highlightjs = fetchFromGitHub {
owner = "isagalaev";
repo = "highlight.js";
rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c";
sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0";
};
@ -16,14 +17,17 @@ let
inherit (stdenv.hostPlatform) system;
};
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "remarkjs";
version = "0.7.0";
src = fetchurl {
url = "https://github.com/gnab/remark/archive/v${version}.tar.gz";
sha256 = "1a2il6aa0g9cnig56ykmq8lr626pbxlsllk6js41h6gcn214rw60";
src = fetchFromGitHub {
owner = "gnab";
repo = "remark";
rev = "v${version}";
sha256 = "sha256-zhHuW4pBqXQEBlSxuyvHKh+ftyIdcqpYgIZZHArUtns=";
};
buildInputs = [ nodejs phantomjs2 ] ++ (with nodePackages; [
@ -62,7 +66,7 @@ in stdenv.mkDerivation rec {
meta = {
homepage = "https://remarkjs.com";
description = "A simple, in-browser, markdown-driven slideshow tool";
maintainers = [];
maintainers = [ ];
platforms = lib.platforms.linux;
license = lib.licenses.mit;
broken = true;

6
pkgs/os-specific/linux/kernel/linux-xanmod.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.14.14";
release = "2";
version = "5.14.15";
release = "1";
suffix = "xanmod${release}-cacule";
in
buildLinux (args // rec {
@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-zjFfxb/Q4fc7gE4+ZPErc2hoPXb1rGVftc9fy76BE/8=";
sha256 = "sha256-Z0A2D2t9rDUav4VpG3XdI13LConfWWs7PtsVfLyEQI8=";
};
structuredExtraConfig = with lib.kernel; {

4
pkgs/servers/piping-server-rust/default.nix
View file

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }:
rustPlatform.buildRustPackage rec {
pname = "piping-server-rust";
@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-SDAxXYX51/4S7zRTdNZK9uSjKHKrAXpDJgRRDyu6qug=";
buildInputs = lib.optional stdenv.isDarwin Security;
meta = with lib; {
description = "Infinitely transfer between every device over pure HTTP with pipes or browsers";
homepage = "https://github.com/nwtgck/piping-server-rust";

10
pkgs/tools/security/keyscope/default.nix
View file

@ -4,6 +4,9 @@
, pkg-config
, openssl
, stdenv
, DiskArbitration
, Foundation
, IOKit
, Security
}:
@ -22,7 +25,12 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
DiskArbitration
Foundation
IOKit
Security
];
# build script tries to get information from git
postPatch = ''

14
pkgs/top-level/all-packages.nix
View file

@ -6678,7 +6678,7 @@ with pkgs;
keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
keyscope = callPackage ../tools/security/keyscope {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security;
};
keystore-explorer = callPackage ../applications/misc/keystore-explorer {
@ -8512,7 +8512,9 @@ with pkgs;
pinnwand = callPackage ../servers/pinnwand { };
piping-server-rust = callPackage ../servers/piping-server-rust { };
piping-server-rust = callPackage ../servers/piping-server-rust {
inherit (darwin.apple_sdk.frameworks) Security;
};
pirate-get = callPackage ../tools/networking/pirate-get { };
@ -16794,10 +16796,6 @@ with pkgs;
hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; };
hunter = callPackage ../applications/misc/hunter {
inherit (darwin.apple_sdk.frameworks) CoreServices IOKit Security;
};
hwloc = callPackage ../development/libraries/hwloc {};
inherit (callPackage ../development/tools/misc/hydra { })
@ -26304,7 +26302,9 @@ with pkgs;
lscolors = callPackage ../applications/misc/lscolors { };
lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit { };
lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit {
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
luddite = with python3Packages; toPythonApplication luddite;

2
pkgs/top-level/python-packages.nix
View file

@ -1425,6 +1425,8 @@ in {
certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { };
certbot-dns-google = callPackage ../development/python-modules/certbot-dns-google { };
certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { };
certifi = callPackage ../development/python-modules/certifi { };