b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse source 
Conflicts:
	pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
This commit is contained in:
Jonathan Ringer 2021-12-23 10:14:19 -08:00
parent 7d1034b04d e2b2136d63
commit 5ed396a912
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0
37 changed files with 235 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/ISSUE_TEMPLATE/bug_report.md vendored
View file

@ -38,11 +38,3 @@ Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"
output here
```
Maintainer information:
```yaml
# a list of nixpkgs attributes affected by the problem
attribute:
# a list of nixos modules affected by the problem
module:
```

12
maintainers/maintainer-list.nix
View file

@ -6338,6 +6338,12 @@
githubId = 15692230;
name = "Muhammad Herdiansyah";
};
koozz = {
email = "koozz@linux.com";
github = "koozz";
githubId = 264372;
name = "Jan van den Berg";
};
koral = {
email = "koral@mailoo.org";
github = "k0ral";
@ -9423,6 +9429,12 @@
fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0";
}];
};
ppom = {
name = "Paco Pompeani";
email = "paco@ecomail.io";
github = "aopom";
githubId = 38916722;
};
pradeepchhetri = {
email = "pradeep.chhetri89@gmail.com";
github = "pradeepchhetri";

12
pkgs/applications/editors/sublime/4/packages.nix
View file

@ -5,15 +5,15 @@ let
in
{
sublime4 = common {
buildVersion = "4121";
x64sha256 = "CE/PeUV8Mg1Z2h8OWMhaemOVa95B1k2wHsht8lVPxeY=";
aarch64sha256 = "eveEW0Aq6pim0lnQ6BfISRaBgogeofgLmOVylSVojwg=";
buildVersion = "4126";
x64sha256 = "sha256-XGTlNMzgAy5U08cCjo1rO97yjz/SiiYkSjYKLOdUUKE=";
aarch64sha256 = "0gmnxyczj2wk9dilhkpa6gi2fkvbic6smyiimd3lq0s7ilbarm0a";
} {};
sublime4-dev = common {
buildVersion = "4112";
buildVersion = "4125";
dev = true;
x64sha256 = "1yy8wzcphsk3ji2sv2vjcw8ybn62yibzsv9snmm01gvkma16p9dl";
aarch64sha256 = "12bl235rxgw3q99yz9x4nfaryb32a2vzyam88by6p1s1zw2fxnp9";
x64sha256 = "sha256-+WvLkA7sltJadfm704rOECU4LNoVsv8rDmoAlO/M6Jo=";
aarch64sha256 = "11rbdy9rsn5b39qykbws4dqss89snrik7c2vdiw9cj0kibglsc3f";
} {};
}

8
pkgs/applications/networking/browsers/vivaldi/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
, alsa-lib, dbus, cups, libexif, ffmpeg, systemd
, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva
, freetype, fontconfig, libXft, libXrender, libxcb, expat
, libuuid
, libxml2
@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "4.3.2439.44-1";
version = "5.0.2497.32-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "1bsx8axs438f4p019mdq66pmpimf575r31rv6cibpgv85366xhh9";
sha256 = "1l333q002z9rr08np0r0j89j26shmsl8y2clyqwh54h22h7hmypz";
};
unpackPhase = ''
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd
atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd libva
freetype fontconfig libXrender libuuid expat glib nss nspr
libxml2 pango cairo gnome2.GConf
libdrm mesa

4
pkgs/applications/networking/instant-messengers/qtox/default.nix
View file

@ -28,13 +28,13 @@
mkDerivation rec {
pname = "qtox";
version = "1.17.3";
version = "1.17.4";
src = fetchFromGitHub {
owner = "qTox";
repo = "qTox";
rev = "v${version}";
sha256 = "19xgw9bqirxbgvj5cdh20qxh61pkwk838lq1l78n6py1qrs7z5wp";
sha256 = "sha256-j1aAry4wjb4RResdu8PQzyVazvVxnxvZMoC59sO0frw=";
};
buildInputs = [

4
pkgs/applications/radio/rtl_433/default.nix
View file

@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
version = "21.05";
version = "21.12";
pname = "rtl_433";
src = fetchFromGitHub {
owner = "merbanan";
repo = "rtl_433";
rev = version;
sha256 = "sha256-01mXOwLv16yTR65BboN+TFm2aE2EMfW1D5teDdW2wLg=";
sha256 = "sha256-KoDKyI7KDdGSe79ZTuL9ObKnOJsqTN4wrMq+/cvQ/Xk=";
};
nativeBuildInputs = [ pkg-config cmake ];

8
pkgs/applications/version-management/sublime-merge/default.nix
View file

@ -4,13 +4,13 @@ let
common = opts: callPackage (import ./common.nix opts);
in {
sublime-merge = common {
buildVersion = "2063";
sha256 = "0sdp0adrrjsz19blp1yb6yjc6kdrvdrpzr1j6wm49phhw9qg3awp";
buildVersion = "2068";
sha256 = "sha256-CseZQgjqr8B66Slf/yFZZsnRFc3zqCGKFAzSdMRQdNI=";
} {};
sublime-merge-dev = common {
buildVersion = "2062";
sha256 = "035f4gxbg9mb8p8yynpc6a1id9b8krfnr0gl98ib09bdh96ddan3";
buildVersion = "2067";
sha256 = "sha256-ViBBi9Ghh4dHg7Gmg4i/B+Q4OgDd4XiHNIs12qffZdg=";
dev = true;
} {};
}

4
pkgs/applications/video/jellyfin-mpv-shim/default.nix
View file

@ -13,11 +13,11 @@
buildPythonApplication rec {
pname = "jellyfin-mpv-shim";
version = "2.0.1";
version = "2.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NXDLqQzCUfDPoKNPrmIn5FMedMKYxtDhkawRE2lg/vI=";
sha256 = "yFFMsGbzMAKyXpD/vZelswYulTYe5WybjG5pD2RpLrk=";
};
propagatedBuildInputs = [

11
pkgs/applications/virtualization/podman-compose/default.nix
View file

@ -1,18 +1,17 @@
{ lib, buildPythonApplication, fetchFromGitHub, pyyaml }:
{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml }:
buildPythonApplication rec {
version = "0.1.8";
version = "1.0.3";
pname = "podman-compose";
# "This project is still under development." -- README.md
src = fetchFromGitHub {
repo = "podman-compose";
owner = "containers";
rev = version;
sha256 = "sha256-BN6rG46ejYY6UCNjKYQpxPQGTW3x12zpGDnH2SKn304=";
rev = "v${version}";
sha256 = "sha256-Si/O4dx9bqqRp/hTv3WbTXj46OM+PpyPBnQQWUqcZfs=";
};
propagatedBuildInputs = [ pyyaml ];
propagatedBuildInputs = [ pyyaml python-dotenv ];
meta = {
description = "An implementation of docker-compose with podman backend";

4
pkgs/applications/window-managers/qtile/default.nix
View file

@ -11,13 +11,13 @@ let
unwrapped = pythonPackages.buildPythonPackage rec {
pname = "qtile";
version = "0.18.1";
version = "0.19.0";
src = fetchFromGitHub {
owner = "qtile";
repo = "qtile";
rev = "v${version}";
sha256 = "0ln0fxarin9liy9n76zywmbr31xrjw8f7d3nr1mphci7wkc9bqmm";
sha256 = "BLHGVPMQd8O4h5TVx/F/klzSra+FZYogp22V6Yq04T0=";
};
postPatch = ''

4
pkgs/applications/window-managers/sway/default.nix
View file

@ -38,6 +38,10 @@ stdenv.mkDerivation rec {
./sway-config-nixos-paths.patch
];
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson ninja pkg-config wayland-scanner scdoc
];

11
pkgs/development/compilers/gambit/bootstrap.nix
View file

@ -15,6 +15,15 @@ gccStdenv.mkDerivation {
buildInputs = [ autoconf ];
# disable stackprotector on aarch64-darwin for now
# build error:
# ```
# /private/tmp/nix-build-gambit-bootstrap-4.9.3.drv-0/ccbOVwnF.s:207:15: error: index must be an integer in range [-256, 255].
# ldr x2, [x2, ___stack_chk_guard];momd
# ^
# ```
hardeningDisable = lib.optionals (gccStdenv.isAarch64 && gccStdenv.isDarwin) [ "stackprotector" ];
configurePhase = ''
export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \
CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \
@ -33,7 +42,7 @@ gccStdenv.mkDerivation {
'';
installPhase = ''
cp -fa ./ $out/gambit/
cp -fa ./gsc-boot $out/gambit/
'';
forceShare = [ "info" ];

9
pkgs/development/compilers/gambit/build.nix
View file

@ -35,6 +35,15 @@ gccStdenv.mkDerivation rec {
# Or wrap relevant programs to add a suitable PATH ?
#runtimeDeps = [ gnused gnugrep ];
# disable stackprotector on aarch64-darwin for now
# build error:
# ```
# /private/tmp/nix-build-gambit-unstable-2020-09-20.drv-0/ccIjyeeb.s:207:15: error: index must be an integer in range [-256, 255].
# ldr x2, [x2, ___stack_chk_guard];momd
# ^
# ```
hardeningDisable = lib.optionals (gccStdenv.isAarch64 && gccStdenv.isDarwin) [ "stackprotector" ];
configureFlags = [
"--enable-targets=${gambit-params.targets}"
"--enable-single-host"

9
pkgs/development/compilers/gerbil/build.nix
View file

@ -21,6 +21,15 @@ stdenv.mkDerivation rec {
buildInputs = [ gambit ]
++ buildInputs_libraries; # ++ buildInputs_staticLibraries;
# disable stackprotector on aarch64-darwin for now
# build error:
# ```
# /private/tmp/nix-build-gerbil-unstable-2020-11-05.drv-0/ccjyhWKi.s:326:15: error: index must be an integer in range [-256, 255].
# ldr x2, [x2, ___stack_chk_guard];momd
# ^
# ```
hardeningDisable = lib.optionals (gccStdenv.isAarch64 && gccStdenv.isDarwin) [ "stackprotector" ];
NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql";
postPatch = ''

4
pkgs/development/libraries/doctest/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "doctest";
version = "2.4.6";
version = "2.4.7";
src = fetchFromGitHub {
owner = "onqtam";
repo = "doctest";
rev = version;
sha256 = "14m3q6d96zg6d99x1152jkly50gdjrn5ylrbhax53pfgfzzc5yqx";
sha256 = "sha256-pXUg+NHSCKOudkmDCU3ePZrvs8DlM/CEZntEd78oTJ0=";
};
nativeBuildInputs = [ cmake ];

18
pkgs/development/libraries/irrlicht/mac_device.patch
View file

@ -18,3 +18,21 @@
[NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]];
[NSApp finishLaunching];
}
@@ -642,7 +642,7 @@
NSOpenGLPFASamples, (NSOpenGLPixelFormatAttribute)CreationParams.AntiAlias,
NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)(CreationParams.Stencilbuffer?1:0),
NSOpenGLPFADoubleBuffer,
- (NSOpenGLPixelFormatAttribute)nil
+ (NSOpenGLPixelFormatAttribute)0
};
if (CreationParams.AntiAlias<2)
@@ -668,7 +668,7 @@
{
// Third try without Doublebuffer
os::Printer::log("No doublebuffering available.", ELL_WARNING);
- windowattribs[14]=(NSOpenGLPixelFormatAttribute)nil;
+ windowattribs[14]=(NSOpenGLPixelFormatAttribute)0;
}
format = [[NSOpenGLPixelFormat alloc] initWithAttributes:windowattribs];

