nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-08 06:01:51 +00:00 committed by GitHub
commit c47bdfa71a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
71 changed files with 1285 additions and 759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -663,6 +663,15 @@
group.
</para>
</listitem>
<listitem>
<para>
The <literal>yambar</literal> package has been split into
<literal>yambar</literal> and
<literal>yambar-wayland</literal>, corresponding to the xorg
and wayland backend respectively. Please switch to
<literal>yambar-wayland</literal> if you are on wayland.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">

2
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -166,6 +166,8 @@ pt-services.clipcat.enable).
- The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group.
- The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland.
## Other Notable Changes {#sec-release-21.11-notable-changes}
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.

3
nixos/modules/services/misc/gitea.nix
View File

@ -522,6 +522,9 @@ in
(umask 027; gitea_setup)
''}
# run migrations/init the database
${gitea}/bin/gitea migrate
# update all hooks' binary paths
${gitea}/bin/gitea admin regenerate hooks

4
pkgs/applications/misc/ausweisapp2/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
version = "1.22.0";
version = "1.22.1";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h";
sha256 = "sha256-fl/3mdVNqnoGfOEMOBWHGhtw9rEBUcrboS7hUNPGO8I=";
};
nativeBuildInputs = [ cmake pkg-config ];

65
pkgs/applications/misc/fuzzel/default.nix
View File

@ -1,22 +1,75 @@
{ stdenv, lib, fetchzip, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}:
{ stdenv
, lib
, fetchFromGitea
, pkg-config
, meson
, ninja
, wayland-scanner
, wayland
, pixman
, wayland-protocols
, libxkbcommon
, scdoc
, tllist
, fcft
, enableCairo ? true
, enablePNG ? true
, enableSVG ? true
# Optional dependencies
, cairo
, librsvg
, libpng
}:
let
# Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54
mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}";
in
stdenv.mkDerivation rec {
pname = "fuzzel";
version = "1.6.1";
src = fetchzip {
url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fuzzel";
rev = version;
sha256 = "sha256-JW5sAlTprSRIdFbmSaUreGtNccERgQMGEW+WCSscYQk=";
};
nativeBuildInputs = [ pkg-config meson ninja scdoc git ];
buildInputs = [ wayland pixman cairo librsvg wayland-protocols wlroots libxkbcommon tllist fcft ];
nativeBuildInputs = [
pkg-config
wayland-scanner
meson
ninja
scdoc
];
buildInputs = [
wayland
pixman
wayland-protocols
libxkbcommon
tllist
fcft
] ++ lib.optional enableCairo cairo
++ lib.optional enablePNG libpng
++ lib.optional enableSVG librsvg;
mesonBuildType = "release";
mesonFlags = [
(mesonFeatureFlag "enable-cairo" enableCairo)
(mesonFeatureFlag "enable-png" enablePNG)
(mesonFeatureFlag "enable-svg" enableSVG)
];
meta = with lib; {
description = "Wayland-native application launcher, similar to rofi’s drun mode";
homepage = "https://codeberg.org/dnkl/fuzzel";
license = licenses.mit;
maintainers = with maintainers; [ fionera ];
maintainers = with maintainers; [ fionera polykernel ];
platforms = with platforms; linux;
changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}";
};

3
pkgs/applications/misc/joplin-desktop/default.nix
View File

@ -55,7 +55,8 @@ let
install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications
install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps
substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
--replace 'Exec=AppRun' 'Exec=${pname}' \
--replace 'Icon=joplin' "Icon=$out/share/pixmaps/@joplinapp-desktop.png"
'';
};

6
pkgs/applications/misc/usql/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "usql";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
sha256 = "sha256-fcKn4kHIRvMdgGFKDNQg49YxLc0Y5j/8VwKoDLiXbEU=";
sha256 = "sha256-vLGoPttl7f4qCVM8e0F0llIODuNqJ7GxXqbUgokv7Qw=";
};
vendorSha256 = "sha256-uAV8NLnqXjIDILfnbbkVr2BOIucQ8vX89KI5yIkVtus=";
vendorSha256 = "sha256-sGECp1L6WzIPGbQbBoV1IrTgyy4/c95OLAmj9D0FjXs=";
buildInputs = [ unixODBC icu ];

39
pkgs/applications/misc/yambar/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv
, lib
, fetchgit
, fetchFromGitea
, pkg-config
, meson
, ninja
@ -9,50 +9,75 @@
, fcft
, json_c
, libmpdclient
, libxcb
, libyaml
, pixman
, tllist
, udev
, wayland
, wayland-scanner
, wayland-protocols
, waylandSupport ? false
# Xorg backend
, libxcb
, xcbutil
, xcbutilcursor
, xcbutilerrors
, xcbutilwm
}:
let
# Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54
mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}";
in
stdenv.mkDerivation rec {
pname = "yambar";
version = "1.6.2";
src = fetchgit {
url = "https://codeberg.org/dnkl/yambar.git";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "yambar";
rev = version;
sha256 = "sha256-oUNkaWrYIcsK2u+aeRg6DHmH4M1VZ0leNSM0lV9Yy1Y=";
sha256 = "sha256-GPKR2BYl3ebxxXbVfH/oZLs7639EYwWU4ZsilJn0Ss8=";
};
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
nativeBuildInputs = [
pkg-config
meson
ninja
scdoc
wayland-scanner
];
buildInputs = [
alsa-lib
fcft
json_c
libmpdclient
libxcb
libyaml
pixman
tllist
udev
wayland
wayland-protocols
] ++ lib.optionals (!waylandSupport) [
xcbutil
xcbutilcursor
xcbutilerrors
xcbutilwm
];
mesonBuildType = "release";
mesonFlags = [
(mesonFeatureFlag "backend-x11" (!waylandSupport))
(mesonFeatureFlag "backend-wayland" waylandSupport)
];
meta = with lib; {
homepage = "https://codeberg.org/dnkl/yambar";
changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${version}";
description = "Modular status panel for X11 and Wayland";
longDescription = ''
yambar is a lightweight and configurable status panel (bar, for short) for

18
pkgs/applications/networking/browsers/lynx/default.nix
View File

@ -1,12 +1,16 @@
{ lib, stdenv, buildPackages
, fetchurl, pkg-config, ncurses, gzip
, sslSupport ? true, openssl ? null
{ lib
, stdenv
, buildPackages
, fetchurl
, pkg-config
, ncurses
, gzip
, sslSupport ? true
, openssl
, nukeReferences
, fetchpatch
}:
assert sslSupport -> openssl != null;
stdenv.mkDerivation rec {
pname = "lynx";
version = "2.8.9rel.1";
@ -41,7 +45,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nukeReferences ]
++ lib.optional sslSupport pkg-config;
buildInputs = [ ncurses gzip ] ++ lib.optional sslSupport openssl.dev;
buildInputs = [ ncurses gzip ]
++ lib.optional sslSupport openssl;
# cfg_defs.h captures lots of references to build-only dependencies, derived
# from config.cache.
@ -53,6 +58,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A text-mode web browser";
homepage = "https://lynx.invisible-island.net/";
maintainers = with maintainers; [ ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
};

2
pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
View File

@ -1,7 +1,5 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
with lib;
stdenv.mkDerivation rec {
version = "6.9.4";
pname = "frostwire";

4
pkgs/applications/office/atlassian-cli/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "atlassian-cli";
version = "9.5.0";
version = "9.6.0";
src = fetchzip {
url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
sha256 = "sha256-EAoydA2lg4K1gTgzn9patNw7pcCdU/OPfaEG1OfEJ18=";
sha256 = "sha256-55ydhprVC9NdDMUrKbpSAEQBb9zRYgwOc7k8aP4R89A=";
};
tools = [

4
pkgs/applications/office/grisbi/default.nix
View File

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "grisbi";
version = "2.0.1";
version = "2.0.2";
src = fetchurl {
url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2";
sha256 = "sha256-hFLiVHyEekCP9btO75e5ni70ZcLhjbBGCBjF2gERIqs=";
sha256 = "sha256-bCO82EWAf/kiMDdojA5goWeWiKWZNOGYixmIJQwovGM=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];

4
pkgs/applications/radio/fldigi/default.nix
View File

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "fldigi";
version = "4.1.19";
version = "4.1.20";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "0zvfkmvxi31ccbpxvimkcrqrkf3wzr1pgja2ny04srrakl8ff5c7";
sha256 = "0f64pqijl3jlfmv00hkdxvn1wy5yy3zl33p6vf3fn1b91w590c2h";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/version-management/git-and-tools/git-hub/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "git-hub";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "sociomantic-tsunami";
repo = "git-hub";
rev = "v${version}";
sha256 = "1df9l8fpbxjgcgi72fwaqxiay5kpfihyc63f0gj67mns9n9ic1i7";
sha256 = "sha256-k8sGgDhQn9e0lxM604Wz2sy4lrX5o82xAgWbqscOmQw=";
};
nativeBuildInputs = [

4
pkgs/applications/version-management/gogs/default.nix
View File

@ -29,9 +29,7 @@ buildGoModule rec {
buildInputs = optional pamSupport pam;
buildFlags = [ "-tags" ];
buildFlagsArray =
tags =
( optional sqliteSupport "sqlite"
++ optional pamSupport "pam");

6
pkgs/applications/video/corrscope/default.nix
View File

@ -30,17 +30,17 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
})
];
nativeBuildInputs = [ wrapQtAppsHook ];
nativeBuildInputs = [ wrapQtAppsHook ] ++ (with python3Packages; [ poetry-core ]);
buildInputs = [ ffmpeg qtbase ];
propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy poetry-core pyqt5 ruamel_yaml ];
propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy pyqt5 ruamel_yaml ];
dontWrapQtApps = true;
preFixup = ''
makeWrapperArgs+=(
--prefix PATH : ${ffmpeg}/bin
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
"''${qtWrapperArgs[@]}"
)
'';

4
pkgs/applications/video/filebot/default.nix
View File

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "filebot";
version = "4.9.3";
version = "4.9.4";
src = fetchurl {
url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
sha256 = "sha256-T+y8k757/qFCVOCc/SNc7a+KmyscPlowubNQYzMr8jY=";
sha256 = "sha256-fz0B9P/UBrlKGPZkheMd/4cFnWHt+brS3zRTv4nVt9o=";
};
unpackPhase = "tar xvf $src";

4
pkgs/applications/virtualization/docker-slim/default.nix
View File

@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "docker-slim";
version = "1.36.1";
version = "1.36.2";
goPackagePath = "github.com/docker-slim/docker-slim";
@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "docker-slim";
repo = "docker-slim";
rev = version;
sha256 = "sha256-BoBZBzQYd/HbOCerpvcNcR/7Fds6+weY2QFRjqSfOjU=";
sha256 = "sha256-Q8M8+krPC6WRDCxe88gzX5bDG8x6sJ8TduTKjA85WFA=";
};
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];

