gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2021-09-04 00:06:04 +00:00
committed by GitHub
parent 796d31ab22 8ae687b26b
commit 91c17290ed
70 changed files with 852 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+12
View File
@@ -80,6 +80,12 @@
githubId = 791309;
name = "Jan Hrnko";
};
_1000teslas = {
name = "Kevin Tran";
email = "47207223+1000teslas@users.noreply.github.com";
github = "1000teslas";
githubId = 47207223;
};
_3699n = {
email = "nicholas@nvk.pm";
github = "3699n";
@@ -3621,6 +3627,12 @@
fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672";
}];
};
flexagoon = {
email = "flexagoon@pm.me";
github = "flexagoon";
githubId = 66178592;
name = "Pavel Zolotarevskiy";
};
flexw = {
email = "felix.weilbach@t-online.de";
github = "FlexW";
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+7
View File
@@ -214,6 +214,13 @@
<link xlink:href="options.html#opt-services.soju.enable">services.soju</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://nats.io/">nats</link>, a high
performance cloud and edge messaging system. Available as
<link linkend="opt-services.nats.enable">services.nats</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-incompatibilities">
nixos/doc/manual/release-notes/rl-2111.section.md
+2
View File
@@ -65,6 +65,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable
- [soju](https://sr.ht/~emersion/soju), a user-friendly IRC bouncer. Available as [services.soju](options.html#opt-services.soju.enable).
- [nats](https://nats.io/), a high performance cloud and edge messaging system. Available as [services.nats](#opt-services.nats.enable).
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
nixos/modules/misc/crashdump.nix
+1 -1
View File
@@ -50,7 +50,7 @@ in
boot = {
postBootCommands = ''
echo "loading crashdump kernel...";
${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \
${pkgs.kexec-tools}/sbin/kexec -p /run/current-system/kernel \
--initrd=/run/current-system/initrd \
--reset-vga --console-vga \
--command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"
nixos/modules/services/misc/matrix-synapse.nix
+3 -2
View File
@@ -221,9 +221,10 @@ in {
default = config.networking.hostName;
description = ''
The domain name of the server, with optional explicit port.
This is used by remote servers to connect to this server,
e.g. matrix.org, localhost:8080, etc.
This is used by remote servers to look up the server address.
This is also the last part of your UserID.
The server_name cannot be changed later so it is important to configure this correctly before you start Synapse.
'';
};
public_baseurl = mkOption {
nixos/modules/system/boot/kexec.nix
+3 -3
View File
@@ -1,8 +1,8 @@
{ pkgs, lib, ... }:
{
config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexectools) {
environment.systemPackages = [ pkgs.kexectools ];
config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools) {
environment.systemPackages = [ pkgs.kexec-tools ];
systemd.services.prepare-kexec =
{ description = "Preparation for kexec";
@@ -10,7 +10,7 @@
before = [ "systemd-kexec.service" ];
unitConfig.DefaultDependencies = false;
serviceConfig.Type = "oneshot";
path = [ pkgs.kexectools ];
path = [ pkgs.kexec-tools ];
script =
''
# Don't load the current system profile if we already have a kernel loaded
pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
trivialBuild rec {
pname = "ebuild-mode";
version = "1.52";
version = "1.53";
src = fetchurl {
url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
sha256 = "10nikbbwh612qlnms2i31963a0h3ccyg85vrxlizdpsqs4cjpg6h";
sha256 = "1l740qp71df9ids0c49kvp942rk8k1rfkg1hyv7ysfns5shk7b9l";
};
meta = with lib; {
pkgs/applications/editors/vscode/generic.nix
+8 -1
View File
@@ -1,7 +1,7 @@
{ stdenv, lib, makeDesktopItem
, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu, buildFHSUserEnvBubblewrap
, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap
, writeShellScriptBin
# Populate passthru.tests
@@ -101,6 +101,13 @@ let
runHook postInstall
'';
preFixup = ''
gappsWrapperArgs+=(
# Add gio to PATH so that moving files to the trash works when not using a desktop environment
--prefix PATH : ${glib.bin}/bin
)
'';
inherit meta;
};
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.15.0"; # Please backport all updates to the stable channel.
version = "5.16.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0cbz2l31cg87n6qlbvwdjy92q9qgmmkrsvaj37cc34ajh7asd833";
sha256 = "1na5ja68h14smfwxrli1kfr6fhf5dshyvcdaj0c4mwms838bdl4j";
};
nativeBuildInputs = [
pkgs/applications/networking/mailreaders/thunderbird/D124361.diff
+22
View File
@@ -0,0 +1,22 @@
diff --git a/comm/mail/config/mozconfigs/common b/comm/mail/config/mozconfigs/common
--- a/comm/mail/config/mozconfigs/common
+++ b/comm/mail/config/mozconfigs/common
@@ -1,6 +1,3 @@
ac_add_options --enable-application=comm/mail
-# Disable enforcing that add-ons are signed by the trusted root.
-MOZ_REQUIRE_SIGNING=
-
. "$topsrcdir/build/mozconfig.common.override"
diff --git a/comm/mail/moz.configure b/comm/mail/moz.configure
--- a/comm/mail/moz.configure
+++ b/comm/mail/moz.configure
@@ -12,6 +12,7 @@
imply_option("MOZ_CRASHREPORTER_URL", "https://crash-reports.thunderbird.net/")
imply_option("--enable-default-browser-agent", False)
+imply_option("MOZ_REQUIRE_SIGNING", False)
@depends(target_is_windows, target_is_linux)
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+6
View File
@@ -19,6 +19,12 @@ rec {
};
patches = [
./no-buildconfig-90.patch
# There is a bug in Thunderbird 91 where add-ons are required
# to be signed when the build is run with default settings.
# https://bugzilla.mozilla.org/show_bug.cgi?id=1727113
# https://phabricator.services.mozilla.com/D124361
./D124361.diff
];
meta = with lib; {
pkgs/applications/version-management/gitea/default.nix
+2 -2
View File
@@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.15.0";
version = "1.15.2";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-Wu5rtVoQql/0XWkszYOqE4QJxKUY/CsCpmjkaB+E6Hc=";
sha256 = "sha256-zvWJ1Q8nJw4hjPeBnuVprjn2NSlFwv4BwtHwgwHHvSI=";
};
unpackPhase = ''
pkgs/desktops/gnome/extensions/collisions.json
+33
View File
@@ -16,6 +16,18 @@
"Fuzzy_Clock@dallagi",
"fuzzy-clock@keepawayfromfire.co.uk"
],
"hide-activities-button": [
"Hide_Activities@shay.shayel.org",
"hide-activities-button@nmingori.gnome-shell-extensions.org"
],
"shutdowntimer": [
"ShutdownTimer@neumann",
"ShutdownTimer@deminder"
],
"noannoyance": [
"noannoyance@sindex.com",
"noannoyance@daase.net"
],
"transparent-window": [
"transparent-window@pbxqdown.github.com",
"transparentwindows.mdirshad07"
@@ -23,6 +35,10 @@
"floating-dock": [
"floatingDock@sun.wxg@gmail.com",
"floating-dock@nandoferreira_prof@hotmail.com"
],
"gnome-trash": [
"gnome-trash@gnome-trash.b00f.gitlab.com",
"gnome-trash@b00f.github.io"
]
},
"40": {
@@ -37,6 +53,23 @@
"lock-keys": [
"lockkeys@vaina.lt",
"lockkeys@fawtytoo"
],
"hide-activities-button": [
"Hide_Activities@shay.shayel.org",
"hide-activities-button@nmingori.gnome-shell-extensions.org"
],
"shutdowntimer": [
"ShutdownTimer@neumann",
"shutdown-timer-gnome-shell-extension",
"ShutdownTimer@deminder"
],
"noannoyance": [
"noannoyance@sindex.com",
"noannoyance@daase.net"
],
"extension-list": [
"extension-list@tu.berry",
"screen-lock@garciabaameiro.com"
]
}
}
pkgs/desktops/gnome/extensions/extensionRenames.nix
+16 -1
View File
@@ -16,6 +16,22 @@
"system-monitor@paradoxxx.zero.gmail.com" = "system-monitor"; # manually packaged
"System_Monitor@bghome.gmail.com" = "system-monitor-2";
"Hide_Activities@shay.shayel.org" = "hide-activities-button";
"hide-activities-button@nmingori.gnome-shell-extensions.org" = "hide-activities-button-2";
# At the moment, ShutdownTimer@deminder is a fork of ShutdownTimer@neumann which adds new features
# there seem to be upstream plans, so this should be checked periodically:
# https://github.com/Deminder/ShutdownTimer https://github.com/neumann-d/ShutdownTimer/pull/46
"ShutdownTimer@neumann" = null;
"shutdown-timer-gnome-shell-extension" = "shutdowntimer-2";
"ShutdownTimer@deminder" = "shutdowntimer";
"noannoyance@sindex.com" = "noannoyance";
"noannoyance@daase.net" = "noannoyance-2";
"extension-list@tu.berry" = "extension-list";
"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug
# ############################################################################
# These are conflicts for 3.38 extensions. They will very probably come back
@@ -32,7 +48,6 @@
#"flypie@schneegans.github.com" = null;
# ############################################################################
# Overrides for extensions that were manually packaged in the past but are gradually
# being replaced by automatic packaging where possible.
pkgs/desktops/gnome/extensions/extensions.json
+227 -148
View File
File diff suppressed because one or more lines are too long
pkgs/development/compilers/llvm/13/compiler-rt/default.nix
+2
View File
@@ -110,5 +110,7 @@ stdenv.mkDerivation {
# "All of the code in the compiler-rt project is dual licensed under the MIT
# license and the UIUC License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
# TODO/FIXME: Build fails on Hydra:
broken = stdenv.isAarch64;
};
}
pkgs/development/interpreters/erlang/R24.nix
+2 -2
View File
@@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "24.0.5";
sha256 = "4ZyYcBhep67aPr8SY7JK/3YXD5Th8UcyjTP7UIZ5c5Q=";
version = "24.0.6";
sha256 = "0z01hkzf2y6lz20s2vkn4q874lb6n6j00jkbgk4gg60rhrmq904z";
}
pkgs/development/libraries/fftw/default.nix
+16 -1
View File
@@ -1,4 +1,15 @@
{ fetchurl, stdenv, lib, gfortran, llvmPackages ? null, precision ? "double", perl }:
{ fetchurl
, stdenv
, lib
, gfortran
, perl
, llvmPackages ? null
, precision ? "double"
, enableAvx ? stdenv.hostPlatform.avxSupport
, enableAvx2 ? stdenv.hostPlatform.avx2Support
, enableAvx512 ? stdenv.hostPlatform.avx512Support
, enableFma ? stdenv.hostPlatform.fmaSupport
}:
with lib;
@@ -40,6 +51,10 @@ stdenv.mkDerivation {
# all x86_64 have sse2
# however, not all float sizes fit
++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2"
++ optional enableAvx "--enable-avx"
++ optional enableAvx2 "--enable-avx2"
++ optional enableAvx512 "--enable-avx512"
++ optional enableFma "--enable-fma"
++ [ "--enable-openmp" ]
# doc generation causes Fortran wrapper generation which hard-codes gcc
++ optional (!withDoc) "--disable-doc";
pkgs/development/libraries/frei0r/default.nix
+15 -5
View File
@@ -1,16 +1,26 @@
{ lib, stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }:
{ lib, stdenv, fetchurl, fetchpatch, cairo, cmake, opencv, pcre, pkg-config }:
stdenv.mkDerivation rec {
pname = "frei0r-plugins";
version = "1.6.1";
version = "1.7.0";
src = fetchurl {
url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz";
sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
hash = "sha256-Gx/48Pm8I+7XJOlOmnwdjwJEv+M0JLtP5o5kYMCIUjo=";
};
nativeBuildInputs = [ autoconf pkg-config ];
buildInputs = [ cairo opencv ];
# A PR to add support for OpenCV 4 was merged in May 2020. This
# patch can be removed when a release beyond 1.7.0 is issued.
patches = [
(fetchpatch {
name = "opencv4-support.patch";
url = "https://github.com/dyne/frei0r/commit/c0c8eed79fc8abe6c9881a53d7391efb526a3064.patch";
sha256 = "sha256-qxUAui4EEBEj8M/SoyMUkj//KegMTTT6FTBDC/Chxz4=";
})
];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ cairo opencv pcre ];
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
for f in $out/lib/frei0r-1/*.so* ; do
pkgs/development/libraries/kddockwidgets/default.nix
+29
View File
@@ -0,0 +1,29 @@
{ lib
, mkDerivation
, fetchFromGitHub
, cmake
, qtbase
, qtx11extras
}:
mkDerivation rec {
pname = "KDDockWidgets";
version = "1.4.0";
src = fetchFromGitHub {
owner = "KDAB";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lgNRuRoJhBw0n/Hb58uxpa+4aXoOrK4bRldtIXYIKLI=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qtx11extras ];
meta = with lib; {
description = "KDAB's Dock Widget Framework for Qt";
homepage = "https://www.kdab.com/development-resources/qt-tools/kddockwidgets";
license = with licenses; [ gpl2Only gpl3Only ];
maintainers = with maintainers; [ _1000teslas ];
};
}
pkgs/development/libraries/libint/default.nix
+2 -1
View File
@@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool
, python3, perl, gmpxx, mpfr, boost, eigen, gfortran, cmake
, enableFMA ? false, enableFortran ? true
, enableFMA ? stdenv.hostPlatform.fmaSupport
, enableFortran ? true
}:
let
pkgs/development/libraries/rustc-demangle/add-Cargo.lock.patch
+73
View File
@@ -0,0 +1,73 @@
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..0268b3b
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,67 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "arbitrary"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "237430fd6ed3740afe94eefcc278ae21e050285be882804e0d6e8695f0c94691"
+
+[[package]]
+name = "cc"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+
+[[package]]
+name = "compiler_builtins"
+version = "0.1.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36a9a84a6e8b55dfefb04235e55edb2b9a2a18488fcae777a6bdaa6f06f1deb3"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.20"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "rustc-demangle-capi"
+version = "0.1.0"
+dependencies = [
+ "rustc-demangle",
+]
+
+[[package]]
+name = "rustc-demangle-fuzz"
+version = "0.0.0"
+dependencies = [
+ "libfuzzer-sys",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "rustc-std-workspace-core"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c"
pkgs/development/libraries/rustc-demangle/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ rustPlatform, fetchFromGitHub, rust, lib, stdenv }:
rustPlatform.buildRustPackage rec {
pname = "rustc-demangle";
version = "0.1.20";
src = fetchFromGitHub {
owner = "alexcrichton";
repo = pname;
rev = version;
sha256 = "sha256-elxclyuLmr3N66s+pR4/6OU98k1oXI2wKVJtzWPY8FI=";
};
cargoPatches = [
# generated using `cargo generate-lockfile` since repo is missing lockfile
./add-Cargo.lock.patch
];
cargoSha256 = "sha256-1tW5TOap5MstxTXAFij3IB8TIpI+FryEX9TXlVXjRl4=";
cargoBuildFlags = "-p rustc-demangle-capi";
postInstall = ''
mkdir -p $out/lib
cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib
cp -R crates/capi/include $out
'';
meta = with lib; {
description = "Rust symbol demangling";
homepage = "https://github.com/alexcrichton/rustc-demangle";
license = with licenses; [ asl20 mit ];
# upstream supports other platforms, but maintainer can only test on linux
platforms = platforms.linux;
maintainers = with maintainers; [ _1000teslas ];
};
}
pkgs/development/python-modules/azure-mgmt-compute/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "22.1.0";
version = "23.0.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "2aad414843aee0f54427f887f7536cc5155d6852728d44dfeef633ac52135fdc";
sha256 = "1eb26b965ba4049ddcf10d4f25818725fc03c491c3be76537d0d74ceb1146b04";
};
propagatedBuildInputs = [
pkgs/development/python-modules/certauth/default.nix
+39
View File
@@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyopenssl
, tldextract
, pytestCheckHook
, pytest-cov
}:
buildPythonPackage rec {
pname = "certauth";
version = "1.3.0";
src = fetchFromGitHub {
owner = "ikreymer";
repo = "certauth";
rev = "ad2bae5d40a9e45519fc1f2cd7678174bbc55b3d"; # Repo has no git tags
sha256 = "sha256-Rso5N0jb9k7bdorjPIUMNiZZPnzwbkxFNiTpsJ9pco0=";
};
propagatedBuildInputs = [
pyopenssl
tldextract
];
checkInputs = [
pytestCheckHook
pytest-cov
];
pythonImportsCheck = [ "certauth" ];
meta = with lib; {
description = "Simple CertificateAuthority and host certificate creation, useful for man-in-the-middle HTTPS proxy";
homepage = "https://github.com/ikreymer/certauth";
license = licenses.mit;
maintainers = with maintainers; [ Luflosi ];
};
}
pkgs/development/python-modules/cucumber-tag-expressions/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cucumber-tag-expressions";
version = "3.0.1";
version = "4.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "71823468f567726332b87f40530b27fc83b35daea6514f5cbb03f0533d96e5be";
sha256 = "83ce5fa87d1b37a690106aedf58a12d0d16758f38f73336f2c703e2bfe01d7db";
};
checkInputs = [ pytest pytest-html ];
pkgs/development/python-modules/dogpile.cache/default.nix
+2 -2
View File
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "dogpile.cache";
version = "1.1.3";
version = "1.1.4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "6f0bcf97c73bfec1a7bf14e5a248488cee00c2d494bf63f3789ea6d95a57c1cf";
sha256 = "ea09bebf24bb7c028caf98963785fe9ad0bd397305849a3303bc5380d468d813";
};
# Disable concurrency tests that often fail,
pkgs/development/python-modules/elasticsearch/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
buildPythonPackage (rec {
pname = "elasticsearch";
version = "7.14.0";
version = "7.14.1";
src = fetchPypi {
inherit pname version;
sha256 = "f3ab1454e646170bbc6796b8707e4bff125234391d2acc022221e1c0313becb4";
sha256 = "f928898fe06869516f2603f9a96a6f166c06888233806b31ac6568bac0266501";
};
# Check is disabled because running them destroy the content of the local cluster!
pkgs/development/python-modules/elementpath/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
buildPythonPackage rec {
version = "2.2.3";
version = "2.3.0";
pname = "elementpath";
disabled = isPy27; # uses incompatible class syntax
@@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "v${version}";
sha256 = "142w8xbxdvz6949nqd4malqijyxfcv917cls4lsv4x7164b4naf7";
sha256 = "1zghj0v1s03ahynx7sczag7iaam757ypwl1lm0ym6j37dnq8vnxk";
};
# avoid circular dependency with xmlschema which directly depends on this
pkgs/development/python-modules/eventlet/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "eventlet";
version = "0.31.1";
version = "0.32.0";
src = fetchPypi {
inherit pname version;
sha256 = "0xldgwjf9jkp28rn0pg0i32bg6m7pdh7dwgi0grcvqzs0iii5sdr";
sha256 = "2f0bb8ed0dc0ab21d683975d5d8ab3c054d588ce61def9faf7a465ee363e839b";
};
propagatedBuildInputs = [ dnspython greenlet monotonic six ]
pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
version = "3.4.0";
version = "3.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "2faca51e974c46203c09fd4cb2c03fd6e82cd572cc06a2bbc3b401aa419cb09f";
sha256 = "ad1bf9991bdee2a2fee44d19e54790a6eb900652841a5d7a32aa1c468a196f49";
};
propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ];
pkgs/development/python-modules/google-re2/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "google-re2";
version = "0.2.20210801";
version = "0.2.20210901";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0806d78691e67970b3761767a30f1c631fed85b87001266c6adcb672ac2c9beb";
sha256 = "676fa9ee54e3fb70f290526fc0f4d78d1e5a4add701b5547494eaf7c68c72247";
};
propagatedBuildInputs = [
pkgs/development/python-modules/mechanize/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "mechanize";
version = "0.4.5";
version = "0.4.6";
src = fetchPypi {
inherit pname version;
sha256 = "6355c11141f6d4b54a17fc2106944806b5db2711e60b120d15d83db438c333fd";
sha256 = "d16cea241253b5eb6380bf8a46627cad91d1f2c3f93a33279a31ce276d6c5d44";
};
propagatedBuildInputs = [ html5lib ];
pkgs/development/python-modules/mwparserfromhell/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "mwparserfromhell";
version = "0.6.2";
version = "0.6.3";
src = fetchPypi {
inherit pname version;
sha256 = "d3f74c0101f81ff73c61985b67f2e7048a30dc5f6a578ea1544e69133988d874";
sha256 = "1ad779f1bc0808d280ec1026c9de74f424de535568e21debd12830b5b0fa097e";
};
checkInputs = [
pkgs/development/python-modules/pefile/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pefile";
version = "2021.5.24";
version = "2021.9.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "erocarrera";
repo = pname;
rev = "v${version}";
sha256 = "0qdy88dvy29ixsyfqdcvf3w6rz09vpimk0568i09v1ayhs52p62k";
sha256 = "1pgsw84i9r6ydkfzqifgl5lvcz3cf3xz5c2543kl3q8mgb21wxaz";
};
nativeBuildInputs = [
pkgs/development/python-modules/protonup/default.nix
+29
View File
@@ -0,0 +1,29 @@
{ lib, buildPythonPackage, pythonOlder, fetchPypi, requests, configparser }:
buildPythonPackage rec {
pname = "protonup";
version = "0.1.4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0z5q0s9h51w2bqm9lkafml14g13v2dgm4nm9x06v7nxqc9msmyyy";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace "argparse" ""
'';
propagatedBuildInputs = [ requests configparser ];
doCheck = false; # protonup does not have any tests
pythonImportsCheck = [ "protonup" ];
meta = with lib; {
homepage = "https://github.com/AUNaseef/protonup";
description = "CLI program and API to automate the installation and update of GloriousEggroll's Proton-GE";
license = licenses.gpl3Only;
maintainers = with maintainers; [ flexagoon ];
};
}
pkgs/development/python-modules/pyacoustid/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pyacoustid";
version = "1.2.1";
version = "1.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "e62b2929fbc5ead508758d2f700f5d355f7d83d14f5efe33c1d4fc59cbdeba84";
sha256 = "c279d9c30a7f481f1420fc37db65833b5f9816cd364dc2acaa93a11c482d4141";
};
propagatedBuildInputs = [ requests audioread ];
pkgs/development/python-modules/transitions/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "transitions";
version = "0.8.8";
version = "0.8.9";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-56hrMaFhp2Ez8Ymzrp2tJ1WoDqTB4O7hgFZI0CH7Z30=";
sha256 = "fc2ec6d6b6f986cd7e28e119eeb9ba1c9cc51ab4fbbdb7f2dedad01983fd2de0";
};
propagatedBuildInputs = [
pkgs/development/tools/analysis/hotspot/default.nix
+34 -19
View File
@@ -1,18 +1,22 @@
{ lib,
mkDerivation,
cmake,
elfutils,
extra-cmake-modules,
fetchFromGitHub,
kconfigwidgets,
ki18n,
kio,
kitemmodels,
kitemviews,
kwindowsystem,
libelf,
qtbase,
threadweaver,
{ lib
, mkDerivation
, cmake
, elfutils
, extra-cmake-modules
, fetchFromGitHub
, kconfigwidgets
, ki18n
, kio
, kitemmodels
, kitemviews
, kwindowsystem
, libelf
, qtbase
, threadweaver
, qtx11extras
, zstd
, kddockwidgets
, rustc-demangle
}:
mkDerivation rec {
@@ -27,10 +31,12 @@ mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
elfutils
extra-cmake-modules
kconfigwidgets
ki18n
kio
@@ -40,6 +46,10 @@ mkDerivation rec {
libelf
qtbase
threadweaver
qtx11extras
zstd
kddockwidgets
rustc-demangle
];
# hotspot checks for the presence of third party libraries'
@@ -47,9 +57,14 @@ mkDerivation rec {
# submodules; but Nix clones them and removes .git (for reproducibility).
# So we need to fake their existence here.
postPatch = ''
mkdir -p 3rdparty/perfparser/.git
mkdir -p 3rdparty/{perfparser,PrefixTickLabels}/.git
'';
cmakeFlags = [
"-DRUSTC_DEMANGLE_INCLUDE_DIR=${rustc-demangle}/include"
"-DRUSTC_DEMANGLE_LIBRARY=${rustc-demangle}/lib/librustc_demangle.so"
];
meta = {
description = "A GUI for Linux perf";
longDescription = ''
@@ -58,7 +73,7 @@ mkDerivation rec {
then displays the result in a graphical way.
'';
homepage = "https://github.com/KDAB/hotspot";
license = with lib.licenses; [ gpl2 gpl3 ];
license = with lib.licenses; [ gpl2Only gpl3Only ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ nh2 ];
};
pkgs/development/tools/build-managers/bear/default.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "bear";
version = "3.0.13";
version = "3.0.14";
src = fetchFromGitHub {
owner = "rizsotto";
repo = pname;
rev = version;
sha256 = "sha256-oMrTH3GjxiLBKX0i3ZuV+bNqpA7PkoAQAb/08Q/uELs=";
sha256 = "0qy96dyd29bjvfhi46y30hli5cvshw8am0spvcv9v43660wbczd7";
};
nativeBuildInputs = [ cmake pkg-config ];
pkgs/development/tools/gokart/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "gokart";
version = "0.2.0";
src = fetchFromGitHub {
owner = "praetorian-inc";
repo = pname;
rev = "v${version}";
sha256 = "0wfv33yi83klnnyfas7wnsnx34cf28k1yvq06lkii96fvnzcar36";
};
vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd";
# Would need files to scan which are not shipped by the project
doCheck = false;
meta = with lib; {
description = "Static analysis tool for securing Go code";
homepage = "https://github.com/praetorian-inc/gokart";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/tools/wrangler/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wrangler";
version = "1.19.1";
version = "1.19.2";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Dr1qVdB/UliZM8gUVibi5vyO3Ni4icUqQXTo3UYmFqQ=";
sha256 = "sha256-RnnmhdfYAmqfi2aM2oYrieFNOkiae4WGfR5RoHeNfmw=";
};
cargoSha256 = "sha256-XDMxNqWxHDof5L1zX99DH1nSpqqi4NlnjtljQxNWagw=";
cargoSha256 = "sha256-sneNRs4DPrNA84K73DVSxAAmZ2fqX6VyQhF8bKgIbaQ=";
nativeBuildInputs = [ pkg-config ];
pkgs/games/factorio/versions.json
+8 -8
View File
@@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.38.tar.xz",
"name": "factorio_alpha_x64-1.1.39.tar.xz",
"needsAuth": true,
"sha256": "0cjhfyz4j06yn08n239ajjjpgykh39hzifhmd0ygr5szw9gdc851",
"sha256": "1wyvk0niyppg7h9ayfsiy6x309bjwsbgf62nah13aps89jk8n1pc",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.38/alpha/linux64",
"version": "1.1.38"
"url": "https://factorio.com/get-download/1.1.39/alpha/linux64",
"version": "1.1.39"
},
"stable": {
"name": "factorio_alpha_x64-1.1.38.tar.xz",
@@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.38.tar.xz",
"name": "factorio_headless_x64-1.1.39.tar.xz",
"needsAuth": false,
"sha256": "1c929pa9ifz0cvmx9k5yd267hjd5p7fdbln0czl3dq1vlskk1w71",
"sha256": "06figqmyd5bgwhpppziag4hs7x3ixr7wd8186cza3ly57bibha2m",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.38/headless/linux64",
"version": "1.1.38"
"url": "https://factorio.com/get-download/1.1.39/headless/linux64",
"version": "1.1.39"
},
"stable": {
"name": "factorio_headless_x64-1.1.38.tar.xz",
pkgs/misc/vim-plugins/build-vim-plugin.nix
+3 -16
View File
@@ -1,6 +1,7 @@
{ lib, stdenv
, rtpPath ? "share/vim-plugins"
, rtpPath
, vim
, vimGenDocHook
}:
rec {
@@ -25,6 +26,7 @@ rec {
addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // {
name = namePrefix + name;
nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ vimGenDocHook ];
inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
installPhase = ''
@@ -34,21 +36,6 @@ rec {
mkdir -p $out/${rtpPath}
cp -r . $target
# build help tags
if [ -d "$target/doc" ]; then
echo "Building help tags"
if ! ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -V1 -c "helptags $target/doc" +quit!; then
echo "Failed to build help tags!"
exit 1
fi
else
echo "No docs available"
fi
if [ -n "$addonInfo" ]; then
echo "$addonInfo" > $target/addon-info.json
fi
runHook postInstall
'';
}));
pkgs/misc/vim-plugins/default.nix
+3 -1
View File
@@ -3,7 +3,7 @@
let
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook;
inherit (lib) extends;
@@ -11,6 +11,8 @@ let
# Convert derivation to a vim plugin.
toVimPlugin = drv:
drv.overrideAttrs(oldAttrs: {
nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ vimGenDocHook ];
passthru = (oldAttrs.passthru or {}) // {
vimPlugin = true;
};
pkgs/misc/vim-plugins/update-shell.nix
+13
View File
@@ -0,0 +1,13 @@
{ nixpkgs ? import ../../.. { } }:
with nixpkgs;
let
pyEnv = python3.withPackages(ps: [ ps.GitPython ]);
in
mkShell {
packages = [
bash
pyEnv
nix-prefetch-scripts
];
}
pkgs/misc/vim-plugins/update.py
+2 -1
View File
@@ -1,5 +1,6 @@
#!/usr/bin/env nix-shell
#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3
#!nix-shell update-shell.nix -i python3
# format:
# $ nix run nixpkgs.python3Packages.black -c black update.py
pkgs/misc/vim-plugins/vim-gen-doc-hook.sh
+31
View File
@@ -0,0 +1,31 @@
echo "Sourcing vim-gen-doc-hook"
# the doc folder is copied via the copy_directories entry of the rockspec
# in the folder gitsigns.nvim-scm-1-rocks/gitsigns.nvim/scm-1
vimPluginGenTags() {
echo "Executing vimPluginGenTags"
target="$out/@rtpPath@/$pname"
mkdir -p $out/@rtpPath@
cp -r . $target
# build help tags
if [ -d "$target/doc" ]; then
echo "Building help tags"
if ! @vimBinary@ -N -u NONE -i NONE -n -E -s -V1 -c "helptags $target/doc" +quit!; then
echo "Failed to build help tags!"
exit 1
fi
else
echo "No docs available"
fi
if [ -n "$addonInfo" ]; then
echo "$addonInfo" > $target/addon-info.json
fi
echo "Finished executing vimPluginInstallPhase"
}
preFixupHooks+=(vimPluginGenTags)
pkgs/misc/vim-plugins/vim-utils.nix
+13 -1
View File
@@ -4,6 +4,7 @@
, fetchFromGitHub, runtimeShell
, hasLuaModule
, python3
, callPackage, makeSetupHook
}:
/*
@@ -485,7 +486,18 @@ rec {
'';
};
inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix;
vimGenDocHook = callPackage ({ vim }:
makeSetupHook {
name = "vim-gen-doc-hook";
deps = [ vim ];
substitutions = {
vimBinary = "${vim}/bin/vim";
inherit rtpPath;
};
} ./vim-gen-doc-hook.sh) {};
inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim vimGenDocHook; })
buildVimPlugin buildVimPluginFrom2Nix;
# used to figure out which python dependencies etc. neovim needs
requiredPlugins = {
pkgs/os-specific/linux/kernel/linux-4.14.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.245";
version = "4.14.246";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "085jls7b2rzxlmvp0zsp4l3wi5xdrqlv2qczzwvbhzna1f4n2x0d";
sha256 = "0fpgig84shpas1jc0h4s3aw9brkcq1as84gjbk4bfhc48bpi4mlw";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.19.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.205";
version = "4.19.206";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1ii9l44d6jxhyd5qkc5h83ixailma9v7hyl60wi3rskkafqnwv2m";
sha256 = "1h44lvzxd0cngj71bk8qba9dz7jlqj68ir6xjwfafglb81ppgsxp";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.4.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.4.282";
version = "4.4.283";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1rgxznjb6gsi64wk7x2rylyi64y2nx5yiah5gfm40c6l2f7lb9cc";
sha256 = "1d9v4h4cbc4i371lhhwpxbmg88gna6xyi2ahfvv0clz60802y982";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.281";
version = "4.9.282";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1dg70jv3bqanmjs31s0x2p7nd5g37bqzjn9rc1y6wvkgm4pwahi6";
sha256 = "059fin4si93ya13xy831w84q496ksxidpd3kyw38918sfy4p6wk7";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.10.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.61";
version = "5.10.62";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1lci78584c0rg5m5rkylssppnv001pzh4769m9mds4fdqn6f7sl2";
sha256 = "1cc6z2xzi1s69805jk4f91iarx19v0yyqvssx1f1mc0l9l1db389";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.13.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.13.13";
version = "5.13.14";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0d1lr3rivgf9j3bn2a9hpzdf74nq8kybf3rfxxvw68vr1hhd4cam";
sha256 = "06lbjsbr86qa8yai5gfclbfxvcqsw33kxj9b4r93hh6z1wajmx82";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-5.14.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.14";
version = "5.14.1";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky";
sha256 = "1iq8s031fviccc4710biwl7gxqdimm3nhlvxd0m3fykvhhmcanq0";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-5.4.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.143";
version = "5.4.144";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9";
sha256 = "11aqp12xwbg7ysac3f9iaxwkhvasdg9bw4r43jj8af5bf61bjhxw";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-libre.nix
+2 -2
View File
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "18268";
sha256 = "050rk485csj41yfydr1cvn60vhb3lzbb3486sm832vp55d34i8fd";
rev = "18298";
sha256 = "027fp6h7295cc9m5g46phqd6hixcnvihpfsyrnzvsxz6pkvjzpw4";
}
, ...
}:
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+3 -3
View File
@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.4.138-rt62"; # updated by ./update-rt.sh
version = "5.4.143-rt63"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0mw6k9zrcmv1j4b3han5c0q8xbh38bka2wkkbl1y3ralg9r5ffd4";
sha256 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1zw7806fxx9cai9n6siv534x5r52d8fc13r07ypgw461pijcy5p6";
sha256 = "13d9sx6vw3hlh0cpccfsfqkjj6yfjmbh4wp4x6ry84i39lrfbwg3";
};
}; in [ rt-patch ] ++ kernelPatches;
pkgs/os-specific/linux/kexectools/default.nix → pkgs/os-specific/linux/kexec-tools/default.nix
View File
pkgs/os-specific/linux/systemd/default.nix
+3 -3
View File
@@ -53,8 +53,8 @@
, libselinux
, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp
, libseccomp
, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexectools
, kexectools
, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools
, kexec-tools
, bashInteractive
, libmicrohttpd
@@ -308,7 +308,7 @@ stdenv.mkDerivation {
++ lib.optionals withCompression [ bzip2 lz4 xz ]
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi
++ lib.optional withKexectools kexectools
++ lib.optional withKexectools kexec-tools
++ lib.optional withLibseccomp libseccomp
++ lib.optional withNetworkd iptables
++ lib.optional withPCRE2 pcre2
pkgs/servers/web-apps/lemmy/default.nix
+4 -4
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "lemmy-server";
version = "0.11.2";
version = "0.11.3";
src = fetchFromGitHub {
owner = "LemmyNet";
repo = "lemmy";
rev = version;
sha256 = "sha256-wDRBeAYjPpAd3DL99fH4Yng994hGmAmxlBqzOeXTP88=";
sha256 = "sha256-AFVipxzKwNiillVmMA+Q7nMKajN9mzw37mBpqzf+XpM=";
};
cargoSha256 = "sha256-7wF5mUjSeJvCNLZcR6XB31RX2RLOOEyTGpOQxg+NcWk=";
cargoSha256 = "sha256-nxuynzQRUqne1KZIvP152afWbG2Zb9zyCqy7Bx4PeJ8=";
buildInputs = [ postgresql ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
meta = with lib; {
description = "Ultra relevant and instant full-text search API";
description = "🐀 Building a federated alternative to reddit in rust";
homepage = "https://join-lemmy.org/";
license = licenses.agpl3Only;
maintainers = with maintainers; [ happysalada ];
pkgs/shells/zsh/default.nix
+5
View File
@@ -18,6 +18,11 @@ stdenv.mkDerivation {
sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
};
patches = [
# fix location of timezone data for TZ= completion
./tz_completion.patch
];
buildInputs = [ ncurses pcre ];
configureFlags = [
pkgs/shells/zsh/tz_completion.patch
+14
View File
@@ -0,0 +1,14 @@
On NixOS, timezone data is located at /etc/zoneinfo
diff --git a/Completion/Unix/Type/_time_zone b/Completion/Unix/Type/_time_zone
index cd924bbc7..5d683291b 100644
--- a/Completion/Unix/Type/_time_zone
+++ b/Completion/Unix/Type/_time_zone
@@ -3,7 +3,7 @@
local expl
if (( ! $+_zoneinfo_dirs )); then
- _zoneinfo_dirs=( /usr/{share,lib,share/lib}/{zoneinfo*,locale/TZ}(/) )
+ _zoneinfo_dirs=( /etc/zoneinfo /usr/{share,lib,share/lib}/{zoneinfo*,locale/TZ}(/) )
fi
_wanted time-zones expl 'time zone' _files -W _zoneinfo_dirs "$@" -
pkgs/tools/admin/salt/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "salt";
version = "3003.2";
version = "3003.3";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "c8hsRLF22M/cAzux5C5P3I3TQkgz+qLqDQk4+hc4Vqk=";
sha256 = "pvnIyLXiYA6oYgtKZzcd4XYRvrT42X5LubCzCKN+0eI=";
};
propagatedBuildInputs = with python3.pkgs; [
pkgs/tools/networking/corerad/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "corerad";
version = "0.3.3";
version = "0.3.4";
src = fetchFromGitHub {
owner = "mdlayher";
repo = "corerad";
rev = "v${version}";
sha256 = "1xfqjxygf6r5wbf3brilx4d4hm0h518zaadmmzvkmbbz6w0fyl0k";
sha256 = "0sf2r4q57hwdakv0b4skn76b0xy7bwj2j9rpj6frs5fkk6gsi6sm";
};
vendorSha256 = "0ydyfdx9syrv719knwv64srfx4d1m9pzkivfc3q188bx5qx67pjw";
vendorSha256 = "123f9y1pfayfd5amkw5b8jzi8dbn7a16kbf7lzbmw69c1gj4gx9z";
doCheck = false;
pkgs/tools/security/nmap-formatter/default.nix
+31
View File
@@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "nmap-formatter";
version = "0.2.1";
src = fetchFromGitHub {
owner = "vdjagilev";
repo = pname;
rev = "v${version}";
sha256 = "1r8l7ajcb436b60ir6xgy53wafk6rw1cil326yg6mhcngz9sazbk";
};
vendorSha256 = "0c1b4iw28qj8iq55lg32xqw69jjdv5ial495j0gz68s17kydbwhb";
postPatch = ''
# Fix hard-coded release
substituteInPlace cmd/root.go \
--replace "0.2.0" "${version}"
'';
meta = with lib; {
description = "Tool that allows you to convert nmap output";
homepage = "https://github.com/vdjagilev/nmap-formatter";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/top-level/aliases.nix
+1
View File
@@ -387,6 +387,7 @@ mapAliases ({
keepassx-community = keepassxc; # added 2017-11
keepassx-reboot = keepassx-community; # added 2017-02-01
keepassx2-http = keepassx-reboot; # added 2016-10-17
kexectools = kexec-tools; # added 2021-09-03
keybase-go = keybase; # added 2016-08-24
kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28
kicad-with-packages3d = kicad; # added 2019-11-25
pkgs/top-level/all-packages.nix
+11 -1
View File
@@ -5437,6 +5437,8 @@ with pkgs;
gitea = callPackage ../applications/version-management/gitea { };
gokart = callPackage ../development/tools/gokart { };
gl2ps = callPackage ../development/libraries/gl2ps { };
glab = callPackage ../applications/version-management/git-and-tools/glab { };
@@ -6352,7 +6354,7 @@ with pkgs;
keeperrl = callPackage ../games/keeperrl { };
kexectools = callPackage ../os-specific/linux/kexectools { };
kexec-tools = callPackage ../os-specific/linux/kexec-tools { };
keepkey_agent = with python3Packages; toPythonApplication keepkey_agent;
@@ -7576,6 +7578,8 @@ with pkgs;
graphicalSupport = true;
};
nmap-formatter = callPackage ../tools/security/nmap-formatter { };
nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { };
nnn = callPackage ../applications/misc/nnn { };
@@ -16328,6 +16332,8 @@ with pkgs;
judy = callPackage ../development/libraries/judy { };
kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { };
keybinder = callPackage ../development/libraries/keybinder {
automake = automake111x;
lua = lua5_1;
@@ -18551,6 +18557,8 @@ with pkgs;
rubberband = callPackage ../development/libraries/rubberband { };
rustc-demangle = callPackage ../development/libraries/rustc-demangle { };
s2geometry = callPackage ../development/libraries/s2geometry { };
/* This package references ghc844, which we no longer have. Unfortunately, I
@@ -29914,6 +29922,8 @@ with pkgs;
inherit (gnome) zenity;
};
protonup = with python3Packages; toPythonApplication protonup;
sdlpop = callPackage ../games/sdlpop { };
stepmania = callPackage ../games/stepmania {
pkgs/top-level/python-packages.nix
+4
View File
@@ -1373,6 +1373,8 @@ in {
cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { };
certauth = callPackage ../development/python-modules/certauth { };
certbot = callPackage ../development/python-modules/certbot { };
certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { };
@@ -5698,6 +5700,8 @@ in {
protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
protonup = callPackage ../development/python-modules/protonup { };
prov = callPackage ../development/python-modules/prov { };
prox-tv = callPackage ../development/python-modules/prox-tv { };