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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-05-31 12:54:46 +00:00 committed by GitHub
commit 6a8c64f062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 506 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -4127,6 +4127,12 @@
githubId = 362833;
name = "Hongchang Wu";
};
hoppla20 = {
email = "privat@vincentcui.de";
github = "hoppla20";
githubId = 25618740;
name = "Vincent Cui";
};
hoverbear = {
email = "operator+nix@hoverbear.org";
github = "hoverbear";

4
nixos/modules/virtualisation/podman.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, utils, ... }:
{ config, lib, pkgs, ... }:
let
cfg = config.virtualisation.podman;
toml = pkgs.formats.toml { };
@ -107,7 +107,7 @@ in
environment.systemPackages = [ cfg.package ]
++ lib.optional cfg.dockerCompat dockerCompat;
environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist";
environment.etc."cni/net.d/87-podman-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist";
virtualisation.containers = {
enable = true; # Enable common /etc/containers configuration

30
pkgs/applications/audio/molot-lite/default.nix
View File

@ -1,35 +1,31 @@
{ lib, stdenv, fetchurl, unzip, lv2 }:
{ lib, stdenv, fetchFromGitHub, lv2 }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "molot-lite";
version = "unstable-2014-04-23";
version = "1.0.0";
src = fetchurl {
# fetchzip does not accept urls that do not end with .zip.
url = "https://sourceforge.net/p/molot/code/ci/c4eddc426f8d5821e8ebcf1d67265365e4c8c52a/tree/molot_src.zip?format=raw";
sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b";
src = fetchFromGitHub {
owner = "magnetophon";
repo = pname;
rev = version;
sha256 = "0xbvicfk1rgp01nlg6hlym9bnygry0nrbv88mv7w6hnacvl63ba4";
};
nativeBuildInputs = [ unzip ];
buildInputs = [ lv2 ];
unpackPhase = ''
unzip $src
'';
buildPhase = ''
make -C Molot_Mono_Lite
make -C Molot_Stereo_Lite
'';
makeFlags = [ "INSTALL_DIR=$out/lib/lv2" ];
installPhase = ''
runHook preInstall
make install INSTALL_DIR=$out/lib/lv2 -C Molot_Mono_Lite
make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite
runHook postInstall
'';
meta = with lib; {
description = "Stereo and mono audio signal dynamic range compressor in LV2 format";
homepage = "https://sourceforge.net/projects/molot/";
homepage = "https://github.com/magnetophon/molot-lite";
license = licenses.gpl3Plus;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;

7
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -165,14 +165,10 @@ let
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
./patches/fix-missing-atspi2-dependency.patch
] ++ optionals (chromiumVersionAtLeast "91") [
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
];
postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''
# Required for patchShebangs (unsupported):
chmod -x third_party/webgpu-cts/src/tools/deno
'' + ''
postPatch = ''
# remove unused third-party
for lib in ${toString gnSystemLibraries}; do
if [ -d "third_party/$lib" ]; then
@ -191,6 +187,7 @@ let
substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
fi
chmod -x third_party/webgpu-cts/src/tools/deno
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \

16
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -44,19 +44,19 @@
}
},
"ungoogled-chromium": {
"version": "90.0.4430.212",
"sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb",
"sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7",
"version": "91.0.4472.77",
"sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5",
"sha256bin64": "0caf47xam5igdnbhipal1iyicnxxvadhi61k199rwysrvyv5sdad",
"deps": {
"gn": {
"version": "2021-02-09",
"version": "2021-04-06",
"url": "https://gn.googlesource.com/gn",
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
"rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
},
"ungoogled-patches": {
"rev": "90.0.4430.212-1",
"sha256": "05jh05a4g50ws7pr18dl5pwi95knygh6xywp7kyydir7wy1pbin8"
"rev": "91.0.4472.77-1",
"sha256": "1jfmmkw1y4rcjfgsm7b4v2lrgd3sks5qpajvq0djflbhkpsqxfk0"
}
}
}