4
pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "adoptopenjdk-icedtea-web";
version = "1.8.6";
version = "1.8.7";
src = fetchFromGitHub {
owner = "AdoptOpenJDK";
repo = "IcedTea-Web";
rev = "icedtea-web-${version}";
sha256 = "sha256-meqbFLGwCMpFoOVAfvtriRAS8ZWr374eSN3m0CdC2aM=";
sha256 = "sha256-XY6S1IvDqPxkYgFs7kB9AR0zQ4n3COVbS2lUT5mhTVc=";
};
nativeBuildInputs = [ autoreconfHook pkg-config bc ];

73
pkgs/development/compilers/mit-scheme/default.nix
View File

@ -1,12 +1,15 @@
{ fetchurl, lib, stdenv, makeWrapper, gnum4, texinfo, texLive, automake,
enableX11 ? false, xlibsWrapper ? null }:
autoconf, libtool, ghostscript, ncurses,
enableX11 ? false, xlibsWrapper }:
let
version = "10.1.10";
bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
version = "11.2";
bootstrapFromC = ! ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isx86_64);
arch = if stdenv.isi686 then "-i386"
else "-x86-64";
arch = if stdenv.isLinux && stdenv.isAarch64 then
"-aarch64le"
else
"-x86-64";
in
stdenv.mkDerivation {
name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}";
@ -16,49 +19,55 @@ stdenv.mkDerivation {
# leads to more efficient code than when building the tarball that contains
# generated C code instead of those binaries.
src =
if stdenv.isi686
if stdenv.isLinux && stdenv.isAarch64
then fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
sha256 = "117lf06vcdbaa5432hwqnskpywc6x8ai0gj99h480a4wzkp3vhy6";
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-aarch64le.tar.gz";
sha256 = "11maixldk20wqb5js5p4imq221zz9nf27649v9pqkdf8fv7rnrs9";
} else fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
sha256 = "1rljv6iddrbssm91c0nn08myj92af36hkix88cc6qwq38xsxs52g";
sha256 = "17822hs9y07vcviv2af17p3va7qh79dird49nj50bwi9rz64ia3w";
};
buildInputs = if enableX11 then [xlibsWrapper] else [];
buildInputs = [ ncurses ] ++ lib.optional enableX11 xlibsWrapper;
configurePhase =
'' (cd src && ./configure)
(cd doc && ./configure)
'';
configurePhase = ''
runHook preConfigure
(cd src && ./configure)
(cd doc && ./configure)
runHook postConfigure
'';
buildPhase =
'' cd src
${if bootstrapFromC
then "./etc/make-liarc.sh --prefix=$out"
else "make compile-microcode"}
buildPhase = ''
runHook preBuild
cd src
cd ../doc
${if bootstrapFromC
then "./etc/make-liarc.sh --prefix=$out"
else "make compile-microcode"}
# Provide a `texinfo.tex'.
export TEXINPUTS="$(echo ${automake}/share/automake-*)"
echo "\$TEXINPUTS is \`$TEXINPUTS'"
make
cd ../doc
cd ..
'';
make
installPhase =
'' make prefix=$out install -C src
make prefix=$out install -C doc
'';
cd ..
fixupPhase =
runHook postBuild
'';
installPhase = ''
runHook preInstall
make prefix=$out install -C src
make prefix=$out install -C doc
runHook postInstall
'';
postFixup =
'' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \
$out/lib/mit-scheme${arch}
'';
nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ];
nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ghostscript autoconf libtool ];
# XXX: The `check' target doesn't exist.
doCheck = false;

2
pkgs/development/coq-modules/coqeal/default.nix
View File

@ -7,11 +7,13 @@ with lib; mkCoqDerivation {
owner = "CoqEAL";
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.10") "1.12.0" ]; out = "1.0.6"; }
{ cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; }
{ cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; }
{ cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; }
] null;
release."1.0.6".sha256 = "0lqkyfj4qbq8wr3yk8qgn7mclw582n3fjl9l19yp8cnchspzywx0";
release."1.0.5".sha256 = "0cmvky8glb5z2dy3q62aln6qbav4lrf2q1589f6h1gn5bgjrbzkm";
release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk";
release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24";

4
pkgs/development/libraries/java/hsqldb/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "hsqldb";
version = "2.5.1";
version = "2.6.0";
underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);
src = fetchurl {
url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
sha256 = "0yd9px85y036bp3q1assj3fgaykxrwnhnc7cbjgic39cykfy5hrg";
sha256 = "sha256-GhuTBJl1E+aoWa8pTWEqzghHDXXiCQFIt++8pjCQYik=";
};
nativeBuildInputs = [ unzip makeWrapper ];

32
pkgs/development/libraries/kmsxx/default.nix
View File

@ -1,22 +1,37 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm
, withPython ? false, python ? null }:
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, cmake
, pkg-config
, libdrm
, fmt
, libevdev
, withPython ? false
, python3Packages
}:
stdenv.mkDerivation {
pname = "kmsxx";
version = "2020-08-04";
version = "2021-07-26";
src = fetchFromGitHub {
owner = "tomba";
repo = "kmsxx";
fetchSubmodules = true;
rev = "38bee3092f2d477f1baebfcae464f888d3d04bbe";
sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh";
rev = "54f591ec0de61dd192baf781c9b2ec87d5b461f7";
sha256 = "sha256-j+20WY4a2iTKZnYjXhxbNnZZ53K3dHpDMTp+ZulS+7c=";
};
cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF";
# Didn't detect pybind11 without cmake
nativeBuildInputs = [ meson ninja pkg-config ] ++ lib.optionals withPython [ cmake ];
buildInputs = [ libdrm fmt libevdev ]
++ lib.optionals withPython (with python3Packages; [ python pybind11 ]);
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libdrm ] ++ lib.optionals withPython [ python ];
dontUseCmakeConfigure = true;
mesonFlags = lib.optional (!withPython) "-Dpykms=disabled";
meta = with lib; {
description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
@ -24,6 +39,5 @@ stdenv.mkDerivation {
license = licenses.mpl20;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
broken = true; # marked broken 2021-03-26
};
}

14
pkgs/development/libraries/yder/default.nix
View File

@ -1,7 +1,14 @@
{ stdenv, lib, fetchFromGitHub, cmake, orcania, systemd, check, subunit
{ stdenv
, lib
, fetchFromGitHub
, cmake
, orcania
, systemd
, check
, subunit
, withSystemd ? stdenv.isLinux
}:
assert withSystemd -> systemd != null;
stdenv.mkDerivation rec {
pname = "yder";
version = "1.4.12";
@ -21,7 +28,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ orcania ] ++ lib.optional withSystemd systemd;
buildInputs = [ orcania ]
++ lib.optional withSystemd systemd;
checkInputs = [ check subunit ];

4
pkgs/development/python-modules/gensim/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "gensim";
version = "3.8.3";
version = "4.0.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq";
sha256 = "a9c9fed52e2901ad04f9caf73a5dd782e5ce8054f71b346d72f04ddff1b7b432";
};
propagatedBuildInputs = [ smart-open numpy six scipy ];

5
pkgs/development/python-modules/google-cloud-iam/default.nix
View File

@ -12,11 +12,12 @@
buildPythonPackage rec {
pname = "google-cloud-iam";
version = "2.2.0";
version = "2.3.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1f64b78c854c0629f20903011d6def28c981ce5682a5221031f6ae1caa0a1fea";
sha256 = "166pcra1x8lisgf7cla4vq97qpc1hrpwnvlj1sza1igny2m59w5i";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];