41
pkgs/development/libraries/leveldb/default.nix
View file

@ -1,39 +1,50 @@
{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }:
{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy, cmake
, static ? stdenv.hostPlatform.isStatic }:
stdenv.mkDerivation rec {
pname = "leveldb";
version = "1.20";
version = "1.23";
src = fetchFromGitHub {
owner = "google";
repo = "leveldb";
rev = "v${version}";
sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y";
rev = "${version}";
sha256 = "sha256-RL+dfSFZZzWvUobSqiPbuC4nDiGzjIIukbVJZRacHbI=";
};
outputs = [ "out" "dev" ];
buildInputs = [ snappy ];
nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames ++ [ cmake ];
doCheck = true;
buildFlags = [ "all" ];
# NOTE: disabling tests due to gtest issue
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DLEVELDB_BUILD_TESTS=OFF"
];
postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
# remove shared objects from "all" target
sed -i '/^all:/ s/$(SHARED_LIBS) $(SHARED_PROGRAMS)//' Makefile
'';
installPhase = ''
runHook preInstall
install -D -t $out/include/leveldb include/leveldb/*
install -D helpers/memenv/memenv.h $out/include/leveldb/helpers
install -D -t $out/lib out-{static,shared}/lib*
install -D -t $out/bin out-static/{leveldbutil,db_bench}
runHook postInstall
postInstall = ''
substituteInPlace "$out"/lib/cmake/leveldb/leveldbTargets.cmake \
--replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"'
mkdir -p $dev/lib/pkgconfig
cat <<EOF > $dev/lib/pkgconfig/leveldb.pc
Name: leveldb
Description: Fast and lightweight key/value database library by Google.
Version: ${version}
Libs: -L$out/lib -lleveldb
Cflags: -I$dev/include
EOF
'';
meta = with lib; {

8
pkgs/development/libraries/libadwaita/default.nix
View file

@ -5,7 +5,7 @@
, gi-docgen
, gtk-doc
, libxml2
, meson
, meson_0_60
, ninja
, pkg-config
, sassc
@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "libadwaita";
version = "1.0.0.alpha.3";
version = "1.0.0.alpha.4";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # demo app
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "libadwaita";
rev = version;
sha256 = "sha256-4ED2m8hZMWbu5sFbkH0W6q05+cYCCkx+ubeDqg3W3a0=";
sha256 = "sha256-3aVeBaKSl6SaPQLodsyJHwnNOlXlWfIaLnbbl3+mlDA=";
};
nativeBuildInputs = [
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
gi-docgen
gtk-doc
libxml2 # for xmllint
meson
meson_0_60
ninja
pkg-config
sassc

18
pkgs/development/ocaml-modules/batteries/default.nix
View file

@ -1,15 +1,21 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, num
, doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64
}:
let version = "3.3.0"; in
if !lib.versionAtLeast ocaml.version "4.02"
then throw "batteries is not available for OCaml ${ocaml.version}"
else
let version = "3.4.0"; in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-batteries-${version}";
src = fetchurl {
url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz";
sha256 = "002pqkcg18zx59hsf172wg6s7lwsiagp5sfvf5yssp7xxal5jdgx";
src = fetchFromGitHub {
owner = "ocaml-batteries-team";
repo = "batteries-included";
rev = "v${version}";
sha256 = "sha256:1cd7475n1mxhq482aidmhh27mq5p2vmb8d9fkb1mlza9pz5z66yq";
};
buildInputs = [ ocaml findlib ocamlbuild ];
@ -30,7 +36,7 @@ stdenv.mkDerivation {
language.
'';
license = lib.licenses.lgpl21Plus;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [
lib.maintainers.maggesi
];

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

@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
version = "5.0.0";
version = "5.1.1";
pname = "gspread";
src = fetchPypi {
inherit pname version;
sha256 = "55dd9e257ad45c479aed9283e5abe8d517a0c4e2dd443bf0a9849b53f826c0ca";
sha256 = "d9db8c43d552f541ea072d4727d1e955bc2368b095dd86c5429a845c9d8aed8f";
};
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];

6
pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
View file

@ -2,6 +2,7 @@
, buildPythonPackage
, pythonOlder
, fetchPypi
, certifi
, requests
, six
, websocket-client
@ -9,15 +10,16 @@
buildPythonPackage rec {
pname = "jellyfin-apiclient-python";
version = "1.8.0";
version = "1.8.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "a47d66166d1e9d3f0b38260004081bfd3fd9c07ca1b50181bbb980c4d7aeee34";
sha256 = "t2XmZ7rsrZq943lzRDrqzsY/djFNjFbkEYeHeA2AViI=";
};
propagatedBuildInputs = [
certifi
requests
six
websocket-client

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

@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "jupyterlab_server";
version = "2.8.2";
version = "2.10.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "26d813c8162c83d466df7d155865987dabe70aa452f9187dfb79fd88afc8fa0b";
sha256 = "9683d661fc059ae4e2039b582d0d80cec96778dad581bd27b5941a06191397ba";
};
postPatch = ''

3
pkgs/development/python-modules/mautrix/default.nix
View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder
, sqlalchemy, ruamel-yaml, CommonMark, lxml
, sqlalchemy, ruamel-yaml, CommonMark, lxml, aiosqlite
}:
buildPythonPackage rec {
@ -16,6 +16,7 @@ buildPythonPackage rec {
# defined in optional-requirements.txt
sqlalchemy
aiosqlite
ruamel-yaml
CommonMark
lxml

36
pkgs/development/python-modules/yamlfix/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pytest-xdist
, pythonOlder, click, ruyaml }:
buildPythonPackage rec {
pname = "yamlfix";
version = "0.7.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "lyz-code";
repo = pname;
rev = version;
sha256 = "sha256-qlA6TyLkOuTXCdMnpfkyN/HDIRfB6+0pQ7f0GCsIjL4=";
};
propagatedBuildInputs = [ click ruyaml ];
checkInputs = [ pytestCheckHook pytest-xdist ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'python_paths = "."' ""
'';
pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" ];
pythonImportsCheck = [ "yamlfix" ];
meta = with lib; {
description =
"A simple opinionated yaml formatter that keeps your comments!";
homepage = "https://github.com/lyz-code/yamlfix";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ koozz ];
};
}

8
pkgs/development/tools/build-managers/gradle/default.nix
View file

@ -96,16 +96,16 @@ rec {
# https://docs.gradle.org/current/userguide/compatibility.html
gradle_7 = gen {
version = "7.3.2";
version = "7.3.3";
nativeVersion = "0.22-milestone-21";
sha256 = "14jk1mhk59flzml55alwi9r5picmf8657q1nhd5mygrnmj79zf13";
sha256 = "00h3z0vxc4hv31sc71gb88r8yabyqgz304wpr0bxhbx2d14f11mm";
defaultJava = jdk17;
};
gradle_6 = gen {
version = "6.9.1";
version = "6.9.2";
nativeVersion = "0.22-milestone-20";
sha256 = "1zmjfwlh34b65rdx9izgavw3qwqqwm39h5siyj2bf0m55111a4lc";
sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb";
defaultJava = jdk11;
};

4
pkgs/development/tools/build-managers/qbs/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "qbs";
version = "1.20.1";
version = "1.21.0";
src = fetchFromGitHub {
owner = "qbs";
repo = "qbs";
rev = "v${version}";
sha256 = "sha256-tqpQ+TpcpD6o/7CtJOMfBQHGK0OX3pVhPHdpVHXplFs=";
sha256 = "sha256-jlJ7bk+lKBUs+jB6MTMe2Qxhf7BA7s5M9Xa2Dnx2UJs=";
};
nativeBuildInputs = [ qmake ];

4
pkgs/development/tools/build-managers/sbt/default.nix
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "sbt";
version = "1.5.7";
version = "1.5.8";
src = fetchurl {
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "sha256-6dnG02A0azpycsfdQOyh9GLewvezZl3s8esmIqWJfBk=";
sha256 = "sha256-WnT3UrfcIAs7HRxRUyfwHCH++DPpVzjeQsJC+3hA1Ik=";
};
postPatch = ''

4
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View file

@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
version = "14.5.2";
version = "14.6.0";
in
buildGoPackage rec {
inherit version;
@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "07mr9w1rp3rnrlixmqziin1gw78s3gncg47b4z9h9zzpy3acy3xd";
sha256 = "1sgz8gri51i2pxnzzkcvwx5ncw1rjz7ain82hlcx6f3874qfsniy";
};
patches = [

17
pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
View file

@ -1,28 +1,25 @@
diff --git a/shells/bash.go b/shells/bash.go
index 673f4765..a58cc5e2 100644
index bd99eca1a..9873dff6b 100644
--- a/shells/bash.go
+++ b/shells/bash.go
@@ -5,6 +5,7 @@ import (
@@ -3,6 +3,7 @@ package shells
import (
"bytes"
"fmt"
"io"
+ "os/exec"
"path"
"runtime"
"strconv"
@@ -225,7 +226,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
@@ -300,7 +301,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (*common.Shell
if info.User != "" {
script.Command = "su"
if runtime.GOOS == "linux" {
- script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell)
+ shellPath, err := exec.LookPath(b.Shell)
+ if err != nil {
+ shellPath = "/bin/"+b.Shell
+ shellPath = "/bin/" + b.Shell
+ }
+ script.Arguments = append(script.Arguments, "-s", shellPath)
}
script.Arguments = append(script.Arguments, info.User)
script.Arguments = append(script.Arguments, "-c", shellCommand)
--
2.18.0
script.Arguments = append(
script.Arguments,

2
pkgs/development/tools/scenebuilder/default.nix
View file

@ -33,7 +33,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0n93kb8pajlbidvdrsf3hwcwqzvgdm6dnly7wvk3vpargx6k7y1r";
outputHash = "01dkayad68g3zpzdnjwrc0h6s7s6n619y5b576snc35l8g2r5sgd";
};
# Point to our local deps repo

24
pkgs/tools/misc/mmctl/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "mmctl";
version = "6.2.1";
src = fetchFromGitHub {
owner = "mattermost";
repo = "mmctl";
rev = "v${version}";
sha256 = "sha256-DhkBiczQ+4iwoufHMuy6Fn3a4q7gvkKGXTfLcUCCKis=";
};
vendorSha256 = null;
checkPhase = "make test";
meta = with lib; {
description = "A remote CLI tool for Mattermost";
homepage = "https://github.com/mattermost/mmctl";
license = licenses.asl20;
maintainers = with maintainers; [ ppom ];
platforms = platforms.linux ++ platforms.darwin;
};
}

2
pkgs/tools/package-management/rpm/default.nix
View file

@ -62,6 +62,8 @@ stdenv.mkDerivation rec {
ln -sf $out/bin/{rpm,rpmverify}
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.rpm.org/";
license = with licenses; [ gpl2Plus lgpl21Plus ];

2
pkgs/tools/security/jadx/default.nix
View file

@ -40,7 +40,7 @@ let
'';
outputHashMode = "recursive";
outputHash = "sha256-5QJPMC/lk0C3nVCpGLE4r6rnchwttIbdHmcySnpNmF8=";
outputHash = "sha256-i+vK085P1T182wW4PajpDyZgyupKHlrx1yJgzJdHETU=";
};
in stdenv.mkDerivation {
inherit pname version src;

4
pkgs/tools/system/fcron/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "fcron";
version = "3.3.0";
version = "3.3.1";
src = fetchurl {
url = "http://fcron.free.fr/archives/${pname}-${version}.src.tar.gz";
sha256 = "0q5b1fdq1rpsd4lj7v717x47pmn62hhm13394g0yxqi614xd7sls";
sha256 = "sha256-81naoIpj3ft/4vlkuz9cUiRMJao2+SJaPMVNNvRoEQY=";
};
buildInputs = [ perl ];

6
pkgs/tools/typesetting/pdftk/default.nix
View file

@ -2,13 +2,13 @@
let
pname = "pdftk";
version = "3.3.1";
version = "3.3.2";
src = fetchFromGitLab {
owner = "pdftk-java";
repo = "pdftk";
rev = "v${version}";
sha256 = "1bah0y7nj4r0xwj74lxixhcsc51c93s6m6agkgciv4p1z69y0m66";
sha256 = "1gji1a06g3p6r4v5dx6h9kbvnf95d0lsjvp0c7daw5l8xhsrvijx";
};
deps = stdenv.mkDerivation {
@ -32,7 +32,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "06i2la72ag26phlcl52qnjnkscg6adyydwbdylnwbij73q5g15v4";
outputHash = "0qx1axqr0h5zbn2z9bnb1d0rbs0vajw4p8szw34nicngnn213g7k";
};
# Point to our local deps repo

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

@ -3411,6 +3411,8 @@ with pkgs;
mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { };
mmctl = callPackage ../tools/misc/mmctl { };
molly-brown = callPackage ../servers/gemini/molly-brown { };
monetdb = callPackage ../servers/sql/monetdb { };
@ -11182,6 +11184,8 @@ with pkgs;
yank = callPackage ../tools/misc/yank { };
yamlfix = with python3Packages; toPythonApplication yamlfix;
yamllint = with python3Packages; toPythonApplication yamllint;
yaml-merge = callPackage ../tools/text/yaml-merge { };

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

@ -10417,6 +10417,8 @@ in {
yamale = callPackage ../development/python-modules/yamale { };
yamlfix = callPackage ../development/python-modules/yamlfix { };
yamllint = callPackage ../development/python-modules/yamllint { };
yamlloader = callPackage ../development/python-modules/yamlloader { };