10
pkgs/applications/networking/mailreaders/neomutt/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, fetchpatch
, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib
}:
@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY=";
};
patches = [
(fetchpatch {
name = "CVE-2021-32055.patch";
url = "https://github.com/neomutt/neomutt/commit/fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc.patch";
sha256 = "0bb7gisjynq3w7hhl6vxa469h609bcz6fkdi8vf740pqrwhk68yn";
})
];
buildInputs = [
cyrus_sasl gss gpgme libkrb5 libidn ncurses
notmuch openssl perl lmdb

1
pkgs/applications/virtualization/podman/default.nix
View File

@ -69,6 +69,7 @@ buildGoModule rec {
installShellCompletion --zsh completions/zsh/*
MANDIR=$man/share/man make install.man-nobuild
'' + lib.optionalString stdenv.isLinux ''
install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d
install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system
'' + ''

1
pkgs/applications/virtualization/podman/wrapper.nix
View File

@ -50,6 +50,7 @@ in runCommand podman.name {
ln -s ${podman.man} $man
mkdir -p $out/bin
ln -s ${podman-unwrapped}/etc $out/etc
ln -s ${podman-unwrapped}/lib $out/lib
ln -s ${podman-unwrapped}/share $out/share
makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \

159
pkgs/build-support/vm/default.nix
View File

@ -822,45 +822,6 @@ rec {
/* The set of supported Dpkg-based distributions. */
debDistros = {
# Interestingly, the SHA-256 hashes provided by Ubuntu in
# http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are
# wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine.
ubuntu1204i386 = {
name = "ubuntu-12.04-precise-i386";
fullName = "Ubuntu 12.04 Precise (i386)";
packagesLists =
[ (fetchurl {
url = "mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2";
sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d";
})
(fetchurl {
url = "mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2";
sha256 = "085lkzbnzkc74kfdmwdc32sfqyfz8dr0rbiifk8kx9jih3xjw2jk";
})
];
urlPrefix = "mirror://ubuntu";
packages = commonDebPackages ++ [ "diffutils" ];
};
ubuntu1204x86_64 = {
name = "ubuntu-12.04-precise-amd64";
fullName = "Ubuntu 12.04 Precise (amd64)";
packagesLists =
[ (fetchurl {
url = "mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2";
sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc";
})
(fetchurl {
url = "mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2";
sha256 = "0x4hz5aplximgb7gnpvrhkw8m7a40s80rkm5b8hil0afblwlg4vr";
})
];
urlPrefix = "mirror://ubuntu";
packages = commonDebPackages ++ [ "diffutils" ];
};
ubuntu1404i386 = {
name = "ubuntu-14.04-trusty-i386";
fullName = "Ubuntu 14.04 Trusty (i386)";
@ -929,40 +890,6 @@ rec {
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
ubuntu1710i386 = {
name = "ubuntu-17.10-artful-i386";
fullName = "Ubuntu 17.10 Artful (i386)";
packagesLists =
[ (fetchurl {
url = "mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz";
sha256 = "18yrj4kqdzm39q0527m97h5ing58hkm9yq9iyj636zh2rclym3c8";
})
(fetchurl {
url = "mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz";
sha256 = "1v0njw2w80xfmxi7by76cs8hyxlla5h3gqajlpdw5srjgx2qrm2g";
})
];
urlPrefix = "mirror://ubuntu";
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
ubuntu1710x86_64 = {
name = "ubuntu-17.10-artful-amd64";
fullName = "Ubuntu 17.10 Artful (amd64)";
packagesLists =
[ (fetchurl {
url = "mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz";
sha256 = "104g57j1l3vi8wb5f7rgjvjhf82ccs0vwhc59jfc4ynd51z7fqjk";
})
(fetchurl {
url = "mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz";
sha256 = "1qzs95wfy9inaskfx9cf1l5yd3aaqwzy72zzi9xyvkxi75k5gcn4";
})
];
urlPrefix = "mirror://ubuntu";
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
ubuntu1804i386 = {
name = "ubuntu-18.04-bionic-i386";
fullName = "Ubuntu 18.04 Bionic (i386)";
@ -997,51 +924,83 @@ rec {
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
debian8i386 = {
name = "debian-8.11-jessie-i386";
fullName = "Debian 8.11 Jessie (i386)";
packagesList = fetchurl {
url = "mirror://debian/dists/jessie/main/binary-i386/Packages.xz";
sha256 = "0adblarhx50yga900il6m25ng0csa81i3wid1dxxmydbdmri7v7d";
};
urlPrefix = "mirror://debian";
packages = commonDebianPackages;
ubuntu2004i386 = {
name = "ubuntu-20.04-focal-i386";
fullName = "Ubuntu 20.04 Focal (i386)";
packagesLists =
[ (fetchurl {
url = "mirror://ubuntu/dists/focal/main/binary-i386/Packages.xz";
sha256 = "sha256-7RAYURoN3RKYQAHpwBS9TIV6vCmpURpphyMJQmV4wLc=";
})
(fetchurl {
url = "mirror://ubuntu/dists/focal/universe/binary-i386/Packages.xz";
sha256 = "sha256-oA551xVE80volUPgkMyvzpQ1d+GhuZd4DAe7dXZnULM=";
})
];
urlPrefix = "mirror://ubuntu";
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
debian8x86_64 = {
name = "debian-8.11-jessie-amd64";
fullName = "Debian 8.11 Jessie (amd64)";
packagesList = fetchurl {
url = "mirror://debian/dists/jessie/main/binary-amd64/Packages.xz";
sha256 = "09y1mv4kqllhxpk1ibjsyl5jig5bp0qxw6pp4sn56rglrpygmn5x";
};
urlPrefix = "mirror://debian";
packages = commonDebianPackages;
ubuntu2004x86_64 = {
name = "ubuntu-20.04-focal-amd64";
fullName = "Ubuntu 20.04 Focal (amd64)";
packagesLists =
[ (fetchurl {
url = "mirror://ubuntu/dists/focal/main/binary-amd64/Packages.xz";
sha256 = "sha256-d1eSH/j+7Zw5NKDJk21EG6SiOL7j6myMHfXLzUP8mGE=";
})
(fetchurl {
url = "mirror://ubuntu/dists/focal/universe/binary-amd64/Packages.xz";
sha256 = "sha256-RqdG2seJvZU3rKVNsWgLnf9RwkgVMRE1A4IZnX2WudE=";
})
];
urlPrefix = "mirror://ubuntu";
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
debian9i386 = {
name = "debian-9.8-stretch-i386";
fullName = "Debian 9.8 Stretch (i386)";
name = "debian-9.13-stretch-i386";
fullName = "Debian 9.13 Stretch (i386)";
packagesList = fetchurl {
url = "http://snapshot.debian.org/archive/debian/20200301T030401Z/dists/stretch/main/binary-i386/Packages.xz";
sha256 = "1jglr1d1jys3xddp8f7w9j05db39fah8xy4gfkpqbd1b5d2caslz";
url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-i386/Packages.xz";
sha256 = "sha256-fFRumd20wuVaYxzw0VPkAw5mQo8kIg+eXII15VSz9wA=";
};
urlPrefix = "mirror://debian";
packages = commonDebianPackages;
};
debian9x86_64 = {
name = "debian-9.8-stretch-amd64";
fullName = "Debian 9.8 Stretch (amd64)";
name = "debian-9.13-stretch-amd64";
fullName = "Debian 9.13 Stretch (amd64)";
packagesList = fetchurl {
url = "http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-amd64/Packages.xz";
sha256 = "01q00nl47p12n7wx0xclx59wf3zlkzrgj3zxpshyvb91xdnw5sh6";
url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-amd64/Packages.xz";
sha256 = "sha256-1p4DEVpTGlBE3PtbQ90kYw4QNHkW0F4rna/Xz+ncMhw=";
};
urlPrefix = "mirror://debian";
packages = commonDebianPackages;
};
debian10i386 = {
name = "debian-10.9-buster-i386";
fullName = "Debian 10.9 Buster (i386)";
packagesList = fetchurl {
url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-i386/Packages.xz";
sha256 = "sha256-zlkbKV+IGBCyWKD4v4LFM/EUA4TYS9fkLBPuF6MgUDo=";
};
urlPrefix = "mirror://debian";
packages = commonDebianPackages;
};
debian10x86_64 = {
name = "debian-10.9-buster-amd64";
fullName = "Debian 10.9 Buster (amd64)";
packagesList = fetchurl {
url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-amd64/Packages.xz";
sha256 = "sha256-k13toY1b3CX7GBPQ7Jm24OMqCEsgPlGK8M99x57o69o=";
};
urlPrefix = "mirror://debian";
packages = commonDebianPackages;
};
};
@ -1168,7 +1127,7 @@ rec {
"passwd"
];
commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ];
commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" ];
/* A set of functions that build the Linux distributions specified

28
pkgs/data/themes/yaru-remix/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome }:
stdenv.mkDerivation rec {
pname = "yaru-remix";
version = "40";
src = fetchFromGitHub {
owner = "Muqtxdir";
repo = pname;
rev = "v${version}";
sha256 = "0xilhw5gbxsyy80ixxgj0nw6w782lz9dsinhi24026li1xny804c";
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
buildInputs = [ gtk3 gnome.gnome-themes-extra ];
dontDropIconThemeCache = true;
postPatch = "patchShebangs .";
meta = with lib; {
description = "Fork of the Yaru GTK theme";
homepage = "https://github.com/Muqtxdir/yaru-remix";
license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ];
platforms = platforms.linux;
maintainers = with maintainers; [ hoppla20 ];
};
}

6
pkgs/desktops/cinnamon/nemo/default.nix
View File

@ -17,11 +17,12 @@
, intltool
, shared-mime-info
, cinnamon-translations
, libgsf
}:
stdenv.mkDerivation rec {
pname = "nemo";
version = "4.8.6";
version = "5.0.0";
# TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327)
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-OUv7l+klu5l1Y7m+iHiq/dDyxH3/hT4k7F9gDuUiGds=";
sha256 = "07n9p93iyrzb7636qqwknq8dd3im1y6wb9jfvif96mbvvdwsnfyz";
};
outputs = [ "out" "dev" ];
@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
libexif
exempi
gobject-introspection
libgsf
];
nativeBuildInputs = [

4
pkgs/development/libraries/itk/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "itk";
version = "5.1.2";
version = "5.2.0";
src = fetchFromGitHub {
owner = "InsightSoftwareConsortium";
repo = "ITK";
rev = "v${version}";
sha256 = "0db91pm1zy40h4qr5zsdfl94znk16w9ysddz5cxbl198iyyqii8f";
sha256 = "19f65fc9spwvmywg43lkw9p2inrrzr1qrfzcbing3cjk0x2yrsnl";
};
postPatch = ''

4
pkgs/development/libraries/libxlsxwriter/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "libxlsxwriter";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "jmcnamara";
repo = "libxlsxwriter";
rev = "RELEASE_${version}";
sha256 = "1jjmwg1mk7pvf36q30rng42qphgz6qdjvn96agrym2q0hhwxc99v";
sha256 = "03fdcbm0xnkxwv6fir4yy4x9q2p5h08j099w9xh5gc2ni7ygjlyx";
};
nativeBuildInputs = [

52
pkgs/development/python-modules/corsair-scan/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, click
, fetchFromGitHub
, mock
, pytestCheckHook
, pythonOlder
, requests
, tldextract
, urllib3
, validators
}:
buildPythonPackage rec {
pname = "corsair-scan";
version = "0.2.0";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "Santandersecurityresearch";
repo = "corsair_scan";
rev = "v${version}";
sha256 = "09jsv5bag7mjy0rxsxjzmg73rjl7qknzr0d7a7himd7v6a4ikpmk";
};
propagatedBuildInputs = [
validators
requests
urllib3
tldextract
click
];
checkInputs = [
mock
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner'," ""
'';
pythonImportsCheck = [ "corsair_scan" ];
meta = with lib; {
description = "Python module to check for Cross-Origin Resource Sharing (CORS) misconfigurations";
homepage = "https://github.com/Santandersecurityresearch/corsair_scan";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

26
pkgs/development/python-modules/powerline-mem-segment/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
, psutil
}:
buildPythonPackage rec {
pname = "powerline-mem-segment";
version = "2.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "0507zw7g449zk7dcq56adcdp71inbqfdmp6y5yk4x4j7kkp6pii9";
};
propagatedBuildInputs = [ psutil ];
pythonImportsCheck = [ "powerlinemem" ];
meta = with lib; {
description = "Segment for Powerline showing the current memory usage in percent or absolute values.";
homepage = "https://github.com/mKaloer/powerline_mem_segment";
license = licenses.asl20;
maintainers = with maintainers; [ thomasjm ];
};
}

7
pkgs/development/python-modules/solo-python/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "solo-python";
version = "0.0.27";
version = "0.0.30";
format = "flit";
disabled = pythonOlder "3.6"; # only python>=3.6 is supported
@ -22,7 +22,7 @@
owner = "solokeys";
repo = pname;
rev = version;
sha256 = "sha256-OCiKa6mnqJGoNCC4KqI+hMw22tzhdN63x9/KujNJqcE=";
sha256 = "1i9kybp08qfcdx6m4wl7ij40y1v17mvvhcdg7zglwfakblf69w41";
};
# replaced pinned fido, with unrestricted fido version
@ -60,8 +60,5 @@
homepage = "https://github.com/solokeys/solo-python";
maintainers = with maintainers; [ wucke13 ];
license = with licenses; [ asl20 mit ];
# solo-python v0.0.27 does not support fido2 >= v0.9
# https://github.com/solokeys/solo-python/issues/110
broken = true;
};
}

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

File diff suppressed because it is too large Load Diff

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

@ -532,6 +532,7 @@ ray-x/lsp_signature.nvim
rbgrouleff/bclose.vim
rbong/vim-flog
rcarriga/nvim-dap-ui
rcarriga/vim-ultest
rhysd/committia.vim
rhysd/conflict-marker.vim
rhysd/devdocs.vim

4
pkgs/servers/sql/postgresql/ext/pg_partman.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_partman";
version = "4.4.1";
version = "4.5.1";
buildInputs = [ postgresql ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "pgpartman";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-jFG2Zna97FHZin2V3Cwy5JcdeFh09Yy/eoyHtcCorPA=";
sha256 = "182yqvgcpgw99swn7w516f6d1bid2gnmf6dfsgmldx5viz0d6vi0";
};
installPhase = ''

4
pkgs/servers/tailscale/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tailscale";
version = "1.8.5";
version = "1.8.6";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "0wr6zb8v5082gbh0isz8inmndvqfqgmh5bgaz8ij2id5qwx5znx6";
sha256 = "1h3ry4y62wwcv4z3yjqal4ch4xy40k9s3rq20lqs3r58kblnaxs2";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/tools/admin/fioctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fioctl";
version = "0.16";
version = "0.17";
src = fetchFromGitHub {
owner = "foundriesio";
repo = "fioctl";
rev = "v${version}";
sha256 = "1mm62piih7x2886wpgqd8ks22vpmrjgxs4alskiqz61bgshks9vw";
sha256 = "sha256-u23BQ/sRAfUO36uqv7xY+DkseDnlVesgamsgne8N8kU=";
};
vendorSha256 = "170z5a1iwwcpz890nficqnz7rr7yzdxr5jx9pa7s31z17lr8kbz9";
vendorSha256 = "sha256-6a+JMj3hh6GPuqnLknv7/uR8vsUsOgsS+pdxHoMqH5w=";
runVend = true;

14
pkgs/tools/networking/v2ray/default.nix
View File

@ -3,22 +3,22 @@
}:
let
version = "4.38.3";
version = "4.39.2";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
sha256 = "1vsq98h6zbm3wz1mgphl7dqlabgfg53fhkyn47vfbhhkbx6nwl7c";
sha256 = "0rgwxsix2qy5w44s2ramalsn1bqznj2yra8bakcms8yl9yh0gbvd";
};
vendorSha256 = "sha256-jXpGlJ30xBttysbUekMdw8fH0KVfPufWq0t7AXZrDEQ=";
vendorSha256 = "sha256-1LEKg9kyF4QBrzLP5TyKmFLPBprJRNqGxtkAI1mHx4Y=";
assets = {
# MIT licensed
"geoip.dat" = let
geoipRev = "202104300531";
geoipSha256 = "0srskpp0pmw4fzp4lgachjjvig4fy96523r7aj2bwig0ipfgr401";
geoipRev = "202105270041";
geoipSha256 = "0g67lggc41himpnbbghm4xlnbv4dl2fyidxplh3pl6ajqb4wxwd5";
in fetchurl {
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
@ -26,8 +26,8 @@ let
# MIT licensed
"geosite.dat" = let
geositeRev = "20210430100800";
geositeSha256 = "0wp111iip3lhkgpbrzzivl5flj44vj7slx9w7k307sls6hmjzlcb";
geositeRev = "20210527065138";
geositeSha256 = "1335zyc5zrwws46ldv0sqn51kpkfwfksbfw6hd53fakz0whxki0g";
in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;

13
pkgs/tools/package-management/morph/default.nix
View File

@ -1,18 +1,17 @@
{ buildGoPackage, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }:
{ buildGoModule, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }:
buildGoPackage rec {
buildGoModule rec {
pname = "morph";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "dbcdk";
repo = "morph";
rev = "v${version}";
sha256 = "064ccvvq4yk17jy5jvi1nxfp5ajvnvn2k4zvh9v0n3ragcl3rd20";
sha256 = "0aibs4gsb9pl21nd93bf963kdzf0661qn0liaw8v8ak2xbz7nbs8";
};
goPackagePath = "github.com/dbcdk/morph";
goDeps = ./deps.nix;
vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9";
nativeBuildInputs = [ makeWrapper go-bindata ];
@ -28,7 +27,7 @@ buildGoPackage rec {
postInstall = ''
mkdir -p $lib
cp -v go/src/$goPackagePath/data/*.nix $lib
cp -v ./data/*.nix $lib
wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]};
'';

31
pkgs/tools/security/gosh/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "gosh";
# https://github.com/redcode-labs/GoSH/issues/4
version = "2020523-${lib.strings.substring 0 7 rev}";
rev = "7ccb068279cded1121eacc5a962c14b2064a1859";
src = fetchFromGitHub {
owner = "redcode-labs";
repo = "GoSH";
inherit rev;
sha256 = "143ig0lqnkpnydhl8gnfzhg613x4wc38ibdbikkqwfyijlr6sgzd";
};
vendorSha256 = "06j6cj4m0w6n9vl7sxlxpsgk77k941npq9767rdzzgy2srfqlskq";
runVend = true;
subPackages = [ "." ];
meta = with lib; {
description = "Reverse/bind shell generator";
homepage = "https://github.com/redcode-labs/GoSH";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

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

@ -1370,6 +1370,8 @@ in
coolreader = libsForQt5.callPackage ../applications/misc/coolreader {};
corsair = with python3Packages; toPythonApplication corsair-scan;
corsmisc = callPackage ../tools/security/corsmisc { };
cosign = callPackage ../tools/security/cosign {
@ -1619,6 +1621,8 @@ in
git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
gosh = callPackage ../tools/security/gosh { };
gospider = callPackage ../tools/security/gospider { };
browserpass = callPackage ../tools/security/browserpass { };
@ -22419,6 +22423,8 @@ in
yaru-theme = callPackage ../data/themes/yaru {};
yaru-remix-theme = callPackage ../data/themes/yaru-remix {};
zafiro-icons = callPackage ../data/icons/zafiro-icons {
inherit (plasma5Packages) breeze-icons;
};

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

@ -1584,6 +1584,8 @@ in {
coronavirus = callPackage ../development/python-modules/coronavirus { };
corsair-scan = callPackage ../development/python-modules/corsair-scan { };
cot = callPackage ../development/python-modules/cot { };
covCore = callPackage ../development/python-modules/cov-core { };
@ -5239,6 +5241,8 @@ in {
powerline = callPackage ../development/python-modules/powerline { };
powerlineMemSegment = callPackage ../development/python-modules/powerline-mem-segment { };
pox = callPackage ../development/python-modules/pox { };
poyo = callPackage ../development/python-modules/poyo { };

2
pkgs/top-level/release.nix
View File

@ -11,7 +11,7 @@
{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
, officialRelease ? false
# The platforms for which we build Nixpkgs.
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
, limitedSupportedSystems ? [ "i686-linux" ]
# Strip most of attributes when evaluating to spare memory usage
, scrubJobs ? true