11
pkgs/development/python-modules/mayavi/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildPythonPackage, isPy27, fetchPypi, wrapQtAppsHook
{ lib, buildPythonPackage, pythonOlder, fetchPypi, wrapQtAppsHook
, pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5
}:
buildPythonPackage rec {
pname = "mayavi";
version = "4.7.1";
version = "4.7.3";
disabled = isPy27;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
extension = "tar.bz2";
sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy";
extension = "tar.gz";
sha256 = "Zw0AI7nNLSNGxFHbm6L2HaI6XfUDOyWuqJy22BuUZPA=";
};
postPatch = ''
@ -31,6 +31,7 @@ buildPythonPackage rec {
];
doCheck = false; # Needs X server
pythonImportsCheck = [ "mayavi" ];
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")

4
pkgs/development/python-modules/rising/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "rising";
version = "0.2.0post0";
version = "0.2.1";
disabled = isPy27;
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "PhoenixDL";
repo = pname;
rev = "v${version}";
sha256 = "0fb9894ppcp18wc2dhhjizj8ja53gbv9wpql4mixxxdz8z2bn33c";
sha256 = "15wYWToXRae1cMpHWbJwzAp0THx6ED9ixQgL+n1v9PI=";
};
propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ];

29
pkgs/development/python-modules/torrequest/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, buildPythonPackage, fetchPypi, requests, pysocks, stem }:
buildPythonPackage rec {
pname = "torrequest";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-N0XU6j/9qY16A0Njx4ets3qrd72rQAlKTZNzks1NroI=";
};
propagatedBuildInputs = [
pysocks requests stem
];
# This package does not contain any tests.
doCheck = false;
pythonImportsCheck = [
"torrequest"
];
meta = with lib; {
homepage = "https://github.com/erdiaker/torrequest";
description = "Simple Python interface for HTTP(s) requests over Tor";
license = with licenses; [ mit ];
maintainers = with maintainers; [ applePrincess ];
};
}

10
pkgs/development/tools/analysis/flow/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.156.0";
version = "0.157.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "sha256-aV5qcXxNLljeM3MrXg8ptAST8ARCb3kR83oy5G9fbak=";
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "sha256-16DDlVCBZ8Rtd5OM9tJUxekzYDAirX1zJ36cyPOv/SU=";
};
installPhase = ''

31
pkgs/development/tools/build-managers/msbuild/default.nix
View File

