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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-08-15 00:02:37 +00:00 committed by GitHub
commit 1db41d0201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
65 changed files with 331 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/builders/fetchers.chapter.md
View File

@ -91,7 +91,7 @@ Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this c
Additionally, the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout.
If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) and [git clone --filter](https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---filterltfilter-specgt) for more information:
If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) for more information:
```nix
{ stdenv, fetchgit }:
@ -101,8 +101,8 @@ stdenv.mkDerivation {
src = fetchgit {
url = "https://...";
sparseCheckout = ''
path/to/be/included
another/path
directory/to/be/included
another/directory
'';
sha256 = "0000000000000000000000000000000000000000000000000000";
};

9
maintainers/maintainer-list.nix
View File

@ -8481,6 +8481,15 @@
githubId = 9980864;
name = "Max Hofer";
};
miangraham = {
email = "miangraham@users.noreply.github.com";
github = "miangraham";
githubId = 704580;
name = "M. Ian Graham";
keys = [{
fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F";
}];
};
mic92 = {
email = "joerg@thalheim.io";
matrix = "@mic92:nixos.dev";

12
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View File

@ -251,6 +251,18 @@
<literal>(with foo; isPower &amp;&amp; is32bit &amp;&amp; isBigEndian)</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>fetchgit</literal> fetcher now uses
<link xlink:href="https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling">cone
mode</link> by default for sparse checkouts.
<link xlink:href="https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems">Non-cone
mode</link> can be enabled by passing
<literal>nonConeMode = true</literal>, but note that non-cone
mode is deprecated and this option may be removed alongside a
future Git update without notice.
</para>
</listitem>
<listitem>
<para>
<literal>bsp-layout</literal> no longer uses the command

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

@ -97,6 +97,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
- The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice.
- `bsp-layout` no longer uses the command `cycle` to switch to other window layouts, as it got replaced by the commands `previous` and `next`.
- The Barco ClickShare driver/client package `pkgs.clickshare-csc1` and the option `programs.clickshare-csc1.enable` have been removed,

13
pkgs/applications/editors/neovim/neovide/Cargo.lock.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/Cargo.lock b/Cargo.lock
index f86b4b4..befc2bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1326,7 +1326,7 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
[[package]]
name = "neovide"
-version = "0.9.0"
+version = "0.10.0"
dependencies = [
"async-trait",
"cfg-if 1.0.0",

14
pkgs/applications/editors/neovim/neovide/default.nix
View File

@ -25,16 +25,20 @@
}:
rustPlatform.buildRustPackage rec {
pname = "neovide";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "Kethku";
repo = "neovide";
rev = version;
sha256 = "sha256-2fN05o8Zo1MGdIYUcsCgkiW/kG6DkY8uTnpw2XrKxrI=";
sha256 = "sha256-4oZJZd5Allh9Wc7YOvW9sF+38Sm15dL03TJZkHTbXXc=";
postFetch = ''
cd $out
patch -p1 -i ${./Cargo.lock.patch}
'';
};
cargoSha256 = "sha256-eATUyczkcwHI8Y7Gl2ts4dRgiFUAL8yrWDNe4JzserE=";
cargoSha256 = "sha256-E1Wp5tPVK+5WIQ+3OrzY3W9Vfy57DHgNccKtIp/vUy8=";
SKIA_SOURCE_DIR =
let
@ -42,8 +46,8 @@ rustPlatform.buildRustPackage rec {
owner = "rust-skia";
repo = "skia";
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
rev = "m100-0.48.7";
sha256 = "sha256-roZUv5YoLolRi0iWAB+5WlCFV+8GdzNzS+JINnEHaMs=";
rev = "m103-0.51.1";
sha256 = "sha256-w5dw/lGm40gKkHPR1ji/L82Oa808Kuh8qaCeiqBLkLw=";
};
# The externals for skia are taken from skia/DEPS
externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json);

8
pkgs/applications/editors/neovim/neovide/skia-externals.json
View File

@ -6,8 +6,8 @@
},
"libjpeg-turbo": {
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
"rev": "02959c3ee17abacfd1339ec22ea93301292ffd56",
"sha256": "sha256-cuSBVhHCX2Fh2SmmRpjinYtge8yaxcM06jlSXfvCywk="
"rev": "22f1a22c99e9dde8cd3c72ead333f425c5a7aa77",
"sha256": "sha256-5MaYvyrhADFGKBxcS3kbKcn9tj0FNXAN/rAXXYW6ljs="
},
"icu": {
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
@ -21,8 +21,8 @@
},
"harfbuzz": {
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
"rev": "a8b7f1880412c7f0c9ecdada0a4935011816c7dc",
"sha256": "sha256-QyVkeBVl45gygOylhnojcQuDIBp2DT2d7pD+OcX29VU="
"rev": "8d1b000a3edc90c12267b836b4ef3f81c0e53edc",
"sha256": "sha256-nFAT7HnYkIWZcV6kjDQiRltbPcmbtuRM4m5ecY4/s6E="
},
"libpng": {
"url": "https://skia.googlesource.com/third_party/libpng.git",

6
pkgs/applications/emulators/dolphin-emu/master.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu";
version = "5.0-16380";
version = "5.0-16793";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
rev = "8335ec70e5fe253eb21509408ca6b5736ed57dfc";
sha256 = "sha256-WRQ3WfMTlIPoYrEFWLHL9KSfhzQl24AlkbWjh3a4fPE=";
rev = "3cd82b619388d0877436390093a6edc2319a6904";
sha256 = "sha256-0k+kmq/jkCy52wGcmvtwmnLxUfxk3k0mvsr5wfX8p30=";
fetchSubmodules = true;
};

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "charm";
version = "0.12.1";
version = "0.12.3";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "charm";
rev = "v${version}";
sha256 = "sha256-vNy2ai1s7TKCymYznvT0Wo6lg9qEyDzz8l3SYzScz8g=";
sha256 = "sha256-FQNOU75mZqeXAVFOxTXri6bfkJZx4A/YhXMf8bFAKxs=";
};
vendorSha256 = "sha256-6PGdM7aa1BGNZc3M35PJpmrlPUqkykxfTELdgeKcJD4=";
vendorSha256 = "sha256-6Grg6/q4idhWk6slxV2GBblmOA5dclFh/PcGtPXUTd4=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];

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

@ -19,14 +19,14 @@
stdenv.mkDerivation rec {
pname = "fnott";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fnott";
rev = version;
sha256 = "sha256-Ni1LwsBkh+XekHEAPxoAkE3tjgUByvpLUGpx7WC54Jw=";
sha256 = "sha256-6NMMU39v8+Ir3rf7kVwBdEOuYnZC1MqtZnim8+0A7wM=";
};
nativeBuildInputs = [

2
pkgs/applications/misc/nerd-font-patcher/default.nix
View File

@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
font-patcher
/src/glyphs
'';
sha256 = "sha256-ePBlEVjzAJ7g6iAGIqPfgZ8bwtNILmyEVm0zD+xNN6k=";
sha256 = "sha256-06dn6M2wCFO/uBHDR7VZHNHIybT4h/VGD9nHc4G0EKA=";
};
propagatedBuildInputs = with python3Packages; [ fontforge ];

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

@ -25,14 +25,14 @@
stdenv.mkDerivation rec {
pname = "rofi-unwrapped";
version = "1.7.3";
version = "1.7.4";
src = fetchFromGitHub {
owner = "davatorium";
repo = "rofi";
rev = version;
fetchSubmodules = true;
sha256 = "sha256-bUedRRmrfdmzNW+2PzJvLbCTIWta2rbQ3CTLRSdJqbs=";
sha256 = "sha256-xAGhwzm+L8/aBJ65zfbnHyZFlg5x0b2s1x1aTC2I5po=";
};
preConfigure = ''

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "skate";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "skate";
rev = "v${version}";
sha256 = "sha256-glqBiwW87BwGRZGDSvvE/WeK4BKqXGmC6Q9qBk+ROuc=";
sha256 = "sha256-7ieXQM1Z4q4f37YSEcGs7sBAZH+64OCrWp7uBP5VNqI=";
};
vendorSha256 = "sha256-VQvumXQx5Q0gt51NI65kjSnzGRyScpli36vfCygtAjE=";
vendorSha256 = "sha256-/Q8T4/KaHglhdxMQg9v5H+mHZpuHFcLRAbh6CzaFJKU=";
doCheck = false;

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -20,11 +20,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "5.3.2679.70-1";
version = "5.4.2753.33-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "0mcq3nbbjw5x2gjah6hbbiv233bxwi68y7nziyqpp9d6nd2pixjn";
sha256 = "0bs6324m5l5vmg1x1sj6g3qb1958c5c8z35r87r3rpnv52lqr501";
};
unpackPhase = ''

6
pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "chromium-codecs-ffmpeg-extra";
version = "103.0.5060.53";
version = "104.0.5112.79";
src = fetchurl {
url = "https://launchpadlibrarian.net/607589056/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
sha256 = "sha256-Tsp5Y6sCn+mKrLGZSAWGFoSTHiyfANQ5VA7pesU1HyU=";
url = "https://launchpadlibrarian.net/616178945/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
sha256 = "sha256-JL14+2TsX1qXfRpA/tAADC0iujPj37ld6T9yPUD8R38=";
};
buildInputs = [ dpkg ];

2
pkgs/applications/networking/browsers/vivaldi/update.sh
View File

@ -37,7 +37,7 @@ git commit -m "vivaldi: ${vivaldi_version_old} -> ${vivaldi_version}"
# Check vivaldi-ffmpeg-codecs version.
chromium_version_old=$(version vivaldi-ffmpeg-codecs)
ffmpeg_update_script=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/update-ffmpeg)
chromium_version=$(sed -rne 's/FFMPEG_VERSION_DEB\=([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' <<< $ffmpeg_update_script)
chromium_version=$(sed -rne 's/^FFMPEG_VERSION_DEB\=([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' <<< $ffmpeg_update_script)
download_subdir=$(sed -rne 's/.*FFMPEG_URL_DEB\=https:\/\/launchpadlibrarian\.net\/([0-9]+)\/.*_amd64\.deb/\1/p' <<< $ffmpeg_update_script)
if [[ "$chromium_version" != "$chromium_version_old" ]]; then

6
pkgs/applications/networking/cluster/argo/default.nix
View File

@ -19,16 +19,16 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.3.8";
version = "3.3.9";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "sha256-9RwUKLVf8ArDAE6ivbWqxDCCW4OjqQFEEoWHBIv/cww=";
sha256 = "sha256-BDanFiLhucNE4uvUxKDXAK1W755VfNytQ3gXuLIKfSE=";
};
vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0=";
vendorSha256 = "sha256-303+LE3n3lltuCf+Pc7S+qHdsjQDt9IAu9Kd4sUaiYI=";
doCheck = false;

6
pkgs/applications/office/trilium/default.nix
View File

@ -10,13 +10,13 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
version = "0.53.2";
version = "0.54.2";
desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
desktopSource.sha256 = "0sjljyn7x0kv1692wccdjsll8h49r9lyqbrfnz4cn147xinclyw4";
desktopSource.sha256 = "15wbag2hk5pa6ds56ikxn9rj405jgbg6w1y896vl60sa02lm20df";
serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
serverSource.sha256 = "0y5xjf4r0c2hw2ch4ml55fq1nlmgnakq4zh3ch8sdgzm86nchavb";
serverSource.sha256 = "03z7z0jr1s132f10lagj786fr198l2xvpr72x2325brqlny5fzng";
in {

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

@ -20,6 +20,7 @@
, gzip # needed at runtime by gitweb.cgi
, withSsh ? false
, doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin
, tests
}:
assert osxkeychainSupport -> stdenv.isDarwin;
@ -374,6 +375,7 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
});
buildbot-integration = nixosTests.buildbot;
inherit (tests) fetchgit;
};
};

3
pkgs/applications/video/mpv/default.nix
View File

@ -32,6 +32,7 @@
, libXext
, libXxf86vm
, libXrandr
, libXpresent
, cddaSupport ? false
, libcdio
@ -160,7 +161,7 @@ in stdenv.mkDerivation rec {
++ lib.optionals vdpauSupport [ libvdpau ]
++ lib.optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ]
++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
++ lib.optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
++ lib.optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr libXpresent ]
++ lib.optionals xineramaSupport [ libXinerama ]
++ lib.optionals xvSupport [ libXv ]
++ lib.optionals zimgSupport [ zimg ]

2
pkgs/applications/video/obs-studio/default.nix
View File

@ -140,7 +140,7 @@ mkDerivation rec {
video content, efficiently
'';
homepage = "https://obsproject.com";
maintainers = with maintainers; [ jb55 MP2E V ];
maintainers = with maintainers; [ jb55 MP2E V miangraham ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
mainProgram = "obs";

16
pkgs/applications/video/obs-studio/wrapper.nix
View File

@ -6,7 +6,7 @@ symlinkJoin {
name = "wrapped-${obs-studio.name}";
nativeBuildInputs = [ makeWrapper ];
paths = [ obs-studio ] ++ plugins;
paths = [ obs-studio ];
postBuild = with lib;
let
@ -14,11 +14,21 @@ symlinkJoin {
pluginArguments =
lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins;
pluginsJoined = symlinkJoin {
name = "obs-studio-plugins";
paths = lists.map (plugin: "${plugin}/lib/obs-plugins") plugins;
};
pluginsDataJoined = symlinkJoin {
name = "obs-studio-plugins-data";
paths = lists.map (plugin: "${plugin}/share/obs/obs-plugins") plugins;
};
wrapCommand = [
"wrapProgram"
"$out/bin/obs"
''--set OBS_PLUGINS_PATH "$out/lib/obs-plugins"''
''--set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins"''
''--set OBS_PLUGINS_PATH "${pluginsJoined}"''
''--set OBS_PLUGINS_DATA_PATH "${pluginsDataJoined}"''
] ++ pluginArguments;
in concatStringsSep " " wrapCommand;

1
pkgs/build-support/fetchgit/builder.sh
View File

@ -12,6 +12,7 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \
${deepClone:+--deepClone} \
${fetchSubmodules:+--fetch-submodules} \
${sparseCheckout:+--sparse-checkout "$sparseCheckout"} \
${nonConeMode:+--non-cone-mode} \
${branchName:+--branch-name "$branchName"}
runHook postFetch

4
pkgs/build-support/fetchgit/default.nix
View File

@ -16,6 +16,7 @@ in
, fetchSubmodules ? true, deepClone ? false
, branchName ? null
, sparseCheckout ? ""
, nonConeMode ? false
, name ? urlToName url rev
, # Shell code executed after the file has been fetched
# successfully. This can do things like check or transform the file.
@ -54,6 +55,7 @@ in
*/
assert deepClone -> leaveDotGit;
assert nonConeMode -> (sparseCheckout != "");
if md5 != "" then
throw "fetchgit does not support md5 anymore, please use sha256"
@ -77,7 +79,7 @@ stdenvNoCC.mkDerivation {
else
lib.fakeSha256;
inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName sparseCheckout postFetch;
inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName sparseCheckout nonConeMode postFetch;
postHook = if netrcPhase == null then null else ''
${netrcPhase}

4
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -49,6 +49,7 @@ Options:
--hash h Expected hash.
--branch-name Branch name to check out into
--sparse-checkout Only fetch and checkout part of the repository.
--non-cone-mode Use non-cone mode for sparse checkouts.
--deepClone Clone the entire repository.
--no-deepClone Make a shallow clone of just the required ref.
--leave-dotGit Keep the .git directories.
@ -77,6 +78,7 @@ for arg; do
--branch-name) argfun=set_branchName;;
--deepClone) deepClone=true;;
--sparse-checkout) argfun=set_sparseCheckout;;
--non-cone-mode) nonConeMode=true;;
--quiet) QUIET=true;;
--no-deepClone) deepClone=;;
--leave-dotGit) leaveDotGit=true;;
@ -116,7 +118,7 @@ init_remote(){
clean_git remote add origin "$url"
if [ -n "$sparseCheckout" ]; then
git config remote.origin.partialclonefilter "blob:none"
echo "$sparseCheckout" | git sparse-checkout set --stdin
echo "$sparseCheckout" | git sparse-checkout set --stdin ${nonConeMode:+--no-cone}
fi
( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true
}

12
pkgs/build-support/fetchgit/tests.nix
View File

@ -16,6 +16,18 @@
src
tests
'';
sha256 = "sha256-g1PHGTWgAcd/+sXHo1o6AjVWCvC6HiocOfMbMh873LQ=";
};
sparseCheckoutNonConeMode = testers.invalidateFetcherByDrvHash fetchgit {
name = "nix-source";
url = "https://github.com/NixOS/nix";
rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
sparseCheckout = ''
src
tests
'';
nonConeMode = true;
sha256 = "sha256-FknO6C/PSnMPfhUqObD4vsW4PhkwdmPa9blNzcNvJQ4=";
};
}

4
pkgs/data/fonts/noto-fonts/default.nix
View File

@ -117,14 +117,14 @@ in
typeface = "Sans";
version = "2.004";
rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
sha256 = "sha256-11d/78i21yuzxrfB5t2VQN9OBz/qZKeozuS6BrLFjzw=";
sha256 = "sha256-PWpcTBnBRK87ZuRI/PsGp2UMQgCCyfkLHwvB1mOl5K0=";
};
noto-fonts-cjk-serif = mkNotoCJK {
typeface = "Serif";
version = "2.000";
rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
sha256 = "sha256-G+yl3LZvSFpbEUuuvattPDctKTzBCshOi970DcbPliE=";
sha256 = "sha256-1w66Ge7DZjbONGhxSz69uFhfsjMsDiDkrGl6NsoB7dY=";
};
noto-fonts-emoji = let

2
pkgs/data/icons/beauty-line-icon-theme/default.nix
View File

@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
sparseCheckout = ''
BeautyLine-V3
'';
sha256 = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk=";
sha256 = "sha256-VEQWMY77cVz6UDn7FeMYYyYgXmXl1lLYs8MlFUuGRZE=";
};
sourceRoot = "${src.name}/BeautyLine-V3";

1
pkgs/development/interpreters/jruby/default.nix
View File

@ -56,6 +56,7 @@ jruby = stdenv.mkDerivation rec {
license = with licenses; [ cpl10 gpl2 lgpl21 ];
platforms = platforms.unix;
maintainers = [ maintainers.fzakaria ];
sourceProvenance = with sourceTypes; [ binaryBytecode ];
};
};
in jruby.overrideAttrs (oldAttrs: {

4
pkgs/development/libraries/glib-networking/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "glib-networking";
version = "2.72.1";
version = "2.72.2";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "b8G+3IBiSE3IoCBJZZle8jZ8PbXJNAWP8WB+WiTZWnQ=";
sha256 = "zSoITHu5HXjoSftV1A5HL22PaGLN3J8Sw5FJNZuhgmg=";
};
patches = [

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "1.2.9";
version = "1.2.10";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-9ejha07hYwB/BZ7hmJHhmLb313ZrTvEXBylswJMlBmU=";
hash = "sha256-JJaBspM1s8n+eZfRQQfX8EY2uBWdy23403AmCXbZ1Uw=";
};
nativeBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiohttp-retry";
version = "2.7.0";
version = "2.8.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "inyutin";
repo = "aiohttp_retry";
rev = "v${version}";
hash = "sha256-vMnk7OHXTgFLcnqauAPB/vxVt8bP1To6KTIgNv7Ek+Q=";
hash = "sha256-Zr68gx8ZR9jKrogmqaFLvpBAIHE9ptHm0zZ/b49cCLw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-keyvault-secrets/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "azure-keyvault-secrets";
version = "4.4.0";
version = "4.5.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-wLcy253oVdnDl2YGfPQ+L2bNuyi4WfA8eH4zkkzKgtc=";
hash = "sha256-IfzSrUti4E4QZzE8dAqHnIRf4CllWzinZF2MI5XQOrI=";
};
propagatedBuildInputs = [

46
pkgs/development/python-modules/bluetooth-data-tools/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "bluetooth-data-tools";
version = "0.1.2";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-AobkHODtWun2TPxb6yR/ieYyeIndTG0KmxTY81fQHCA=";
};
nativeBuildInputs = [
poetry-core
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=bluetooth_data_tools --cov-report=term-missing:skip-covered" ""
'';
pythonImportsCheck = [
"bluetooth_data_tools"
];
meta = with lib; {
description = "Library for converting bluetooth data and packets";
homepage = "https://github.com/Bluetooth-Devices/bluetooth-data-tools";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "dicttoxml2";
version = "2.0.0";
version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-8/Zbv8WxDP5Bn4hgd7hTstmYv7amTlTxhQoKvzYrG/I=";
hash = "sha256-Z8tynzN911KAjAIbcMjfijT4S54RGl26o34ADur01GI=";
};
# Module has no tests

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "jarowinkler";
version = "1.2.0";
version = "1.2.1";
disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "JaroWinkler";
rev = "refs/tags/v${version}";
hash = "sha256-JR6nCLO6oUxpGKjnrrVAOLbrIALSNKkll53+3p4bb1g=";
hash = "sha256-h9sR8j5avUhY+qpzKZ54O67uTjkk2JuOvMBVaohvbUk=";
};
nativeBuildInputs = [

12
pkgs/development/python-modules/oci/default.nix
View File

@ -2,7 +2,6 @@
, buildPythonPackage
, certifi
, circuitbreaker
, configparser
, cryptography
, fetchFromGitHub
, pyopenssl
@ -13,7 +12,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.75.0";
version = "2.78.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,13 +21,12 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-dr95RHM8h2JIqkaey7E9DzbTLfLlCCUL1ZmTIH4mBRw=";
hash = "sha256-24V9vfuNMxvC5iqluW4xz7WICXbQA89xmiAH6tIDRw0=";
};
propagatedBuildInputs = [
certifi
circuitbreaker
configparser
cryptography
pyopenssl
python-dateutil
@ -37,9 +35,9 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "configparser==4.0.2 ; python_version < '3'" "configparser" \
--replace "cryptography>=3.2.1,<=3.4.7" "cryptography" \
--replace "pyOpenSSL>=17.5.0,<=19.1.0" "pyOpenSSL"
--replace "configparser==4.0.2 ; python_version < '3'" "" \
--replace "cryptography>=3.2.1,<=37.0.2" "cryptography" \
--replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL"
'';
# Tests fail: https://github.com/oracle/oci-python-sdk/issues/164

41
pkgs/development/python-modules/ocifs/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fsspec
, oci
, pythonOlder
}:
buildPythonPackage rec {
pname = "ocifs";
version = "1.1.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "oracle";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-4Yf6f89btzLij0OxGYRrnRpYCs8edDcwJPFbPZUfx9w=";
};
propagatedBuildInputs = [
fsspec
oci
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"ocifs"
];
meta = with lib; {
description = "Oracle Cloud Infrastructure Object Storage fsspec implementation";
homepage = "https://ocifs.readthedocs.io";
license = with licenses; [ upl ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "4.0.8";
version = "5.1.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-B0t9kNl55VsPC8ZXP7/lRDJ0Hfm4uhSEMGX9To4fjAU=";
hash = "sha256-9cfxLbpA2WHsolF/jxrsx7mEWj6exlCNHce3waI308I=";
};
postPatch = ''

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

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.21.2";
version = "0.21.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
sha256 = "sha256-vWPKlI1dRj2bN36SnkkjibACPkCqjlQn2Dq9+usgOhc=";
sha256 = "sha256-z/HSvk8fXPZmmx7lWaUMPfgT8EAmRn5sjRI+F4JKryw=";
};
propagatedBuildInputs = [

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

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pyinfra";
version = "2.3";
version = "2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Fizzadar";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-aKEbmvxsWOJU4DWkEWxezVqXwaUofMzEphB/Hj1XqHU=";
hash = "sha256-nWH4o6NqyqkZg/HxF6NesnA6ijWo+B94BeohSsP60TY=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pymicrobot";
version = "0.0.1";
version = "0.0.3";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyMicroBot";
inherit version;
hash = "sha256-I43a75jEU/jvjAEUBXeTZGGBy0pne1P3DA9Gbzy+c34=";
hash = "sha256-lXBL1G/rZrQah/zcVH1dFyKXO5jGB9XhmXmiKKIAbT4=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pynetgear";
version = "0.10.6";
version = "0.10.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "MatMaul";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-lpCBwz7B6QHLmFQwOz+QA3oJ2GOrE1Y/qjWE328vD2A=";
sha256 = "sha256-dYpYUeZClfRGrhd5Rw7MzBQkyGURQTeQVtCc51AqXb4=";
};
propagatedBuildInputs = [

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

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "rapidfuzz";
version = "2.4.3";
version = "2.5.0";
disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "RapidFuzz";
rev = "refs/tags/v${version}";
hash = "sha256-KKRqSMU1AzXYDB50CBQ1ZcL87KgG2/tL+cmR1jnrTVk=";
hash = "sha256-Cdzf6qQZQzH+tRyLEYvi7c01L5i+6WmgHozLhFQNsiQ=";
};
nativeBuildInputs = [

2
pkgs/development/python-modules/s3fs/default.nix
View File

@ -41,7 +41,7 @@ buildPythonPackage rec {
];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
broken = stdenv.isDarwin;
homepage = "https://github.com/dask/s3fs/";
description = "A Pythonic file interface for S3";
license = licenses.bsd3;

4
pkgs/development/python-modules/sensor-state-data/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "sensor-state-data";
version = "2.1.2";
version = "2.2.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-Z4sHrj0APoCfPhdSKB9guRrPo4TD47+GcQ0KoFgb268=";
hash = "sha256-ThROGmCNsOOJ65sOXRS1FefwN8Wf2DmHP294y3JVQvk=";
};
nativeBuildInputs = [

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "teslajsonpy";
version = "2.4.0";
version = "2.4.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zabuldon";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-BAayVUmp2dsaWzH8dvTjZCKGnpc6uY6Y/6gWYIgaES8=";
sha256 = "sha256-YkutsaxPxspIclRlcr5dzk7JKvlX6IXbccca3NLFtSo=";
};
nativeBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "7.12.0";
version = "7.12.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-/ni7QwBJTLc9hZPFg6wPskwuqmyKS4MHr+r7d/i87Mc=";
hash = "sha256-gM4P65YMT61kCkvUJPc0fvs+CNYGdgD1dkJ8h3qYzWs=";
};
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.22.1";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-CQX6dd/taVyqLKMzhFJxmYjbpZQIHYD+Nps1WyGqqnw=";
sha256 = "sha256-gJw/PtPwXo1FJcEH8SYRyQNaJoWQIfH2Mnxu52CqI8s=";
};
propagatedBuildInputs = [

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

@ -19,11 +19,11 @@ let
in buildPythonApplication rec {
pname = "pipenv";
version = "2022.7.24";
version = "2022.8.14";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-N05jRQIg16uymMuu4GxLAidObxyyznt7Z3/V/T3TCEE=";
sha256 = "sha256-Ig8YY+49Z/4HPX0U3606DNna/hvOTHlw2mrRZGfRLwY=";
};
LC_ALL = "en_US.UTF-8";

27
pkgs/development/tools/zed/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "zed";
version = "1.2.0";
src = fetchFromGitHub {
owner = "brimdata";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BK4LB37jr/9O0sjYgFtnEkbFqTsp/1+hcmCNMFDPiPM=";
};
vendorSha256 = "sha256-oAkQRUaEP/RNjpDH4U8XFVokf7KiLk0OWMX+U7qny70=";
subPackages = [ "cmd/zed" "cmd/zq" ];
meta = with lib; {
description = "A novel data lake based on super-structured data";
homepage = "https://github.com/brimdata/zed";
license = licenses.bsd3;
maintainers = with maintainers; [ dit7ya ];
};
}

17
pkgs/games/itch/default.nix
View File

@ -35,14 +35,13 @@ stdenvNoCC.mkDerivation rec {
sha256 = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA=";
};
icons = let sparseCheckout = "/release/images/itch-icons"; in
fetchFromGitHub {
owner = "itchio";
repo = pname;
rev = "v${version}";
hash = "sha256-1L6STTBHA9xL9IaERaH2OTvurTSng1D+P3KoW0ucEJc=";
inherit sparseCheckout;
} + sparseCheckout;
icons = fetchFromGitHub {
owner = "itchio";
repo = pname;
rev = "v${version}";
hash = "sha256-DZBmf8fe0zw5uiQjNKXw8g/vU2hjNDa87z/7XuhyXog=";
sparseCheckout = "release/images/itch-icons";
};
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
@ -69,7 +68,7 @@ stdenvNoCC.mkDerivation rec {
install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/"
install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/"
for icon in $icons/icon*.png
for icon in $icons/release/images/itch-icons/icon*.png
do
iconsize="''${icon#$icons/icon}"
iconsize="''${iconsize%.png}"

4
pkgs/os-specific/linux/intel-compute-runtime/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "intel-compute-runtime";
version = "22.17.23034";
version = "22.31.23852";
src = fetchFromGitHub {
owner = "intel";
repo = "compute-runtime";
rev = version;
sha256 = "sha256-ae6kPiVQe3+hcqXVu2ncCaVQAoMKoDHifrkKpt6uWX8=";
sha256 = "sha256-YkuYW/RRRs3EYMcx2BOsEpyW3O3XzDltmIaBoqnZfhw=";
};
nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/servers/amqp/rabbitmq-server/default.nix
View File

@ -27,12 +27,12 @@
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
version = "3.10.6";
version = "3.10.7";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-oELL1E+VbZiWUL+l0mLg6ugvJ/RJ84O/aduDzDJyQeo=";
sha256 = "sha256-tV4wWEGH8ZZQUFPbH+kGAerHyQY0Ff/4DbBsJH1pLrU=";
};
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];

4
pkgs/servers/monitoring/grafana-reporter/default.nix
View File

@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
pname = "reporter";
version = "2.1.0";
version = "2.3.1";
rev = "v${version}";
goPackagePath = "github.com/IzakMarais/reporter";
@ -15,7 +15,7 @@ buildGoPackage rec {
inherit rev;
owner = "IzakMarais";
repo = "reporter";
sha256 = "1zindyypf634l4dd2rsvp67ryz9mmzq779x9d01apd04wivd9yf1";
sha256 = "sha256-lsraJwx56I2Gn8CePWUlQu1qdMp78P4xwPzLxetYUcw=";
};
postInstall = ''

7
pkgs/shells/zsh/zsh-completions/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub}:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "zsh-completions";
@ -12,8 +12,11 @@ stdenv.mkDerivation rec {
};
strictDeps = true;
installPhase= ''
installPhase = ''
install -D --target-directory=$out/share/zsh/site-functions src/*
# tmuxp install it so avoid collision
rm $out/share/zsh/site-functions/_tmuxp
'';
meta = {

14
pkgs/tools/admin/oci-cli/default.nix
View File

@ -22,6 +22,7 @@ let
inherit version;
sha256 = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9";
};
doCheck = false;
});
};
@ -31,24 +32,24 @@ with py.pkgs;
buildPythonApplication rec {
pname = "oci-cli";
version = "3.7.2";
version = "3.14.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "oracle";
repo = "oci-cli";
repo = pname;
rev = "v${version}";
hash = "sha256-20Tnn0s+sfLEsAG9S6f61OVGpRf53wFPtt4a2/TJbCg=";
hash = "sha256-yooEZuSIw2EMJVyT/Z/x4hJi8a1F674CtsMMGkMAYLg=";
};
propagatedBuildInputs = [
arrow
certifi
click
configparser
cryptography
jmespath
oci
prompt-toolkit
pyopenssl
python-dateutil
pytz
@ -60,9 +61,10 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
--replace "cryptography>=3.2.1,<=3.4.7" "cryptography" \
--replace "pyOpenSSL==19.1.0" "pyOpenSSL" \
--replace "cryptography>=3.2.1,<=37.0.2" "cryptography" \
--replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" \
--replace "PyYAML>=5.4,<6" "PyYAML" \
--replace "prompt-toolkit==3.0.29" "prompt-toolkit" \
--replace "terminaltables==3.1.0" "terminaltables"
'';

4
pkgs/tools/misc/yt-dlp/default.nix
View File

@ -20,11 +20,11 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2022.8.8";
version = "2022.8.14";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Fcq2Em4SrxETQhOAbmpc+X0cYiHhSKomGN3UKTmjCo0=";
sha256 = "sha256-mizrdqTMSKqAEn7/ioU9nIt+/ovhIcISPcv9PQa8lF8=";
};
propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ];

4
pkgs/tools/security/dnsrecon/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "dnsrecon";
version = "1.1.2";
version = "1.1.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "darkoperator";
repo = pname;
rev = version;
hash = "sha256-rOFDoQEIlwV02c2aJsovnhvaC2XTFq9mMEfilG+Gs4w=";
hash = "sha256-V4/6VUlMizy8EN8ajN56YF+COn3/dfmD0997R+iR86g=";
};
propagatedBuildInputs = with python3.pkgs; [

2
pkgs/tools/security/metasploit/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.11"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.12"

14
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: addeeea49e5217ade1407a2e9a3cf6514ad8972e
ref: refs/tags/6.2.11
revision: 38794f11b8a4c685c1f90b832a9a77974f5e0471
ref: refs/tags/6.2.12
specs:
metasploit-framework (6.2.11)
metasploit-framework (6.2.12)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@ -130,13 +130,13 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.616.0)
aws-partitions (1.618.0)
aws-sdk-core (3.132.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.326.0)
aws-sdk-ec2 (1.327.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.69.0)
@ -178,7 +178,7 @@ GEM
eventmachine (1.2.7)
faker (2.22.0)
i18n (>= 1.8.11, < 2)
faraday (2.5.1)
faraday (2.5.2)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.0)
@ -402,7 +402,7 @@ GEM
ttfunk (1.7.0)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.1)
tzinfo-data (1.2022.2)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext

4
pkgs/tools/security/metasploit/default.nix
View File

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.2.11";
version = "6.2.12";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-MdSAJc0H+UU5pr6OzUNOaZDE3d0MdRQyZS2Ear2Wv9k=";
sha256 = "sha256-KIpPThnT0hMeJu75yvv1YIXxb2B5SJhS2SibMAn+EU8=";
};
nativeBuildInputs = [ makeWrapper ];

22
pkgs/tools/security/metasploit/gemset.nix
View File

@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bz5wb377xnp4hs13sf4sxalfn2ycxfry1g5lfwixzvwhhbim5x1";
sha256 = "1wv819cag3bhq07d4xjspinakqdfw97chpd9s6qqr70xicpl43zn";
type = "gem";
};
version = "1.616.0";
version = "1.618.0";
};
aws-sdk-core = {
groups = ["default"];
@ -124,10 +124,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0674pphc7m3di01dzbcvl9g5brv1mmcmj14lwaj73gsvbc6zybhy";
sha256 = "0gdqf0dfkqk4q6x9rz9dq0sliqmybdfkbfzyifm4y2pvqaiybgir";
type = "gem";
};
version = "1.326.0";
version = "1.327.0";
};
aws-sdk-iam = {
groups = ["default"];
@ -354,10 +354,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jf9gfr2viracxm0nzd2mzs07j2ilznj7w3awyrr2wm53b56pc3h";
sha256 = "1a6q8k82vfqyzlnrs6r6d82fyz5fminc8p57mr5xkdabs0m2y3mx";
type = "gem";
};
version = "2.5.1";
version = "2.5.2";
};
faraday-net_http = {
groups = ["default"];
@ -614,12 +614,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "addeeea49e5217ade1407a2e9a3cf6514ad8972e";
sha256 = "1ndzjsynm11dclr18x8cvpfw94399r1wv3mylqwlby87rljq1m1i";
rev = "38794f11b8a4c685c1f90b832a9a77974f5e0471";
sha256 = "0kqizq4k16r8v599hj3rc1pz31b0ypxwmygf4qg17lnk3574z2i8";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.2.11";
version = "6.2.12";
};
metasploit-model = {
groups = ["default"];
@ -1447,10 +1447,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yvfyxz70r45j65763fzy0p5j8cxlhnpn1n5lcxj4is7hp8v5i23";
sha256 = "0792pfxr0n143r424ibl4ahpd5yl9yxnnwifiy8qdc14j2c7bsz8";
type = "gem";
};
version = "1.2022.1";
version = "1.2022.2";
};
unf = {
groups = ["default"];

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

@ -12395,6 +12395,8 @@ with pkgs;
zdelta = callPackage ../tools/compression/zdelta { };
zed = callPackage ../development/tools/zed { };
zellij = callPackage ../tools/misc/zellij {
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
};

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

@ -1383,6 +1383,8 @@ in {
bluetooth-adapters = callPackage ../development/python-modules/bluetooth-adapters { };
bluetooth-data-tools= callPackage ../development/python-modules/bluetooth-data-tools { };
bluetooth-sensor-state-data = callPackage ../development/python-modules/bluetooth-sensor-state-data { };
blurhash = callPackage ../development/python-modules/blurhash { };
@ -6182,6 +6184,8 @@ in {
oci = callPackage ../development/python-modules/oci { };
ocifs = callPackage ../development/python-modules/ocifs { };
ocrmypdf = callPackage ../development/python-modules/ocrmypdf { };
od = callPackage ../development/python-modules/od { };