@ -3,8 +3,8 @@
let
xplat = fetchurl {
url = "https://github.com/mono/msbuild/releases/download/0.08/mono_msbuild_6.4.0.208.zip";
sha256 = "05k7qmnhfvrdgyjn6vp81jb97y21m261jnwdyqpjqpcmzz18j93g";
url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip";
sha256 = "1wnzbdpk4s9bmawlh359ak2b8zi0sgx1qvcjnvfncr1wsck53v7q";
};
deps = map (package: package.src)
@ -23,11 +23,11 @@ in
stdenv.mkDerivation rec {
pname = "msbuild";
version = "16.8+xamarinxplat.2020.07.30.15.02";
version = "16.10.1+xamarinxplat.2021.05.26.14.00";
src = fetchurl {
url = "https://download.mono-project.com/sources/msbuild/msbuild-${version}.tar.xz";
sha256 = "10amyca78b6pjfsy54b1rgwz2c1bx0sfky9zhldvzy4divckp25g";
sha256 = "05ghqqkdj4s3d0xkp7mkdzjig5zj3k6ajx71j0g2wv6rdbvg6899";
};
nativeBuildInputs = [
@ -47,16 +47,17 @@ stdenv.mkDerivation rec {
LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux
"${glibcLocales}/lib/locale/locale-archive";
patches = [
(fetchpatch {
url = "https://github.com/mono/msbuild/commit/cad85cefabdaa001fb4bdbea2f5bf1d1cdb83c9b.patch";
sha256 = "1s8agc7nxxs69b3fl1v1air0c4dpig3hy4sk11l1560jrlx06dhh";
})
];
postPatch = ''
# not patchShebangs, there is /bin/bash in the body of the script as well
substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell}
patchShebangs eng/*.sh mono/build/*.sh
sed -i -e "/<\/projectImportSearchPaths>/a <property name=\"MSBuildExtensionsPath\" value=\"$out/lib/mono/xbuild\"/>" \
src/MSBuild/app.config
# license check is case sensitive
mv LICENSE license.bak && mv license.bak license
'';
buildPhase = ''
@ -70,9 +71,6 @@ stdenv.mkDerivation rec {
nuget add $package -Source nixos
done
# license check is case sensitive
mv LICENSE license.bak && mv license.bak license
mkdir -p artifacts
unzip ${xplat} -d artifacts
mv artifacts/msbuild artifacts/mono-msbuild
@ -82,9 +80,10 @@ stdenv.mkDerivation rec {
# overwrite the file
echo "#!${stdenv.shell}" > eng/common/dotnet-install.sh
echo "#!${stdenv.shell}" > mono/build/get_sdk_files.sh
# not patchShebangs, there is /bin/bash in the body of the script as well
substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell}
mkdir -p mono/dotnet-overlay/msbuild-bin
cp ${dotnet-sdk}/sdk/*/{Microsoft.NETCoreSdk.BundledVersions.props,RuntimeIdentifierGraph.json} mono/dotnet-overlay/msbuild-bin
# DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa
# TODO there are some (many?) failing tests

1056
pkgs/development/tools/build-managers/msbuild/deps.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
View File

@ -3,13 +3,13 @@
nixosTests }:
buildGoModule rec {
name = "buildkite-agent-${version}";
version = "3.32.0";
version = "3.32.1";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
sha256 = "sha256-wgIqsOqdwnKL1mWD1CR1ru2erc9iSZoDXxeOtobeAQQ=";
sha256 = "sha256-bwxxjpIBVzFfjewUwDjFNN9zcaL3ihYjWOlWdrhf1o0=";
};
vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";

4
pkgs/development/tools/continuous-integration/drone/default.nix
View File

@ -16,9 +16,7 @@ buildGoModule rec {
sha256 = "sha256-MKV5kor+Wm9cuIFFcjSNyCgVKtY+/B9sgBOXMMRvMPI=";
};
preBuild = ''
buildFlagsArray+=( "-tags" "${lib.optionalString (!enableUnfree) "oss nolimit"}" )
'';
tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ];
meta = with lib; {
maintainers = with maintainers; [ elohmeier vdemeester ];

4
pkgs/development/tools/go-protobuf/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-protobuf";
version = "1.5.1";
version = "1.5.2";
src = fetchFromGitHub {
owner = "golang";
repo = "protobuf";
rev = "v${version}";
sha256 = "sha256-TYx7nAyUE70hoCNKnR74FzWhrQyWG17VPoKH3vR+qOM=";
sha256 = "sha256-E/6Qh8hWilaGeSojOCz8PzP9qnVqNG2DQLYJUqN3BdY=";
};
vendorSha256 = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE=";

4
pkgs/development/tools/ktlint/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ktlint";
version = "0.42.0";
version = "0.42.1";
src = fetchurl {
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
sha256 = "sha256-MrIn+siqBnjwst4HKdJQ+iy1PxCldKizXkmqHH6D3Kg=";
sha256 = "sha256-ASQuMWH6stUupJkfOpzVMs+c+xq7OWbVxGh6IY2zd70=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/tools/misc/cproto/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "cproto";
version = "4.7r";
version = "4.7s";
src = fetchurl {
urls = [
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
# No version listings and apparently no versioned tarball over http(s).
"ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
];
sha256 = "sha256-bgRg2yVZXHobUz8AUaV4ZKBkp2KjP+2oXbDXmPTUX8U=";
sha256 = "sha256-TGpZNahykQjRcUhgmwgDRQ/OFRWFiW+7gXhfHGEYQrg=";
};
# patch made by Joe Khoobyar copied from gentoo bugs

1
pkgs/development/tools/omnisharp-roslyn/create-deps.sh
View File

@ -20,6 +20,7 @@ mapfile -t repos < <(
msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \
-p:RestoreNoCache=true -p:RestoreForce=true \
-p:NuGetPackageVersion=5.9.1-rc.8 \
src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2
cd "$tmpdir"

10
pkgs/development/tools/omnisharp-roslyn/default.nix
View File

@ -77,10 +77,16 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper msbuild ];
# NuGetPackageVersion is overridden to be to be compatible with msbuild 16.10,
# it needs to be kept in sync with ./create-deps.sh
buildPhase = ''
runHook preBuild
HOME=$(pwd)/fake-home msbuild -r -p:Configuration=Release -p:RestoreConfigFile=${nuget-config} src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj
HOME=$(pwd)/fake-home msbuild -r \
-p:Configuration=Release \
-p:RestoreConfigFile=${nuget-config} \
-p:NuGetPackageVersion=5.9.1-rc.8 \
src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj
runHook postBuild
'';
@ -97,7 +103,7 @@ in stdenv.mkDerivation rec {
ln -s ${msbuild}/lib/mono/msbuild/Current/bin $out/src/.msbuild/Current/Bin
makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \
--prefix PATH : ${dotnet-sdk}/bin \
--suffix PATH : ${dotnet-sdk}/bin \
--add-flags "$out/src/OmniSharp.exe"
'';

138
pkgs/development/tools/omnisharp-roslyn/deps.nix generated
View File

@ -707,8 +707,8 @@
name = "microsoft.visualstudio.debugger.contracts";
version = "17.2.0-beta.21262.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21262.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21262.1.nupkg";
sha256 = "10fi1jdxnxvww1qzfhqi53fn0a411gvpvcsb0pvwvj7qk0lzs7c9";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21262.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21262.1.nupkg";
sha256 = "148gb4k28fch1rhh6kr82dajl7qnvjxvkxvc8igy7zra70nvbx74";
};
}
{
@ -839,6 +839,14 @@
sha256 = "14y7axpmdl9fg8jfc42gxpcq9wj8k3vzc07npmgjnzqlp5xjyyac";
};
}
{
name = "nuget.common";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/5.9.1-rc.8/nuget.common.5.9.1-rc.8.nupkg";
sha256 = "056b1h4fvik6z2qc2s6qzz0s4acbipc50af14fbr7hd9h2fxya4c";
};
}
{
name = "nuget.configuration";
version = "5.2.0";
@ -847,6 +855,14 @@
sha256 = "0b4dkym3vnj7qldnqqq6h6ry0gkql5c2ps5wy72b8s4fc3dmnvf1";
};
}
{
name = "nuget.configuration";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/5.9.1-rc.8/nuget.configuration.5.9.1-rc.8.nupkg";
sha256 = "0x8vigf0sfp6kf1i98xcr4k84vci596x16hmajdm0zgv3p1w2kvk";
};
}
{
name = "nuget.dependencyresolver.core";
version = "5.2.0";
@ -855,6 +871,14 @@
sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r";
};
}
{
name = "nuget.dependencyresolver.core";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/5.9.1-rc.8/nuget.dependencyresolver.core.5.9.1-rc.8.nupkg";
sha256 = "1q9a97s1z3a6fb4p82ag2lqnzl53895prbqwlbvckdw9c3rpz3gc";
};
}
{
name = "nuget.frameworks";
version = "5.0.0";
@ -871,6 +895,14 @@
sha256 = "1fh4rp26m77jq5dyln68wz9qm217la9vv21amis2qvcy6gknk2wp";
};
}
{
name = "nuget.frameworks";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/5.9.1-rc.8/nuget.frameworks.5.9.1-rc.8.nupkg";
sha256 = "1n3mp9ns79yq4dwgj7h2av3b485mzgsw0qlj8z7p47krwlzp5hiv";
};
}
{
name = "nuget.librarymodel";
version = "5.2.0";
@ -879,6 +911,14 @@
sha256 = "0vxd0y7rzzxvmxji9bzp95p2rx48303r3nqrlhmhhfc4z5fxjlqk";
};
}
{
name = "nuget.librarymodel";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/5.9.1-rc.8/nuget.librarymodel.5.9.1-rc.8.nupkg";
sha256 = "0sy8422c94wcg8ka85lnawq26mpixl79avk9m6y44lshrpga5v4v";
};
}
{
name = "nuget.packaging";
version = "5.2.0";
@ -888,11 +928,19 @@
};
}
{
name = "nuget.packaging.core";
version = "5.2.0";
name = "nuget.packaging";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/5.2.0/nuget.packaging.core.5.2.0.nupkg";
sha256 = "16sm2amzvbpmisb6x6dz1pvj1h3xm67vd2byl1wl13vrda0az3xb";
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/5.9.1-rc.8/nuget.packaging.5.9.1-rc.8.nupkg";
sha256 = "0x9c3v741nn6m2xgidna88fa4xj5avhv6asj73hqv4pzpdprlrhv";
};
}
{
name = "nuget.packaging.core";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/5.9.1-rc.8/nuget.packaging.core.5.9.1-rc.8.nupkg";
sha256 = "0vsaixmla4zh277xpn5ngbmi2f52hb26aqzr0z9l4a3mlpi4l5nx";
};
}
{
@ -903,6 +951,14 @@
sha256 = "1j23jk2zql52v2nqgi0k6d7z63pjjzrvw8y1s38zpf0sn7lzdr0h";
};
}
{
name = "nuget.projectmodel";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/5.9.1-rc.8/nuget.projectmodel.5.9.1-rc.8.nupkg";
sha256 = "1xjh7isw467nkc7dkfj3wlw69vi2cns66z152jrzjdmxmia3i3pv";
};
}
{
name = "nuget.protocol";
version = "5.2.0";
@ -911,6 +967,14 @@
sha256 = "1vlrrlcy7p2sf23wqax8mfhplnzppd73xqlr2g83ya056w0yf2rd";
};
}
{
name = "nuget.protocol";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/5.9.1-rc.8/nuget.protocol.5.9.1-rc.8.nupkg";
sha256 = "1rnrxzaciqhhgwd4by0dhkvfrm1h161vvmkvlcwaz2589sqq2dzq";
};
}
{
name = "nuget.versioning";
version = "5.2.0";
@ -919,6 +983,14 @@
sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k";
};
}
{
name = "nuget.versioning";
version = "5.9.1-rc.8";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/5.9.1-rc.8/nuget.versioning.5.9.1-rc.8.nupkg";
sha256 = "1vv7z122ilsk2rsvjm6j3hpifb45g8wa1mgnq1kwi9k8b2dbb6vv";
};
}
{
name = "omnisharp.extensions.jsonrpc";
version = "0.19.0";
@ -1319,14 +1391,6 @@
sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga";
};
}
{
name = "system.diagnostics.process";
version = "4.3.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg";
sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7";
};
}
{
name = "system.diagnostics.tools";
version = "4.3.0";
@ -1343,14 +1407,6 @@
sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4";
};
}
{
name = "system.dynamic.runtime";
version = "4.3.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg";
sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
};
}
{
name = "system.globalization";
version = "4.0.11";
@ -1887,6 +1943,14 @@
sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j";
};
}
{
name = "system.security.cryptography.cng";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/5.0.0/system.security.cryptography.cng.5.0.0.nupkg";
sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw";
};
}
{
name = "system.security.cryptography.csp";
version = "4.3.0";
@ -1919,6 +1983,14 @@
sha256 = "1mwvzl5ask8kk0vdgchhqr90nl61kagg47warb7dxrb03cxjd4wm";
};
}
{
name = "system.security.cryptography.pkcs";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/5.0.0/system.security.cryptography.pkcs.5.0.0.nupkg";
sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj";
};
}
{
name = "system.security.cryptography.primitives";
version = "4.3.0";
@ -1929,10 +2001,10 @@
}
{
name = "system.security.cryptography.protecteddata";
version = "4.3.0";
version = "4.4.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.3.0/system.security.cryptography.protecteddata.4.3.0.nupkg";
sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9";
url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.4.0/system.security.cryptography.protecteddata.4.4.0.nupkg";
sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6";
};
}
{
@ -2151,22 +2223,6 @@
sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153";
};
}
{
name = "system.threading.thread";
version = "4.3.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg";
sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4";
};
}
{
name = "system.threading.threadpool";
version = "4.3.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg";
sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1";
};
}
{
name = "system.threading.timer";
version = "4.3.0";

4
pkgs/development/tools/profiling/systemtap/default.nix
View File

@ -6,8 +6,8 @@ let
## fetchgit info
url = "git://sourceware.org/git/systemtap.git";
rev = "release-${version}";
sha256 = "0mmpiq7bsrwhp7z07a1pwka4q6d2fbmdx5wp83nxj31rvdxhqwnw";
version = "4.1";
sha256 = "sha256-3LgqMBCnUG2UmsekaIvV43lBpSPEocEXmFV9WpE7wE0=";
version = "4.5";
inherit (kernel) stdenv;

3
pkgs/games/alephone/marathon/default.nix
View File

@ -7,8 +7,7 @@ alephone.makeWrapper rec {
icon = alephone.icons + "/marathon.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
sha256 = "sha256-WM5c0X/BGeDu8d7hME3LiZavkgJll6rc3Beat/2bsdg=";
};

6
pkgs/games/angband/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "angband";
version = "4.2.2";
version = "4.2.3";
src = fetchFromGitHub {
owner = "angband";
repo = "angband";
rev = version;
sha256 = "sha256-z1HTt3+lWIr2F9YZFdw47lkYVgYl17qbb/OJ9YyYQa8=";
sha256 = "sha256-SFHAG74qJcV3E+jxPcOH2moW/kXhpwUwbGZVkNxqWd8=";
};
nativeBuildInputs = [ autoreconfHook ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installFlags = [ "bindir=$(out)/bin" ];
meta = with lib; {
homepage = "http://rephial.org/";
homepage = "https://angband.github.io/angband";
description = "A single-player roguelike dungeon exploration game";
maintainers = [ maintainers.chattered ];
license = licenses.gpl2;

6
pkgs/games/anki/bin.nix
View File

@ -3,14 +3,14 @@
let
pname = "anki-bin";
# Update hashes for both Linux and Darwin!
version = "2.1.44";
version = "2.1.46";
unpacked = stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2";
sha256 = "01d5ll3vsd4v0ikxgamv47bkwmag15vnmsgpda5wivc3dyawc9j9";
sha256 = "1jzpf42fqhfbjr95k7bpsnf34sfinamp6v828y0sapa4gzfvwkkz";
};
installPhase = ''
@ -57,7 +57,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
src = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg";
sha256 = "1zrdih4rjsq30480sf200pw59r42p3nq2md56kj2l641kbc7ljka";
sha256 = "003cmh5qdj5mkrpm51n0is872faj99dqfkaaxyyrn6x03s36l17y";
};
nativeBuildInputs = [ undmg ];

4
pkgs/games/manaplus/default.nix
View File

@ -3,11 +3,11 @@
, libGL, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "manaplus";
version = "1.9.3.23";
version = "2.1.3.17";
src = fetchurl {
url = "https://download.evolonline.org/manaplus/download/${version}/manaplus-${version}.tar.xz";
sha256 = "1ky182p4svwdqm6cf7jbns85hidkhkhq4s17cs2p381f0klapfjz";
sha256 = "sha256-6NFqxUjEAp7aiIScyTOFh2tT7PfuTCKH1vTgPpTm+j0=";
};
nativeBuildInputs = [

6
pkgs/games/minecraft-server/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, nixosTests, jre_headless }:
stdenv.mkDerivation {
pname = "minecraft-server";
version = "1.17";
version = "1.17.1";
src = fetchurl {
url = "https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar";
url = "https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar";
# sha1 because that comes from mojang via api
sha1 = "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e";
sha1 = "a16d67e5807f57fc4e550299cf20226194497dc2";
};
preferLocalBuild = true;

4
pkgs/misc/emulators/fuse-emulator/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "fuse-emulator";
version = "1.5.7";
version = "1.6.0";
src = fetchurl {
url = "mirror://sourceforge/${pname}/fuse-${version}.tar.gz";
sha256 = "0kaynjr28w42n3iha60mgr7nxm49w8j0v49plyrc7ka24qzmiqph";
sha256 = "sha256-Oo/t8v/pR8VxVhusVaWa2tTFkzj3TkSbfnpn2coEcJY=";
};
nativeBuildInputs = [ perl pkg-config wrapGAppsHook ];

116
pkgs/misc/vim-plugins/generated.nix
View File

@ -77,11 +77,11 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-08-06";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "10f984673c51d2affbf8dc69d79a6280d7b69060";
rev = "cc34310a99ece2a1bb8d626f77436e53d43fa18b";
sha256 = "1gj2hg9qpkxnqks395a4rvgy40a7qg4q260xa8a8zymdf476h57f";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
@ -281,12 +281,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
version = "2021-08-06";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
rev = "7dcd28363b18a81d6c27852ba0a9e5b50e9fb803";
sha256 = "00g1c4gr8fmx9bmfn28njz9hkgwmzalgk2yrrxa0sx95g44n94kq";
rev = "877ef78049d44eee8ebf4d0e6ec541ca23e4ab49";
sha256 = "0m4yn8kkljn6m45ha7279wv7p9ppjyqrrpagmq92yrqnbfi87qa1";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@ -1869,14 +1869,26 @@ final: prev:
meta.homepage = "https://github.com/vim-scripts/gitignore.vim/";
};
gitlinker-nvim = buildVimPluginFrom2Nix {
pname = "gitlinker-nvim";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "ruifm";
repo = "gitlinker.nvim";
rev = "585f2eab74cb872c421f564274ef050fa74937ab";
sha256 = "1zc9yr7b53akn639xhczala7vqz7rdy61xnndwn37bdxzvjqm59j";
};
meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
};
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-08-06";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "fe475b0f37d86037ebb48fb559e8db730101ee54";
sha256 = "0l55s5zb2nv97cbdjbs29cnic0v2wslrn0aszryk7ckfrzkw9jfs";
rev = "dd58b795a4863871fe2378dc17c6821e15b0eb59";
sha256 = "1s33j8xbh4y8hiw7d0msr77h79zqrdcxfnmnf2lkqbh6jzqfyyqf";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2472,12 +2484,12 @@ final: prev:
lazygit-nvim = buildVimPluginFrom2Nix {
pname = "lazygit-nvim";
version = "2021-07-21";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "lazygit.nvim";
rev = "c1840692c17b6994bb3b96b33e48040d0cb2da99";
sha256 = "07mwa2bbny73s60as5s1schk4zhk6m6rv26ljbcl14mx45z9m8r8";
rev = "b1ebb53902a4f5d8c565f7485d4e57d937f89b91";
sha256 = "1fjzrrr0i0yvl2q65r1v922iza13zy8chfcz998hi499sizviwmq";
};
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
};
@ -2712,12 +2724,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
version = "2021-08-05";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
rev = "04126aa17cbe863a4fe8ca43653cd9ef70f29c18";
sha256 = "0w2jxbbmgdlh9hakzjy2i229qlcj7krh1xb7b1ds7y27prb1h144";
rev = "dbd5f6a5116f74ccf89b2ea18d59b629397c7940";
sha256 = "1mmm5h14p7jgalvgl68m9gj0dfl1r29kf5z7h4vmzy07q3nm8xq3";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@ -2772,24 +2784,24 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-08-06";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "69ac54ca3909e21d73af33fb504907787b111a51";
sha256 = "0zz3k5x7611awpywzp286nn502h752ad567qvgcqw7r88rsp5g0v";
rev = "f4a2f500afde3624e41557781117d7f50ccc7223";
sha256 = "08fflc2ky7zpb0wazim5v46fhqcm8sadpsvkjml544gv29yjx7f3";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
lush-nvim = buildVimPluginFrom2Nix {
pname = "lush-nvim";
version = "2021-07-15";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
rev = "a787bcd1d9afb2bd6bab13834c5b28e727f266c0";
sha256 = "12i4bvgm26sfvdanjjwz1572nfnyax1i2bwawfkz2ab34xlwcr0y";
rev = "b665ea59600f91afe87b8665faec8155c09420f8";
sha256 = "0s6n2dsbvr4qr79g8bcil8r80q931m4w6wp7qf4y2lxasjmnnf5g";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
};
@ -3504,12 +3516,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls-nvim";
version = "2021-08-04";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "bbaf11b0104f921348a1e8f8a9f211c86e6867e1";
sha256 = "15vkqy1nf0yi6y94npzlqncblh2h4mlhji4wwsdlbk86c493j4wj";
rev = "2f7407775d532b17c3a67a1d948ec910674cd8b0";
sha256 = "1jsrl0079jp0pfv4235b1ghhv911dlnrz0mshbbm8bby4jd3q3a4";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@ -3552,12 +3564,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-08-06";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "055e3f6c5f643792f8f9b7308129a4c24b04d711";
sha256 = "0cr0d64wjnhrcxgq7x720vlk4fb46qn3pknyh22gangnpnvlc3zi";
rev = "50fec950de31edc84bb7799b6a692a187037c03b";
sha256 = "05gs9zws4g3y3nn5xyqd4j145f37j8ibax3lrash100jr2v7m8h6";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -3864,12 +3876,12 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
version = "2021-08-02";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "7bed04718e146787c54784853817797258703f0a";
sha256 = "1g1vb9kgc13mqji3yrd4wjpryrvf605yf251k6gfkpnaz0mhzlz9";
rev = "e5a534f51ba65e3a28742b640b6b4702726189a5";
sha256 = "1m4sal8wz7z05kvim2c08clzqcqvzfw7jz8dmyk41nllpg2kppqr";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
@ -3960,12 +3972,12 @@ final: prev:
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2021-08-04";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
rev = "64389d5956df699c9c671e00818cc4039edb7dd9";
sha256 = "0q72jsyldpk9x3whjh8pggiscrir614zl9d65cbzrlklmmpif6d6";
rev = "faa2ef217b18208a43537446b99dca9071eda52e";
sha256 = "156g1lfqxqdiiqsdscn6kx9rm0s689k8vrnmq6vv06a74fpz345x";
};
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
};
@ -4911,12 +4923,12 @@ final: prev:
sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim";
version = "2021-08-05";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "tami5";
repo = "sql.nvim";
rev = "527a306000c02f81075045d461349efcfa26c022";
sha256 = "1v99ibx1ypijpm1icy0lsyfvf41rz0zhv18rvhrinyphr0jl546j";
rev = "58db9ca9d92618af78440e05bc5fc2dac9311fcd";
sha256 = "0wxgl7w2qp24ggq4z6s58jpw7cv1qlbxks7sc8vkfsyiyy5b89xl";
};
meta.homepage = "https://github.com/tami5/sql.nvim/";
};
@ -5225,12 +5237,12 @@ final: prev:
telescope-symbols-nvim = buildVimPluginFrom2Nix {
pname = "telescope-symbols-nvim";
version = "2021-06-15";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-symbols.nvim";
rev = "e211b6aeed1f94ca660c407f3052f83ab8f4b2a9";
sha256 = "0nd02akh5nmcnv8mqih6xpzc4pbhys6rva7v60p38kxx50ycfkvw";
rev = "d2d7d6b4298a1f733649526661d872c5e7a75521";
sha256 = "0jxnalhfgmnllwb38a9dgzrnrhdnxgcbi2p7m4jk5p87260a9gvk";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/";
};
@ -6126,12 +6138,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-08-06";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "cf229cd88ecf9ee9e157d6737770b289de24d3bd";
sha256 = "06cn9z7p39qvp34533azj2xc3jyj6bi8kb4aasq52awizdg3flvz";
rev = "dffb352d5f49792a4df5653d7adab07a1c688928";
sha256 = "1rqm6wsdpx5n6l4kkrxm8bw2837mm63b5n1igq1v4ji5zbjz6si2";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -6910,8 +6922,8 @@ final: prev:
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "2dc08dfe354ed5400f5cdb3d5009dcd4024aac8a";
sha256 = "0h08crkfjjcrh3amp9if0xx2811larygldvd5m9vywnaxssm4rg5";
rev = "55382eb722407daaebe1db1f7f7ed99d99302cf5";
sha256 = "0nxcv69sicgbsns6x0ld9z33mlg2kv3dggvln1i99a0ljxr4p8xm";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -8193,12 +8205,12 @@ final: prev:
vim-oscyank = buildVimPluginFrom2Nix {
pname = "vim-oscyank";
version = "2021-05-21";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "ojroques";
repo = "vim-oscyank";
rev = "20fade09069cd35602387c2e7d2a7cd0f6cff8b0";
sha256 = "1ym87hd85l67976dxk919mdwab8fi8iq8azqk4mpa75gzl2ia7wl";
rev = "e2a6ec4fb91b38591445bdaa9972f54653dbcd49";
sha256 = "031xy0h9a55ijfq6ni237x4xl2ywbwm3ad0r0h05dj8g1352s1vr";
};
meta.homepage = "https://github.com/ojroques/vim-oscyank/";
};
@ -9622,12 +9634,12 @@ final: prev:
vim-xkbswitch = buildVimPluginFrom2Nix {
pname = "vim-xkbswitch";
version = "2021-07-12";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "lyokha";
repo = "vim-xkbswitch";
rev = "df53e9c5fce91a84e1d6e8722956a01595d16c40";
sha256 = "0zndnmdmxlr6114d29sc1q8fc0s2zlsrj1v28gp0sgnim1rmavfp";
rev = "825dfeee28f5331f68de0eeb512775127ab4cae9";
sha256 = "0d7aav979sqc1pk5k2nmf13n8lgdsrc6hq5r2hx0r77z4bc42wms";
};
meta.homepage = "https://github.com/lyokha/vim-xkbswitch/";
};
@ -9959,12 +9971,12 @@ final: prev:
wilder-nvim = buildVimPluginFrom2Nix {
pname = "wilder-nvim";
version = "2021-08-02";
version = "2021-08-07";
src = fetchFromGitHub {
owner = "gelguy";
repo = "wilder.nvim";
rev = "a8a2feda01b8d498b49ef133f648297959de2fa8";
sha256 = "0sbcgv6zw9i7mv8plv7kr14zpvd24wlbgpx1k0hdfs3wbb8md9ya";
rev = "719e83269062b7421a4e82f3d77263915b12d452";
sha256 = "0qd66h72v4n8w9xh1dziihqhly44yn31r12a8pb19qy1fgqmrp78";
};
meta.homepage = "https://github.com/gelguy/wilder.nvim/";
};

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -597,6 +597,7 @@ RRethy/nvim-base16
RRethy/vim-hexokinase
RRethy/vim-illuminate
rstacruz/vim-closer
ruifm/gitlinker.nvim
rust-lang/rust.vim
ryanoasis/vim-devicons
ryvnf/readline.vim

17
pkgs/misc/vscode-extensions/rust-analyzer/default.nix
View File

@ -1,6 +1,11 @@
# Update script: pkgs/development/tools/rust/rust-analyzer/update.sh
{ lib, vscode-utils, jq, rust-analyzer, nodePackages
{ lib
, vscode-utils
, jq
, rust-analyzer
, nodePackages
, setDefaultServerPath ? true
, moreutils
}:
let
@ -24,19 +29,19 @@ let
'';
};
in vscode-utils.buildVscodeExtension {
in
vscode-utils.buildVscodeExtension {
inherit version vsix;
name = "${pname}-${version}";
src = "${vsix}/${pname}.zip";
vscodeExtUniqueId = "${publisher}.${pname}";
nativeBuildInputs = lib.optional setDefaultServerPath jq;
nativeBuildInputs = lib.optionals setDefaultServerPath [ jq moreutils ];
preInstall = lib.optionalString setDefaultServerPath ''
jq '.contributes.configuration.properties."rust-analyzer.serverPath".default = $s' \
jq '.contributes.configuration.properties."rust-analyzer.server.path".default = $s' \
--arg s "${rust-analyzer}/bin/rust-analyzer" \
package.json >package.json.new
mv package.json.new package.json
package.json | sponge package.json
'';
meta = with lib; {

14
pkgs/os-specific/linux/blktrace/default.nix
View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchurl, libaio }:
stdenv.mkDerivation {
name = "blktrace-1.3.0";
stdenv.mkDerivation rec {
pname = "blktrace";
version = "1.3.0";
# Official source
# "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git"
src = fetchurl {
url = "http://brick.kernel.dk/snaps/blktrace-1.3.0.tar.bz2";
url = "https://brick.kernel.dk/snaps/blktrace-${version}.tar.bz2";
sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY=";
};
@ -16,9 +17,10 @@ stdenv.mkDerivation {
sed s,/usr/local,$out, -i Makefile
'';
meta = {
meta = with lib; {
description = "Block layer IO tracing mechanism";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with maintainers; [ ];
license = licenses.gpl2;
platforms = platforms.linux;
};
}

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

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.13.7";
version = "5.13.8";
release = "1";
suffix = "xanmod${release}-cacule";
in
@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-6SppDriZWzLu6Qye1e6ciiE+Ro63vDyabxfgWS/PTSo=";
sha256 = "sha256-VZ8Rbbh0FXKXrN5k1oRqGoYEXiAJjwN8GOJFVoRxE+c=";
};
structuredExtraConfig = with lib.kernel; {
@ -48,7 +48,7 @@ buildLinux (args // rec {
extraMeta = {
branch = "5.13-cacule";
maintainers = with lib.maintainers; [ fortuneteller2k ];
maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault ];
description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
broken = stdenv.isAarch64;
};

6
pkgs/servers/headscale/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "headscale";
version = "0.4.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
sha256 = "sha256-0fa6V85NwURwsW1Mk1eMPtOWNqTe7x9BSuoCUrSJ/s8=";
sha256 = "sha256-CYqtGTKOuQDpPOWwixRaczBOkIrYE1tdIieaxuvyqQo=";
};
vendorSha256 = "sha256-3cGvp9hnajNJtvDn4K6fkCzLYrEFXQk9ZhQ4n+WnQEo=";
vendorSha256 = "sha256-UIBH6Pf2mmXBsdFW0RRvedLQhonNsrl4j2fxxRtum4M=";
# Ldflags are same as build target in the project's Makefile
# https://github.com/juanfont/headscale/blob/main/Makefile

6
pkgs/servers/livepeer/default.nix
View File

@ -4,16 +4,16 @@
buildGoModule rec {
pname = "livepeer";
version = "0.5.14";
version = "0.5.15";
runVend = true;
vendorSha256 = "sha256-StkgU11VLEKg89kn3zPcdC8HBw9MmJrfDPGk1SUQO64=";
vendorSha256 = "sha256-PhkdbixJDA9Ym4cK5ALIYJgDQnO5GTbZ0XGsVHcvYYQ=";
src = fetchFromGitHub {
owner = "livepeer";
repo = "go-livepeer";
rev = "v${version}";
sha256 = "sha256-GxgpGI1ymhbYhzCP2Bs5wJ5kq5rHHkClXcAsYlaQ/AM=";
sha256 = "sha256-ZB80QssqN9SBpmYk/QgPRVF88qedmNeUG+EkjxWz4rQ=";
};
# livepeer_cli has a vendoring problem

4
pkgs/servers/mail/postsrsd/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "postsrsd";
version = "1.10";
version = "1.11";
src = fetchFromGitHub {
owner = "roehling";
repo = "postsrsd";
rev = version;
sha256 = "sha256-AqOHHOnGqOnIw5hPPiJjUJFiwngTux7gwn8qig0t7hs=";
sha256 = "sha256-M1VtH+AToLh9J4zwIznInfFJzqmKElTvqAgI+qqL+Lw=";
};
cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ];

21
pkgs/servers/monitoring/loki/default.nix
View File

@ -8,14 +8,14 @@
}:
buildGoModule rec {
version = "2.2.1";
version = "2.3.0";
pname = "grafana-loki";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "loki";
sha256 = "sha256-ujZD5GIgMewvEQW3Wnt0eHdMIFs77PkkEecgCDw9290=";
sha256 = "sha256-Cxg3VRF4p/Kb6LyreGV0g+zPr15wplritSZgkbTiDI0=";
};
vendorSha256 = null;
@ -24,7 +24,7 @@ buildGoModule rec {
# TODO split every executable into its own package
"cmd/loki"
"cmd/loki-canary"
"cmd/promtail"
"clients/cmd/promtail"
"cmd/logcli"
];
@ -38,16 +38,21 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests) loki; };
buildFlagsArray = let t = "github.com/grafana/loki/pkg/build"; in
''
-ldflags=-s -w -X ${t}.Version=${version} -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown -X ${t}.Branch=unknown -X ${t}.Revision=unknown
'';
ldflags = let t = "github.com/grafana/loki/pkg/util/build"; in [
"-s"
"-w"
"-X ${t}.Version=${version}"
"-X ${t}.BuildUser=nix@nixpkgs"
"-X ${t}.BuildDate=unknown"
"-X ${t}.Branch=unknown"
"-X ${t}.Revision=unknown"
];
doCheck = true;
meta = with lib; {
description = "Like Prometheus, but for logs";
license = licenses.asl20;
license = with licenses; [ agpl3Only asl20 ];
homepage = "https://grafana.com/oss/loki/";
maintainers = with maintainers; [ willibutz globin mmahut ];
platforms = platforms.unix;

20
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -47,21 +47,19 @@ buildGoModule rec {
ln -s ${webui} web/ui/static/react
'';
buildFlags = "-tags=builtinassets";
buildFlagsArray =
tags = [ "builtinassets" ];
ldflags =
let
t = "${goPackagePath}/vendor/github.com/prometheus/common/version";
in
[
''
-ldflags=
-X ${t}.Version=${version}
-X ${t}.Revision=unknown
-X ${t}.Branch=unknown
-X ${t}.BuildUser=nix@nixpkgs
-X ${t}.BuildDate=unknown
-X ${t}.GoVersion=${lib.getVersion go}
''
"-X ${t}.Version=${version}"
"-X ${t}.Revision=unknown"
"-X ${t}.Branch=unknown"
"-X ${t}.BuildUser=nix@nixpkgs"
"-X ${t}.BuildDate=unknown"
"-X ${t}.GoVersion=${lib.getVersion go}"
];
# only run this in the real build, not during the vendor build

2
pkgs/servers/monitoring/prometheus/postfix-exporter.nix
View File

@ -18,7 +18,7 @@ buildGoPackage rec {
nativeBuildInputs = optional withSystemdSupport makeWrapper;
buildInputs = optional withSystemdSupport systemd;
buildFlags = optional (!withSystemdSupport) "-tags nosystemd";
tags = optional (!withSystemdSupport) "nosystemd";
goDeps = ./postfix-exporter-deps.nix;
extraSrcs = optionals withSystemdSupport [

74
pkgs/tools/admin/pulumi/data.nix
View File

@ -1,24 +1,24 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "3.6.0";
version = "3.9.0";
pulumiPkgs = {
x86_64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-linux-x64.tar.gz";
sha256 = "1phj65y1l6pllq5fyrxm7hrwg44jpzq1skq6dw7x6zrs8prnlj52";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.9.0-linux-x64.tar.gz";
sha256 = "0gxi3zi6scfl9d3b26q7i1f6z39q9npqgik0cgb178an0ygpk3w5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz";
sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-linux-amd64.tar.gz";
sha256 = "12fj43pcs64s0i6h05q94abbxi0r1rlh8qgycmmydr8wajsn2a54";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.14.0-linux-amd64.tar.gz";
sha256 = "0sk2qmyw7cchlyqrzq2ny516iq9qxh2ywiql8111c5ph2kx8m7az";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-linux-amd64.tar.gz";
sha256 = "1xvbkvhny8h5yl6gvlgzdp0cd8xv39sxm36bfszvx9133p6spvy4";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.3.0-linux-amd64.tar.gz";
sha256 = "1w626m38qr0qa9ccpb3f6wdggk3dridqh3jnx9z1zf6bdg2vspa1";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-linux-amd64.tar.gz";
@ -29,8 +29,8 @@
sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.4.1-linux-amd64.tar.gz";
sha256 = "1zng8w2jr76z9s95id9dnvw7skr4yd55xrvv9c053gpyh7wv7bhs";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.5.0-linux-amd64.tar.gz";
sha256 = "0pdizb132a7r9n07hqmhrz57hhpmggvgbnmcc87xlpbzc5b72sin";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz";
@ -41,8 +41,8 @@
sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-linux-amd64.tar.gz";
sha256 = "0h0dpbdc9rcagw0wgz5l6jjc8wl1hj5ki5shi44jyf4hz7l0yl9y";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.13.0-linux-amd64.tar.gz";
sha256 = "1xdldrsgh52lffbkxwc865qllr5sd9hsqksl55v0gm55acqh8jhd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz";
@ -53,12 +53,12 @@
sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-linux-amd64.tar.gz";
sha256 = "0al3578g7l9rvhkswlm56wpkybj6njj39a3g56in9882lhpqixsy";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.1-linux-amd64.tar.gz";
sha256 = "03475c9qhd5wb174xnzi84dj74zf1fy2i43d5b7911w09mdqrzb6";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-linux-amd64.tar.gz";
sha256 = "1zi6r1g7l56ra506hxkj8p9wlkgbmry7ir48v8wwdsfvplryj4sf";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.1-linux-amd64.tar.gz";
sha256 = "09jf18fmdvgnhx8nx5zbpyc8xgh0zr8w50z463vy4h62r3xyafs5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-linux-amd64.tar.gz";
@ -89,30 +89,30 @@
sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-linux-amd64.tar.gz";
sha256 = "0npszs37q6j1x5h2sp9j1c6qnhr03lxp2r2ci0d4z3x7vyk06rja";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.2.0-linux-amd64.tar.gz";
sha256 = "1jvq530gz7bjcljlb3y6yvgfj1fgksgcxs48vl2j6xzyl6y56f6g";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.0-linux-amd64.tar.gz";
sha256 = "09vf4jddy7bys6x2vw7cyq5ylnwb43rr3ysk3vvi5czpbb8fa86k";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-amd64.tar.gz";
sha256 = "0xrq4ffkaa0z5w2g7b9fdll3sh8wpzd6fg0xay7hfzjnl65dl3mp";
}
];
x86_64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-darwin-x64.tar.gz";
sha256 = "0yql94y78q0hfsxfsgvkxs7dv2lgrkv4ypm59qjr8l04krcknbmm";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.9.0-darwin-x64.tar.gz";
sha256 = "11smw4vy4pzy56smw2mkdaxs2ymkgq9zkhrlq512nx4xh3z46aiv";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz";
sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-darwin-amd64.tar.gz";
sha256 = "0zv4b7nyvz7h0h0jxndd7dxzf4risgqyl7f20cbbcsixxk90sz38";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.14.0-darwin-amd64.tar.gz";
sha256 = "1fdqp3lhqsm06crbwvyq5qbxy97n432mcnyqcrsd5202yyk6dzbs";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-darwin-amd64.tar.gz";
sha256 = "1h726ahb6mqzg83fl3m8wck5gz5hxczbpwmb5xl0yzz1m0s54czf";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.3.0-darwin-amd64.tar.gz";
sha256 = "1h5rvwy4mdb8566nj4hkxnfva77xrj33y7sxssk7y9gi6k0yx7qa";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-darwin-amd64.tar.gz";
@ -123,8 +123,8 @@
sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.4.1-darwin-amd64.tar.gz";
sha256 = "14kjmzmi5v5brz1cphpgr5k8clkr25vrc7wi8v36qmdhigv0kfbn";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.5.0-darwin-amd64.tar.gz";
sha256 = "0ww91jbi9z8qf0n820h6bx60x2jp4hvwy0aazw37392aczz1kz6d";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz";
@ -135,8 +135,8 @@
sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-darwin-amd64.tar.gz";
sha256 = "1k7yxajx3157qdanw1y11053k74rwlcvh828xrpwkzqszmzizxp9";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.13.0-darwin-amd64.tar.gz";
sha256 = "036msa4h2s5glyfh58kgnimzkiyq4m2k8vhq20wj5mgzpza4gp8v";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz";
@ -147,12 +147,12 @@
sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-darwin-amd64.tar.gz";
sha256 = "1fgh7q7sivip212q2zgvrgg3lwxrzasm9vpa858168fvjv67ylbc";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.1-darwin-amd64.tar.gz";
sha256 = "02pfb2j5wsvz0mc99sqpv7fkg00drdmi8bwzvwkg3gr1kqlgvjbv";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-darwin-amd64.tar.gz";
sha256 = "0cl8wg5g78c147pqy5q52qq9bd7hw8zgvfmdafszwzwz6xh1051b";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.1-darwin-amd64.tar.gz";
sha256 = "1ddz2lh8sz4zy5dzwxnzq32ln9y24dx1b8pvkx8h66z3n0dwa368";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-darwin-amd64.tar.gz";
@ -183,12 +183,12 @@
sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-darwin-amd64.tar.gz";
sha256 = "0nasbip85f1xjp6dfibw0nh133gf9cy5n4gdqnv5759bg92am7kg";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.2.0-darwin-amd64.tar.gz";
sha256 = "0cg806zpax6q69nr9gdnj00i5lqfh5ljs62181m8jrpczdaryxcn";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.0-darwin-amd64.tar.gz";
sha256 = "09m0p5k8gkz37193vj1kwkdwbcvv04cwangwbp5xcn3c20q467xb";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-amd64.tar.gz";
sha256 = "1qb2gaiinclmbswyn5aakwjmm3gaggscckb1q2syx69k42hvp3s3";
}
];
};

18
pkgs/tools/admin/pulumi/update.sh
View File

@ -3,24 +3,24 @@
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
VERSION="3.6.0"
VERSION="3.9.0"
# Grab latest release ${VERSION} from
# https://github.com/pulumi/pulumi-${NAME}/releases
plugins=(
"auth0=2.2.0"
"aws=4.10.0"
"cloudflare=3.2.0"
"aws=4.14.0"
"cloudflare=3.3.0"
"consul=3.2.0"
"datadog=3.3.0"
"digitalocean=4.4.1"
"digitalocean=4.5.0"
"docker=3.0.0"
"equinix-metal=2.0.0"
"gcp=5.11.0"
"gcp=5.13.0"
"github=4.2.0"
"gitlab=4.1.0"
"hcloud=1.1.0"
"kubernetes=3.5.0"
"hcloud=1.1.1"
"kubernetes=3.5.1"
"linode=3.2.0"
"mailgun=3.1.0"
"mysql=3.0.0"
@ -28,8 +28,8 @@ plugins=(
"packet=3.2.2"
"postgresql=3.1.0"
"random=4.2.0"
"vault=4.1.0"
"vsphere=4.0.0"
"vault=4.2.0"
"vsphere=4.0.1"
)
function genMainSrc() {

4
pkgs/tools/filesystems/gcsfuse/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
version = "0.35.1";
version = "0.36.0";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
sha256 = "sha256-A6vhdECKMq0kcR7mUTPu9F0N7gVj7tOg7UXeJ/gmbnM=";
sha256 = "sha256-qsvHqSvMG7VwRtNmyun2oO+ZRZ1D1spefTeUXrWGSNk=";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";

7
pkgs/tools/games/ajour/default.nix
View File

@ -34,16 +34,16 @@ let
in rustPlatform.buildRustPackage rec {
pname = "Ajour";
version = "1.2.5";
version = "1.3.0";
src = fetchFromGitHub {
owner = "casperstorm";
repo = "ajour";
rev = version;
sha256 = "sha256-Jn+CCUUGVa6YTD3af4bkY1wlJ4gAPOzxOwgfNx6VHL0=";
sha256 = "sha256-nz54KPvPmrFGXB52Jn6LKl1aSYgLngARcfC7YIAaC70=";
};
cargoSha256 = "sha256-7XMcZHezqk4g7FPgFCnMhbjJsJE8QkfzbtujUsV7GUw=";
cargoSha256 = "sha256-nsuo8PdQpdVJcDY8VDCLISnOz5+Z+MqG/OJC3FYCfEo=";
nativeBuildInputs = [
autoPatchelfHook
@ -59,6 +59,7 @@ in rustPlatform.buildRustPackage rec {
openssl
libxcb
libX11
libxkbcommon
];
fixupPhase = ''

4
pkgs/tools/graphics/agi/default.nix
View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "agi";
version = "2.1.0-dev-20210729";
version = "2.1.0-dev-20210804";
src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
sha256 = "sha256-CrGZf+EiJfgPYOdz7NYSc6B/hpVpgNMCdRl1jd/nJ2o=";
sha256 = "sha256-ptxESGdgGus4ZfCvpOYCcURdPSLZEFq3iYy/MmetJCU=";
};
nativeBuildInputs = [

4
pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ibus-bamboo";
version = "0.6.9";
version = "0.7.0";
src = fetchFromGitHub {
owner = "BambooEngine";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7UXURvZX5UrpLHFYgBnuTX/sKQkubnBlvkSD/WBa4ZU=";
sha256 = "sha256-WKNDrm8PSU/F8MzpVsJ9oUkbolCxrwbjOZYYNiFr5Qs=";
};
nativeBuildInputs = [

8
pkgs/tools/networking/boundary/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
version = "0.4.0";
version = "0.5.0";
src =
let
@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
x86_64-darwin = "darwin_amd64";
};
sha256 = selectSystem {
x86_64-linux = "sha256-xHvg2Kdm7hoJ7Dwh4pLXJE+EPcl9Zta/00IN3wRnOzU=";
aarch64-linux = "sha256-Kbr7tZjVcYiejy1CB9r10mqG+0serRx+mjPXds2/TJQ=";
x86_64-darwin = "sha256-a8e3gKTTsK5QRAYrB4/DtrFFGM2In73wKEcEMcbeUTI=";
x86_64-linux = "sha256-5ggbM6Ev4TkpyG0yPGCh22QSqefyO32Q2k2kthHgkTc=";
aarch64-linux = "sha256-oboMI2OxemIEX+IcBkN/DoACGXzyxsxHg4OD3ugbLR0=";
x86_64-darwin = "sha256-dpSI7I37vChljHSV0mwUDymngIFoQ5sWAszJ9MePMG8=";
};
in
fetchzip {

4
pkgs/tools/networking/inadyn/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "inadyn";
version = "2.7";
version = "2.8.1";
src = fetchFromGitHub {
owner = "troglobit";
repo = "inadyn";
rev = "v${version}";
sha256 = "00jhayx0hfl9dw78d58bdxa5390bvxq73lz26q9h1gg1xw76adan";
sha256 = "sha256-kr9xh7HMikargi0hhj3epH2c6R5lN4qD9nDaChNI4Kg=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

6
pkgs/tools/security/keybase/gui.nix
View File

@ -4,17 +4,17 @@
, runtimeShell, gsettings-desktop-schemas }:
let
versionSuffix = "20210125164223.f3b21527b9";
versionSuffix = "20210623205749.763227b4c6";
in
stdenv.mkDerivation rec {
pname = "keybase-gui";
version = "5.6.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
version = "5.7.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
sha256 = "12ckfd02j0f3p3pdlwc640f61z1wzblf2414h6fkf5vzd289h35p";
sha256 = "0ajpkidbzfwhi7q018wriws0n3amcy9g3mfiqm13cpz0q6vkjx83";
};
nativeBuildInputs = [

4
pkgs/tools/text/ledger2beancount/default.nix
View File

@ -17,13 +17,13 @@ let
in stdenv.mkDerivation rec {
pname = "ledger2beancount";
version = "2.5";
version = "2.6";
src = fetchFromGitHub {
owner = "beancount";
repo = "ledger2beancount";
rev = version;
sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99";
sha256 = "sha256-0Br+zuSUYrNP+ZL/FtNoaYoYBYho5kVfxu0tqKJSuBk=";
};
dontBuild = true;

4
pkgs/tools/typesetting/lowdown/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lowdown";
version = "0.8.5";
version = "0.8.6";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
sha512 = "0gvrjxvizpxm5xvw8v2jygmx244wdl9n75qxz4chqbzkwshk4gwscz38p7sq9qlsbq8jmnv4l095a9dl9b836kym38hh1bvzmdiflar";
sha512 = "3lvy23zg0hpixrf06g8hh15h2c9wwa0wa95vh2hp924kdi2akqcp2i313chycx1cmmg379w4v80ha2726ala69zxzk42y6djc8vm3xd";
};
nativeBuildInputs = [ which ]

19
pkgs/top-level/all-packages.nix
View File

@ -11926,14 +11926,10 @@ in
mint = callPackage ../development/compilers/mint { };
mitscheme = callPackage ../development/compilers/mit-scheme {
texLive = texlive.combine { inherit (texlive) scheme-small; };
texinfo = texinfo5;
xlibsWrapper = null;
texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; };
};
mitschemeX11 = mitscheme.override {
texLive = texlive.combine { inherit (texlive) scheme-small; };
texinfo = texinfo5;
enableX11 = true;
};
@ -11972,7 +11968,7 @@ in
roslyn = callPackage ../development/compilers/roslyn { };
msbuild = callPackage ../development/tools/build-managers/msbuild { };
msbuild = callPackage ../development/tools/build-managers/msbuild { dotnet-sdk = dotnet-sdk_5; };
mosml = callPackage ../development/compilers/mosml { };
@ -19732,7 +19728,7 @@ in
grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
grafana-loki = callPackage ../servers/monitoring/loki {
buildGoModule = buildGo115Module;
buildGoModule = buildGo116Module;
};
grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };
@ -21550,12 +21546,17 @@ in
inherit name src;
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ];
postPatch = ''
patchShebangs scripts/
'';
buildPhase = ''
(
set -x
make \
ARCH=${stdenv.hostPlatform.linuxArch} \
HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \
${makeTarget}
)
'';
installPhase = ''
cp .config $out
@ -26223,6 +26224,8 @@ in
yambar = callPackage ../applications/misc/yambar { };
yambar-wayland = callPackage ../applications/misc/yambar { waylandSupport = true; };
polyphone = libsForQt514.callPackage ../applications/audio/polyphone { };
portfolio = callPackage ../applications/office/portfolio {
@ -32640,7 +32643,7 @@ in
stdenv = crossLibcStdenv;
};
omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { };
omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { dotnet-sdk = dotnet-sdk_5; };
wasmtime = callPackage ../development/interpreters/wasmtime {};

9
pkgs/top-level/python-packages.nix
View File

@ -3944,10 +3944,9 @@ in {
kmapper = callPackage ../development/python-modules/kmapper { };
kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx {
inherit (pkgs.kmsxx) stdenv;
kmsxx = toPythonModule (pkgs.kmsxx.override {
withPython = true;
}).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; }));
});
knack = callPackage ../development/python-modules/knack { };
@ -4414,7 +4413,7 @@ in {
maya = callPackage ../development/python-modules/maya { };
mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {
inherit buildPythonPackage isPy27 fetchPypi;
inherit buildPythonPackage pythonOlder fetchPypi;
inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5;
};
@ -8803,6 +8802,8 @@ in {
# Used by streamlit, graphite_beacon, 2021-01-29
tornado_5 = callPackage ../development/python-modules/tornado/5.nix { };
torrequest = callPackage ../development/python-modules/torrequest { };
total-connect-client = callPackage ../development/python-modules/total-connect-client { };
towncrier = callPackage ../development/python-modules/towncrier {