alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-03-23 06:01:55 +00:00 committed by GitHub
parent f0717ed92b 965d0ba5fa
commit c80dabe3b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
97 changed files with 1969 additions and 1499 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View file

@ -1295,6 +1295,12 @@
githubId = 127523;
name = "Herman Fries";
};
BarinovMaxim = {
name = "Barinov Maxim";
email = "barinov274@gmail.com";
github = "barinov274";
githubId = 54442153;
};
barrucadu = {
email = "mike@barrucadu.co.uk";
github = "barrucadu";
@ -11255,6 +11261,12 @@
githubId = 293035;
name = "Shawn Dellysse";
};
shawn8901 = {
email = "shawn8901@googlemail.com";
github = "shawn8901";
githubId = 12239057;
name = "Shawn8901";
};
shazow = {
email = "andrey.petrov@shazow.net";
github = "shazow";

10
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View file

@ -837,6 +837,16 @@
<literal>true</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>miller</literal> package has been upgraded from
5.10.3 to
<link xlink:href="https://github.com/johnkerl/miller/releases/tag/v6.2.0">6.2.0</link>.
See
<link xlink:href="https://miller.readthedocs.io/en/latest/new-in-miller-6">What’s
new in Miller 6</link>.
</para>
</listitem>
<listitem>
<para>
MultiMC has been replaced with the fork PolyMC due to upstream

2
nixos/doc/manual/release-notes/rl-2205.section.md
View file

@ -328,6 +328,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The options `networking.interfaces.<name>.ipv4.routes` and `networking.interfaces.<name>.ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`.
- The `miller` package has been upgraded from 5.10.3 to [6.2.0](https://github.com/johnkerl/miller/releases/tag/v6.2.0). See [What's new in Miller 6](https://miller.readthedocs.io/en/latest/new-in-miller-6).
- MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.
- `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn.<name>.execConfig.PrivateUsers = false`

6
pkgs/applications/audio/tonelib-gfx/default.nix
View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "tonelib-gfx";
version = "4.7.0";
version = "4.7.5";
src = fetchurl {
url = "https://www.tonelib.net/download/0930/ToneLib-GFX-amd64.deb";
hash = "sha256-BcbX0dz94B4mj6QeQsnuZmwXAaXH+yJjnrUPgEYVqkU=";
url = "https://www.tonelib.net/download/220214/ToneLib-GFX-amd64.deb";
hash = "sha256-GUSyarqG1V5O6ayAedeGqmOA+UABQDpAZ+dsorh7das=";
};
nativeBuildInputs = [ autoPatchelfHook dpkg ];

6
pkgs/applications/audio/tonelib-jam/default.nix
View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "tonelib-jam";
version = "4.7.0";
version = "4.7.5";
src = fetchurl {
url = "https://www.tonelib.net/download/0930/ToneLib-Jam-amd64.deb";
sha256 = "sha256-xyBDp3DQVC+nK2WGnvrfUfD+9GvwtbldXgExTMmCGw0=";
url = "https://www.tonelib.net/download/220214/ToneLib-Jam-amd64.deb";
sha256 = "sha256-alkdoEhN58o9IGZ8sB39ctTpouMSmvgn6tbrKFneKPI=";
};
nativeBuildInputs = [

40
pkgs/applications/blockchains/polkadot/default.nix
View file

@ -8,15 +8,21 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.17";
version = "0.9.18";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
sha256 = "sha256-m47Y4IXGc43XLs5d6ehlD0A53BWC5kO3K2BS/xbYgl8=";
sha256 = "sha256-pjHSiVspBV15jKUFv+Uf2l3tah40l55Pv8vwDuwgwjc=";
# see the comment below on fakeGit for how this is used
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
# since having a .git folder introduces reproducibility issues to the nix
# build, we check the git commit hash after fetching the source and save it
# into a .git_commit file, and then delete the .git folder. we can then use
# this file to populate an environment variable with the commit hash, which
# is picked up by polkadot's build process.
leaveDotGit = true;
postFetch = ''
( cd $out; git rev-parse --short HEAD > .git_commit )
@ -24,28 +30,14 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-JBacioy2woAfKQuK6tXU9as4DNc+3uY3F3GWksCf6WU=";
cargoSha256 = "sha256-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94=";
nativeBuildInputs =
let
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
# since having a .git folder introduces reproducibility issues to the nix
# build, we check the git commit hash after fetching the source and save it
# into a .git_commit file, and then delete the .git folder. then we create a
# fake git command that will just return the contents of this file, which will
# be used when the polkadot build calls `git rev-parse` to fetch the commit
# hash.
fakeGit = writeShellScriptBin "git" ''
if [[ $@ = "rev-parse --short HEAD" ]]; then
cat /build/source/.git_commit
else
>&2 echo "Unknown command: $@"
exit 1
fi
'';
in
[ clang fakeGit ];
nativeBuildInputs = [ clang ];
preBuild = ''
export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(cat .git_commit)
rm .git_commit
'';
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
PROTOC = "${protobuf}/bin/protoc";

782
pkgs/applications/editors/vim/plugins/generated.nix
View file

File diff suppressed because it is too large Load diff

30
pkgs/applications/emulators/collapseos-cvm/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib, stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
pname = "collapseos-cvm";
version = "20220316";
src = fetchurl {
url = "http://collapseos.org/files/collapseos-${version}.tar.gz";
hash = "sha256-8bt6wj93T82K9fqtuC/mctkMCzfvW0taxv6QAKeJb5g=";
};
buildInputs = [ ncurses ];
sourceRoot = "cvm";
postPatch = ''
substituteInPlace common.mk \
--replace "-lcurses" "-lncurses"
'';
installPhase = ''
runHook preInstall;
find . -type f -executable -exec install -Dt $out/bin {} \;
runHook postInstall;
'';
meta = {
description = "Virtual machine for Collapse OS (Forth operating system)";
changelog = "http://collapseos.org/files/CHANGES.txt";
downloadPage = "http://collapseos.org/files/";
homepage = "http://collapseos.org/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ ehmry ];
mainProgram = "cos-serial";
};
}

52
pkgs/applications/emulators/goldberg-emu/default.nix Normal file
View file

@ -0,0 +1,52 @@
{ lib
, stdenv
, fetchFromGitLab
, cmake
, protobuf
}:
stdenv.mkDerivation rec {
pname = "goldberg-emu";
version = "0.2.5";
src = fetchFromGitLab {
owner = "mr_goldberg";
repo = "goldberg_emulator";
rev = version;
sha256 = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog=";
};
# It attempts to install windows-only libraries which we never build
patches = [ ./dont-install-unsupported.patch ];
nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ];
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/goldberg"
];
preFixup = ''
mkdir -p $out/{bin,lib}
chmod +x $out/share/goldberg/tools/find_interfaces.sh
ln -s $out/share/goldberg/libsteam_api.so $out/lib
ln -s $out/share/goldberg/lobby_connect/lobby_connect $out/bin
ln -s $out/share/goldberg/tools/generate_interfaces_file $out/bin
ln -s $out/share/goldberg/tools/find_interfaces.sh $out/bin/find_interfaces
'';
meta = with lib; {
homepage = "https://gitlab.com/Mr_Goldberg/goldberg_emulator";
changelog = "https://gitlab.com/Mr_Goldberg/goldberg_emulator/-/releases";
description = "Program that emulates steam online features";
longDescription = ''
Steam emulator that emulates steam online features. Lets you play games that
use the steam multiplayer apis on a LAN without steam or an internet connection.
'';
mainProgram = "lobby_connect";
license = licenses.lgpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.ivar ];
};
}

34
pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch Normal file
View file

@ -0,0 +1,34 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abaace2..5e3465c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,10 +182,10 @@ if(WIN32)
RUNTIME DESTINATION ./
)
else()
- install(TARGETS
- ${LIB_STEAMCLIENT}
- LIBRARY DESTINATION ./
- )
+ # install(TARGETS
+ #${LIB_STEAMCLIENT}
+ #LIBRARY DESTINATION ./
+ #)
endif()
if(NOT WIN32)
@@ -220,10 +220,10 @@ if(WIN32)
RUNTIME DESTINATION ./
)
else()
- install(TARGETS
- ${LIB_STEAMNETWORKINGSOCKETS}
- LIBRARY DESTINATION ./
- )
+ # install(TARGETS
+ # ${LIB_STEAMNETWORKINGSOCKETS}
+ # LIBRARY DESTINATION ./
+ # )
endif()
if(NOT WIN32)

4
pkgs/applications/misc/prusa-slicer/default.nix
View file

@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.4.0";
version = "2.4.1";
nativeBuildInputs = [
cmake
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
sha256 = "1mb7v0khrmsgy3inmh4mjn709jlhx422kvbnrhsqziph2wwak9bz";
sha256 = "sha256-4L/x8cMQee3n20iyWEiXd62NtA6BYM1SHkCn8ZlDNWA=";
rev = "version_${version}";
};

4
pkgs/applications/misc/zettlr/default.nix
View file

@ -10,11 +10,11 @@
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
let
pname = "zettlr";
version = "2.2.3";
version = "2.2.4";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
sha256 = "sha256-BXStGhCEXpQRyLjcS00CM/NI/NVRKpLTlW8Xh51fV8w=";
sha256 = "sha256-lzXciToyUsHl8WV0IvdP6R2pYegL7/G04YPLb6gbCgQ=";
};
appimageContents = appimageTools.extractType2 {
inherit name src;

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

3
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -224,6 +224,9 @@ buildStdenv.mkDerivation ({
configureScript="$(realpath ./mach) configure"
export MOZBUILD_STATE_PATH=$(pwd)/mozbuild
# Set consistent remoting name to ensure wmclass matches with desktop file
export MOZ_APP_REMOTINGNAME="${binaryName}"
'' + (lib.optionalString (lib.versionAtLeast version "95.0") ''
# RBox WASM Sandboxing
export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc

4
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
version = "98.0.1";
version = "98.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1434ff775e6cdc6d9a75fa0e6d07a4680ada86ecfd7b65208c597ed765e847d900b68df355e6bea6461f6d86ee7a8b2ce3117f23826ad144bd87dfe64ee39b42";
sha512 = "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e";
};
meta = {

30
pkgs/applications/networking/browsers/palemoon/default.nix
View file

@ -6,7 +6,7 @@
, dbus
, dbus-glib
, desktop-file-utils
, fetchFromGitea
, fetchzip
, ffmpeg
, fontconfig
, freetype
@ -44,15 +44,12 @@ assert with lib.strings; (
stdenv.mkDerivation rec {
pname = "palemoon";
version = "30.0.0";
version = "29.4.4";
src = fetchFromGitea {
domain = "repo.palemoon.org";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
fetchSubmodules = true;
sha256 = "02qdw8b7hphphc66m3m14r4pmcfiq2c5z4jcscm2nymy18ycb10f";
src = fetchzip {
name = "${pname}-${version}";
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc=";
};
nativeBuildInputs = [
@ -140,15 +137,24 @@ stdenv.mkDerivation rec {
./mach install
# Install official branding stuff (desktop file & icons)
# Fix missing icon due to wrong WMClass
# https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221
substituteInPlace ./palemoon/branding/official/palemoon.desktop \
--replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon'
desktop-file-install --dir=$out/share/applications \
./other-licenses/branding/palemoon/official/palemoon.desktop
./palemoon/branding/official/palemoon.desktop
# Install official branding icons
for iconname in default{16,22,24,32,48,256} mozicon128; do
n=''${iconname//[^0-9]/}
size=$n"x"$n
install -Dm644 ./other-licenses/branding/palemoon/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
done
# Remove unneeded SDK data from installation
# https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729
rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}}
runHook postInstall
'';

4
pkgs/applications/networking/browsers/palemoon/mozconfig
View file

@ -12,7 +12,7 @@ _BUILD_64=@build64@
_GTK_VERSION=@gtkversion@
# Standard build options for Pale Moon
ac_add_options --enable-application=browser
ac_add_options --enable-application=palemoon
ac_add_options --enable-optimize="-O2 -w"
ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION
ac_add_options --enable-jemalloc
@ -20,6 +20,8 @@ ac_add_options --enable-strip
ac_add_options --enable-devtools
ac_add_options --enable-av1
ac_add_options --disable-eme
ac_add_options --disable-webrtc
ac_add_options --disable-gamepad
ac_add_options --disable-tests
ac_add_options --disable-debug

4
pkgs/applications/networking/browsers/yandex-browser/default.nix
View file

@ -50,11 +50,11 @@
stdenv.mkDerivation rec {
pname = "yandex-browser";
version = "22.1.3.856-1";
version = "22.1.3.907-1";
src = fetchurl {
url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb";
sha256 = "sha256-+xxyV8dBnfu2hQ/ykkp7wFSaojhlPLVvMmZdh/hyaoE=";
sha256 = "sha256-7dbFqNzZP2CyseK0xD9zcvecIuueZfMy5KgN8gRRLEk=";
};
nativeBuildInputs = [

86
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -148,10 +148,10 @@
"owner": "DrFaust92",
"provider-source-address": "registry.terraform.io/DrFaust92/bitbucket",
"repo": "terraform-provider-bitbucket",
"rev": "v2.12.0",
"sha256": "sha256-FIJ2nnTHV+Rb4Dbtqcdc06qaBBg3hG8NBwv1LxgnoQI=",
"vendorSha256": "sha256-GEnLgGk9yohWXftNfp9Y21BQKE1B6QwN08d7k0ofKTc=",
"version": "2.12.0"
"rev": "v2.13.1",
"sha256": "sha256-P/6scAuRMRrACHmEdWjn+W37ptVmVgtj+iTXQDrG+WM=",
"vendorSha256": "sha256-o1CZ4VuGCPALqSIz8KSm1zCwd3r9bR13CRvP7XpVBAM=",
"version": "2.13.1"
},
"brightbox": {
"owner": "brightbox",
@ -194,10 +194,10 @@
"owner": "cloudflare",
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v3.10.1",
"sha256": "sha256-2Ulavo82Y8dEOXtgpbgCwuCTOhAEoOFbgL4bK5HXQlY=",
"vendorSha256": "sha256-CgK1/Ddau3glxmzb7Y6o1RZbMV8dwA84F6n2OzuyZrU=",
"version": "3.10.1"
"rev": "v3.11.0",
"sha256": "sha256-z7IjLXO/AHWENKYaCospJDcOwOubNcRHKDQzmRkhimw=",
"vendorSha256": "sha256-Lx/faIdx4k399sm9p8BVqpiKZtNjZoThBhWWWgEuPyg=",
"version": "3.11.0"
},
"cloudfoundry": {
"owner": "cloudfoundry-community",
@ -293,10 +293,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/dns",
"repo": "terraform-provider-dns",
"rev": "v3.2.1",
"sha256": "1zynfwm7hl7pnldjr2nxj0a06j209r62g8zpkasj6zdjscy62rc8",
"vendorSha256": "0hpf48z7i5h1hh52wpyc48axpvfx9h3209iw36v8c764xzf87w0g",
"version": "3.2.1"
"rev": "v3.2.3",
"sha256": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=",
"vendorSha256": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=",
"version": "3.2.3"
},
"dnsimple": {
"owner": "dnsimple",
@ -411,20 +411,20 @@
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.14.0",
"sha256": "sha256-VWbyxZ5ag9jRF5yaiEdVkRpmnsSb5IiE5FtE2e3j0b8=",
"vendorSha256": "sha256-NrP3+pBePNex/ZmVM349p5vI8uVcs21Sti2C3NfxZkQ=",
"version": "4.14.0"
"rev": "v4.15.0",
"sha256": "sha256-BHtbBfCihy1zh/A9JB03CDh5KpzMWeR/mbuRErJkVUE=",
"vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=",
"version": "4.15.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.14.0",
"sha256": "sha256-VEQff8SnyPLu9I6dbGRac5rF/hRAihlxFhX6KLaov/Y=",
"vendorSha256": "sha256-NrP3+pBePNex/ZmVM349p5vI8uVcs21Sti2C3NfxZkQ=",
"version": "4.14.0"
"rev": "v4.15.0",
"sha256": "sha256-FTT6PS0OS4HPfkM2u4PZwOA/v5VzDwHLdO2s+qgRkW8=",
"vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=",
"version": "4.15.0"
},
"grafana": {
"owner": "grafana",
@ -583,10 +583,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
"repo": "terraform-provider-kubernetes",
"rev": "v2.8.0",
"sha256": "15mjx531jzrsfd4kxnklcr8q7gbq64z772y9m5lhq73anr9yqfa3",
"rev": "v2.9.0",
"sha256": "sha256-w16pm2+8M59grW5HUBBtkKaCnvf5p4GQMEHtQa4DLXs=",
"vendorSha256": null,
"version": "2.8.0"
"version": "2.9.0"
},
"launchdarkly": {
"owner": "launchdarkly",
@ -683,10 +683,10 @@
"owner": "aminueza",
"provider-source-address": "registry.terraform.io/aminueza/minio",
"repo": "terraform-provider-minio",
"rev": "v1.4.0",
"sha256": "0da7dhgs1c4r65fwwbkbz67lphrsl6ia5v8yx5viwfrsgdh0319z",
"vendorSha256": "1yshi8sz99ii9v77hlgkrcxrazjc8f6s79dszxdrnjwhahnz0hac",
"version": "1.4.0"
"rev": "v1.5.0",
"sha256": "sha256-wHxslrcjv0SuQhbEv95lkGba61HMimE1JLX4lWgSi3s=",
"vendorSha256": "sha256-j5DWJodrnGm9a3VsOjk0ZeVBh77C00SMMXrK7SNKKrY=",
"version": "1.5.0"
},
"mongodbatlas": {
"owner": "mongodb",
@ -719,10 +719,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v2.41.0-beta.2",
"sha256": "sha256-tAEEJuU2ceTwXRtgGUFiFw1jgdJHSPG/WfaMDRm+gGQ=",
"rev": "v2.41.1",
"sha256": "sha256-fd4S78viG38Y8xCNnX4l4/dQ/x8JA6Ej/kd556jvBOU=",
"vendorSha256": "sha256-Dvm8vmlfV7LH73Y2jNTO106V/fOA7K78jFclbFKZVXA=",
"version": "2.41.0-beta.2"
"version": "2.41.1"
},
"nomad": {
"owner": "hashicorp",
@ -765,10 +765,10 @@
"owner": "nutanix",
"provider-source-address": "registry.terraform.io/nutanix/nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.3.0",
"sha256": "1q38f6a8d607sdhrr6xcqmdsvm625v7y36xma137bqv09g3xga0s",
"vendorSha256": "0qkd9pnidf4rhbk7p4jkpcdq36g8lp8pwpsf3hydy6xh072iy4id",
"version": "1.3.0"
"rev": "v1.4.0",
"sha256": "sha256-zOGZxDxGMeubZQ3u+7Qoj+gy29Et7yeFNFWpXbLllEY=",
"vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=",
"version": "1.4.0"
},
"oci": {
"owner": "oracle",
@ -1072,10 +1072,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.65.2",
"sha256": "sha256-JrgLHagLc+yhTMa6gVJpVxy3NGCO2BED/87z0JEhesE=",
"rev": "v1.66.0",
"sha256": "sha256-wbG2O6i0Ai86P+uk9rTsut+DEZcRFJCh93CfIEOfP2A=",
"vendorSha256": null,
"version": "1.65.2"
"version": "1.66.0"
},
"tfe": {
"owner": "hashicorp",
@ -1090,10 +1090,10 @@
"owner": "a10networks",
"provider-source-address": "registry.terraform.io/a10networks/thunder",
"repo": "terraform-provider-thunder",
"rev": "v0.5.21-beta",
"sha256": "1z52ifdi0nj3miwjz96zkmszh13l3vcbijgacfa28j2shasjyfwd",
"rev": "v1.0.0",
"sha256": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",
"vendorSha256": null,
"version": "0.5.21-beta"
"version": "1.0.0"
},
"time": {
"owner": "hashicorp",
@ -1164,10 +1164,10 @@
"owner": "Venafi",
"provider-source-address": "registry.terraform.io/Venafi/venafi",
"repo": "terraform-provider-venafi",
"rev": "v0.15.0",
"sha256": "sha256-7pfEQ7tHA+RiyotlvEymedCsDtR+8EDob1kKw55U5V0=",
"rev": "v0.15.2",
"sha256": "sha256-jnBunvqdLuU+GTRoXr/62FSnUoD5nfLVCN/wo4NdM3A=",
"vendorSha256": "sha256-lj8cuv9jR+3P7OiO/eW8poHcX+LsQo+kOyspiqdMXRY=",
"version": "0.15.0"
"version": "0.15.2"
},
"vercel": {
"owner": "ondrejsika",

42
pkgs/applications/networking/instant-messengers/gotktrix/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib
, buildGoModule
, fetchFromGitHub
, gtk4
, glib
, gobject-introspection
, pkg-config
, go
}:
buildGoModule rec {
pname = "gotktrix";
version = "0.1.1";
src = fetchFromGitHub {
owner = "diamondburned";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9feKg/rnkWdJRolHBQ5WT6Rl3xTFe82M8HyxJK3VuN4=";
};
vendorSha256 = "sha256-eO/2MvWOVCeeCsiU2mSwgSEVlSbCXOp8qHyoG0lmk+Q=";
buildInputs = [
gtk4
glib
gobject-introspection
];
nativeBuildInputs = [ pkg-config ];
# Checking requires a working display
doCheck = false;
meta = with lib; {
description = "Matrix client written in Go using GTK4";
homepage = "https://github.com/diamondburned/gotktrix";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;
};
}

4
pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix
View file

@ -5,10 +5,10 @@
appimageTools.wrapType2 rec {
pname = "session-desktop-appimage";
version = "1.7.7";
version = "1.7.9";
src = fetchurl {
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
sha256 = "iMJk7/Q3Kh2KwLs0m+DAPVv471iPZcsIs4+YCSbmeIo=";
sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef";
};
meta = with lib; {

81
pkgs/applications/office/bookworm/default.nix
View file

@ -1,42 +1,67 @@
{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee
, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook
, appstream, desktop-file-utils }:
{ lib
, stdenv
, fetchFromGitHub
, appstream
, bash
, coreutils
, curl
, desktop-file-utils
, glib
, gnugrep
, gobject-introspection
, gtk3
, html2text
, libgee
, libxml2
, meson
, ninja
, pantheon
, pkg-config
, poppler
, poppler_utils
, python3
, sqlite
, unar
, unzip
, vala
, webkitgtk
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "bookworm";
version = "1.1.2";
version = "unstable-2022-01-09";
src = fetchFromGitHub {
owner = "babluboy";
repo = pname;
rev = version;
sha256 = "0w0rlyahpgx0l6inkbj106agbnr2czil0vdcy1zzv70apnjz488j";
rev = "f3df858ce748a6bbc43f03a6e261ff76a6d7d303";
hash = "sha256-mLyJfblF5WnWBV3rX1ZRupccou4t5mBpo3W7+ECNMVI=";
};
nativeBuildInputs = [
bash
gobject-introspection
libxml2
meson
ninja
pkg-config
python3
vala
wrapGAppsHook
];
buildInputs = [
pantheon.granite
glib
libgee
gtk3
html2text
poppler
python2
sqlite
webkitgtk
appstream
desktop-file-utils
glib
gobject-introspection
gtk3
html2text
libgee
libxml2
pantheon.granite
poppler
python3
sqlite
webkitgtk
];
postPatch = ''
@ -57,13 +82,13 @@ stdenv.mkDerivation rec {
patchShebangs $out/share/bookworm/scripts/tasks/*.sh
'';
meta = with lib; {
description = "A simple, focused eBook reader";
longDescription = ''
Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc.
'';
homepage = "https://babluboy.github.io/bookworm/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
meta = with lib; {
description = "A simple, focused eBook reader";
longDescription = ''
Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc.
'';
homepage = "https://babluboy.github.io/bookworm/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

4
pkgs/applications/science/math/cemu/default.nix
View file

@ -7,7 +7,7 @@
, qtbase
, qmake
, git
, libpng_apng
, libpng
, pkg-config
, wrapQtAppsHook
, stdenv
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
libarchive
libusb-compat-0_1
qtbase
libpng_apng
libpng
];
qmakeFlags = [

6
pkgs/applications/science/misc/simgrid/default.nix
View file

@ -4,6 +4,7 @@
, buildJavaBindings ? false, openjdk
, buildPythonBindings ? true, python3Packages
, modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw
, bmfSupport ? true, eigen
, minimalBindings ? false
, debug ? false
, optimize ? (!debug)
@ -19,14 +20,14 @@ in
stdenv.mkDerivation rec {
pname = "simgrid";
version = "3.30";
version = "3.31";
src = fetchFromGitLab {
domain = "framagit.org";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1dg8ywqif20g0fs8dnd6364n080nvwx7f444zcfwqwz6iax61qv1";
sha256 = "sha256-K6YkkCMxc2lqxHIwyuLiwcp3m49sqbEtOlwZh4L1YJg=";
};
propagatedBuildInputs = [ boost ];
@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
++ optionals buildJavaBindings [ openjdk ]
++ optionals buildPythonBindings [ python3Packages.pybind11 ]
++ optionals buildDocumentation [ fig2dev ghostscript doxygen ]
++ optionals bmfSupport [ eigen ]
++ optionals modelCheckingSupport [ libunwind libevent elfutils ];
outputs = [ "out" ]

43
pkgs/applications/version-management/git-and-tools/hut/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ lib
, buildGoModule
, fetchFromSourcehut
, scdoc
, unstableGitUpdater
}:
buildGoModule {
pname = "hut";
version = "unstable-2022-03-02";
src = fetchFromSourcehut {
owner = "~emersion";
repo = "hut";
rev = "55ad2fbd9ceeeb9e7dc203c15476fa785f1209e0";
sha256 = "sha256-j2IVwCm7iq3JKccPL8noRBhqw+V+4qfcpAwV65xhZk0=";
};
vendorSha256 = "sha256-zdQvk0M1a+Y90pnhqIpKxLJnlVJqMoSycewTep2Oux4=";
nativeBuildInputs = [
scdoc
];
makeFlags = [ "PREFIX=$(out)" ];
postBuild = ''
make $makeFlags completions doc/hut.1
'';
preInstall = ''
make $makeFlags install
'';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
homepage = "https://sr.ht/~emersion/hut/";
description = "A CLI tool for Sourcehut / sr.ht";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fgaz ];
};
}

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

@ -11,24 +11,24 @@ with lib;
let
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
pname = "gitkraken";
version = "8.3.0";
version = "8.3.3";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-iAXw6+KCyfyabyJvBQ5cLNEMNbsELL9sQaZkzZL7+/w=";
sha256 = "185msrpa33w40prc88n5m0g12wh8r6szj56iikk4ps6kwr6wamy7";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
sha256 = "sha256-Spgx5JQ/AENYdvkl7+YnBaNk/VI9DdyN17ABfxanfZ4=";
sha256 = "0iam5ni8imajxhcv12zib6m475i6czllmqy512r1wmzw9zbilf43";
};
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
sha256 = "sha256-PJ4/R1pHbfoSBHhIyiqcGoE13FSWQapxj4Lq+ZdcYCQ=";
sha256 = "12af421r4d8s4l5j54xyd3x8pa72nbilass95v0y3b0wgsi35g0z";
};
};

50
pkgs/applications/video/gpu-screen-recorder/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ stdenv, lib, fetchgit, makeWrapper, pkg-config, cudatoolkit, glew, libX11
, libXcomposite, glfw, libpulseaudio, ffmpeg }:
stdenv.mkDerivation rec {
pname = "gpu-screen-recorder";
version = "1.0.0";
src = fetchgit {
url = "https://repo.dec05eba.com/gpu-screen-recorder";
rev = "36fd4516db06bcb192e49055319d1778bbed0322";
sha256 = "sha256-hYEHM4FOYcPmQ5Yxh520PKy8HiD+G0xv9hrn8SmA07w=";
};
nativeBuildInputs = [
pkg-config
makeWrapper
];
buildInputs = [
glew
libX11
libXcomposite
glfw
libpulseaudio
ffmpeg
];
postPatch = ''
substituteInPlace ./build.sh \
--replace '/opt/cuda/targets/x86_64-linux/include' '${cudatoolkit}/targets/x86_64-linux/include' \
--replace '/usr/lib64/libcuda.so' '${cudatoolkit}/targets/x86_64-linux/lib/stubs/libcuda.so'
'';
buildPhase = ''
./build.sh
'';
installPhase = ''
install -Dt $out/bin/ gpu-screen-recorder
wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib
'';
meta = with lib; {
description = "A screen recorder that has minimal impact on system performance by recording a window using the GPU only";
homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ babbaj ];
platforms = [ "x86_64-linux" ];
};
}

38
pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch Normal file
View file

@ -0,0 +1,38 @@
diff --git a/build.sh b/build.sh
index 05603db..8c38b31 100755
--- a/build.sh
+++ b/build.sh
@@ -2,5 +2,5 @@
dependencies="gtk+-3.0 x11 xrandr libpulse"
includes="$(pkg-config --cflags $dependencies)"
-libs="$(pkg-config --libs $dependencies)"
+libs="$(pkg-config --libs $dependencies) -ldl"
g++ -o gpu-screen-recorder-gtk -O2 src/main.cpp -s $includes $libs
diff --git a/src/main.cpp b/src/main.cpp
index ae2078f..9dcdce1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,6 +15,7 @@
#include <pwd.h>
#include <libgen.h>
#include <functional>
+#include <dlfcn.h>
typedef struct {
Display *display;
@@ -830,7 +831,13 @@ static void audio_input_change_callback(GtkComboBox *widget, gpointer userdata)
}
static bool is_nv_fbc_installed() {
- return access("/usr/lib/libnvidia-fbc.so.1", F_OK) == 0 || access("/usr/local/lib/libnvidia-fbc.so.1", F_OK) == 0;
+ auto handle = dlopen("libnvidia-fbc.so.1", RTLD_LAZY);
+ if (handle) {
+ dlclose(handle);
+ return true;
+ } else {
+ return false;
+ }
}
static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *app) {

46
pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix Normal file
View file

@ -0,0 +1,46 @@
{ stdenv, lib, fetchgit, pkg-config, makeWrapper, gtk3, libX11, libXrandr
, libpulseaudio, gpu-screen-recorder }:
stdenv.mkDerivation rec {
pname = "gpu-screen-recorder-gtk";
version = "0.1.0";
src = fetchgit {
url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk";
rev = "4c317abd0531f8e155fbbbcd32850bbeebbf2ead";
sha256 = "sha256-5W6qmUMP31ndRDxMHuQ/XnZysPQgaie0vVlMTzfODU4=";
};
patches = [ ./fix-nvfbc-check.patch ];
nativeBuildInputs = [
pkg-config
makeWrapper
];
buildInputs = [
gtk3
libX11
libXrandr
libpulseaudio
];
buildPhase = ''
./build.sh
'';
installPhase = ''
install -Dt $out/bin/ gpu-screen-recorder-gtk
install -Dt $out/share/applications/ gpu-screen-recorder-gtk.desktop
wrapProgram $out/bin/gpu-screen-recorder-gtk --prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]}
'';
meta = with lib; {
description = "GTK frontend for gpu-screen-recorder.";
homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ babbaj ];
platforms = [ "x86_64-linux" ];
};
}

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

@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "docker-slim";
version = "1.37.4";
version = "1.37.5";
goPackagePath = "github.com/docker-slim/docker-slim";
@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "docker-slim";
repo = "docker-slim";
rev = version;
sha256 = "sha256-iz1V+wcrJf0grOe81kwbXPBqnvXpHnh7IMDdugaUOH0=";
sha256 = "sha256-MBs0ybBXsanNFt6R7+ZYvtCh7iHE3FtWXE9uy9tbrE4=";
};
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];

4
pkgs/data/icons/whitesur-icon-theme/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "Whitesur-icon-theme";
version = "2021-11-08";
version = "2022-03-18";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "LZ0GLJFUUvzsPhU2sBkfy5mPpQHuPzYhbumwFKnogoA=";
sha256 = "iHLxZqcDLUo62J67MwZ72CSvsHHiI9/Jk31KwkgIPr4=";
};
nativeBuildInputs = [ gtk3 ];

11
pkgs/data/themes/graphite-gtk-theme/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, gitUpdater
, gnome-themes-extra
, gtk-engine-murrine
, jdupes
@ -21,18 +22,18 @@ in
lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants
lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dark" "rimless" "normal" ] tweaks
lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens
stdenvNoCC.mkDerivation {
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "unstable-2022-02-04";
version = "2022-03-22";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891";
sha256 = "09xixd6cz2iyyyg6vskyk0wj2mahfsg21dlfcvi862h8w01hg9lr";
sha256 = "maYHA+AICoPiZo62IJ52UFUhOZh+6m2e9z6Kz0zrsSc=";
};
nativeBuildInputs = [
@ -85,6 +86,8 @@ stdenvNoCC.mkDerivation {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
meta = with lib; {
description = "Flat Gtk+ theme based on Elegant Design";
homepage = "https://github.com/vinceliuice/Graphite-gtk-theme";

35
pkgs/development/compilers/souffle/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, perl, ncurses, zlib, sqlite, libffi
, autoreconfHook, mcpp, bison, flex, doxygen, graphviz
{ lib, stdenv, fetchFromGitHub
, bash-completion, perl, ncurses, zlib, sqlite, libffi
, mcpp, cmake, bison, flex, doxygen, graphviz
, makeWrapper
}:
@ -10,42 +10,23 @@ let
in
stdenv.mkDerivation rec {
pname = "souffle";
version = "2.0.2";
version = "2.2";
src = fetchFromGitHub {
owner = "souffle-lang";
repo = "souffle";
rev = version;
sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5";
sha256 = "sha256-whvC+DL9XbQLc4wf2kFxUKXSyJnGkYq0/0uLCLbliJU=";
};
patches = [
# Pull pending unstream inclusion fix for ncurses-6.3:
# https://github.com/souffle-lang/souffle/pull/2134
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch";
sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa";
})
];
nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];
buildInputs = [ ncurses zlib sqlite libffi ];
nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ];
buildInputs = [ bash-completion ncurses zlib sqlite libffi ];
# these propagated inputs are needed for the compiled Souffle mode to work,
# since generated compiler code uses them. TODO: maybe write a g++ wrapper
# that adds these so we can keep the propagated inputs clean?
propagatedBuildInputs = [ ncurses zlib sqlite libffi ];
# see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for
# Wno-error fixes
postPatch = ''
substituteInPlace ./src/Makefile.am \
--replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other'
substituteInPlace configure.ac \
--replace "m4_esyscmd([git describe --tags --always | tr -d '\n'])" "${version}"
'';
cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ];
postInstall = ''
wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}"

6
pkgs/development/interpreters/alda/default.nix
View file

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "alda";
version = "2.0.6";
version = "2.2.0";
src_alda = fetchurl {
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/client/linux-amd64/alda";
sha256 = "1078hywl3gim5wfgxb0xwbk1dn80ls3i7y33n76qsdd4b0x0sn7i";
sha256 = "0z3n81fmv3fxwgr641r6jjn1dmi5d3rw8d6r8jdfjhgpxanyi9a7";
};
src_player = fetchurl {
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player";
sha256 = "1g7k2qnh4vcw63604z7zbvhbpn7l1v3m9mx4j4vywfq6qar1r6ck";
sha256 = "11kji846hbn1f2w1s7rc1ing203jkamy89j1jmysajvirdpp8nha";
};
dontUnpack = true;

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "LAStools";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "LAStools";
repo = "LAStools";
rev = "v${version}";
sha256 = "19y49j5af3z3fsiknq9kg9yjcsr73ywng8dfy837y97q4shc9g00";
sha256 = "sha256-Mxic/zLk/qkB/rSlvkLZPgtNscrTrzSzrxiqXAMeDVU=";
};
patches = [

7
pkgs/development/libraries/boost/generic.nix
View file

@ -126,6 +126,13 @@ stdenv.mkDerivation {
stripLen = 1;
extraPrefix = "libs/context/";
})
# Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions
++ optional (versionAtLeast version "1.65" && versionOlder version "1.67")
(fetchpatch {
url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch";
sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0";
stripLen = 1;
})
++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch
++ optional (version == "1.77.0") (fetchpatch {

16
pkgs/development/libraries/crcpp/default.nix
View file

@ -1,27 +1,27 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "crcpp";
version = "1.1.0.0";
version = "1.2.0.0";
src = fetchFromGitHub {
owner = "d-bahr";
repo = "CRCpp";
rev = "release-${version}";
sha256 = "sha256-jBvh4dHSFChxNPVgkGVHy3TXSExsfwdVUfsA8XB1cn8=";
sha256 = "sha256-OY8MF8fwr6k+ZSA/p1U+9GnTFoMSnUZxKVez+mda2tA=";
};
dontBuild = true;
nativeBuildInputs = [ cmake ];
installPhase = ''
mkdir -p $out/include
cp inc/CRC.h $out/include
'';
doCheck = true;
meta = with lib; {
homepage = "https://github.com/d-bahr/CRCpp";
changelog = "https://github.com/d-bahr/CRCpp/releases/tag/release-${version}";
description = "Easy to use and fast C++ CRC library";
platforms = platforms.all;
maintainers = [ maintainers.ivar ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libqb";
version = "2.0.4";
version = "2.0.5";
src = fetchFromGitHub {
owner = "ClusterLabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-s6b2/bCVNzr3IBqiSAjiJ/DHCqkRwR1aA+J4uBP5mO4=";
sha256 = "sha256-G49JBEUkO4ySAamvI7xN6ct1SvN4afcOmdrzpDL90FE=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

15
pkgs/development/libraries/libthreadar/default.nix
View file

@ -1,18 +1,20 @@
{ lib, stdenv, fetchurl }:
with lib;
{ lib, stdenv, fetchurl, gcc-unwrapped }:
stdenv.mkDerivation rec {
version = "1.3.5";
version = "1.4.0";
pname = "libthreadar";
src = fetchurl {
url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz";
sha256 = "sha256-T5W83Ry3e1hHrnpmSLkfJDYHrVP6YDpXTqmf0WGCjB8=";
sha256 = "sha256-LkcVF4AnuslzpIg/S8sGNJQye6iGcQRGqCqAhg8aN5E=";
};
outputs = [ "out" "dev" ];
buildInputs = [ gcc-unwrapped ];
CXXFLAGS = [ "-std=c++14" ];
configureFlags = [
"--disable-build-html"
];
@ -22,7 +24,7 @@ stdenv.mkDerivation rec {
rm -r "$out"/share
'';
meta = {
meta = with lib; {
homepage = "http://libthreadar.sourceforge.net/";
description = "A C++ library that provides several classes to manipulate threads";
longDescription = ''
@ -32,6 +34,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ izorkin ];
license = licenses.lgpl3;
platforms = platforms.unix;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libthreadar.x86_64-darwin
};
}

16
pkgs/development/libraries/libudev-zero/default.nix
View file

@ -1,25 +1,16 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "libudev-zero";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "illiliti";
repo = "libudev-zero";
rev = version;
sha256 = "0mln7iwyz7lxz8dx7bx7b47j6yws1dvfq35qsdcwg3wwmd4ngsz6";
sha256 = "1dg6zqy8w3gxca8clz6hhv4jyvz8jdwvpmn9y289nrms1zx1jcs5";
};
patches = [
# Fix static.
# https://github.com/illiliti/libudev-zero/pull/48
(fetchpatch {
url = "https://github.com/illiliti/libudev-zero/commit/505c61819b371a1802e054fe2601e64f2dc6d79e.patch";
sha256 = "0y06rgjv73dd7fi3a0dlabcc8ryk3yhbsyrrhnnn3v36y1wz6m0g";
})
];
makeFlags = [ "PREFIX=$(out)" ];
# Just let the installPhase build stuff, because there's no
@ -31,6 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/illiliti/libudev-zero";
description = "Daemonless replacement for libudev";
changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${version}";
maintainers = with maintainers; [ qyliss shamilton ];
license = licenses.isc;
platforms = platforms.linux;

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

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "qscintilla-qt5";
version = "2.13.1";
version = "2.13.2";
src = fetchurl {
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz";
sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo=";
sha256 = "sha256-tsfl8ntR0l8J/mz4Sumn8Idq8NZdjMtVEQnm57JYhfQ=";
};
sourceRoot = "QScintilla_src-${version}/src";

12
pkgs/development/node-packages/default.nix
View file

@ -432,6 +432,18 @@ let
'';
};
thelounge-plugin-closepms = super.thelounge-plugin-closepms.override {
nativeBuildInputs = [ self.node-pre-gyp ];
};
thelounge-theme-flat-blue = super.thelounge-theme-flat-blue.override {
nativeBuildInputs = [ self.node-pre-gyp ];
};
thelounge-theme-flat-dark = super.thelounge-theme-flat-dark.override {
nativeBuildInputs = [ self.node-pre-gyp ];
};
tsun = super.tsun.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
postInstall = ''

32
pkgs/development/python-modules/arpeggio/default.nix
View file

@ -1,34 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, glibcLocales
, pytest-runner
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "Arpeggio";
version = "1.10.2";
pname = "arpeggio";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1";
pname = "Arpeggio";
inherit version;
sha256 = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0=";
};
# Shall not be needed for next release
LC_ALL = "en_US.UTF-8";
buildInputs = [ glibcLocales ];
nativeBuildInputs = [ pytest-runner ];
postPatch = ''
substituteInPlace setup.cfg \
--replace "pytest-runner" ""
'';
checkInputs = [ pytestCheckHook ];
disabledTests = [ "test_examples" "test_issue_22" ];
pythonImportsCheck = [ "arpeggio" ];
dontUseSetuptoolsCheck = true;
meta = {
description = "Packrat parser interpreter";
license = lib.licenses.mit;
meta = with lib; {
description = "Recursive descent parser with memoization based on PEG grammars (aka Packrat parser)";
homepage = "https://github.com/textX/Arpeggio";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

4
pkgs/development/python-modules/azure-mgmt-cdn/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cdn";
version = "11.0.0";
version = "12.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907";
sha256 = "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0=";
};
propagatedBuildInputs = [

9
pkgs/development/python-modules/brotli/default.nix
View file

@ -1,22 +1,23 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook }:
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "brotli";
version = "1.0.9";
# PyPI doesn't contain tests so let's use GitHub
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o=";
# for some reason, the test data isn't captured in releases, force a git checkout
# .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data
forceFetchGit = true;
};
# only returns information how to really build
dontConfigure = true;
checkInputs = [
@ -31,6 +32,6 @@ buildPythonPackage rec {
homepage = "https://github.com/google/brotli";
description = "Generic-purpose lossless compression algorithm";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

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

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, isPy27
, pythonOlder
, fetchFromGitHub
, pytestCheckHook
}:
@ -9,7 +9,7 @@ buildPythonPackage rec {
pname = "certifi";
version = "2021.10.08";
disabled = isPy27;
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = pname;
@ -28,6 +28,6 @@ buildPythonPackage rec {
homepage = "https://github.com/certifi/python-certifi";
description = "Python package for providing Mozilla's CA Bundle";
license = licenses.isc;
maintainers = with maintainers; [ koral ];
maintainers = with maintainers; [ koral SuperSandro2000 ];
};
}

1
pkgs/development/python-modules/click/default.nix
View file

@ -37,5 +37,6 @@ buildPythonPackage rec {
composable way, with as little code as necessary.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

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

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "docplex";
version = "2.22.213";
version = "2.23.222";
# No source available from official repo
src = fetchPypi {
inherit pname version;
sha256 = "8a86bba42b5b65f2e0f88ed350115efeb783b444661e2cfcf3a67d5c59bcb0bd";
sha256 = "sha256-c5XpfEGTkojgzk+ATHCSzzh04zeEVJEEKBp+lPfS+x4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "ibm-cloud-sdk-core";
version = "3.15.0";
version = "3.15.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oHQXgiW80zqgpyt5osbBCtoT3XYCGEk4mgKPIsMmBHY=";
sha256 = "sha256-bGTr8Qf7ywlbsl6/FEJEjFB/bqyyMwfmjVVAsrgmkTg=";
};
propagatedBuildInputs = [

28
pkgs/development/python-modules/parver/default.nix
View file

@ -3,7 +3,7 @@
, fetchPypi
, six
, attrs
, pytest
, pytestCheckHook
, hypothesis
, pretend
, arpeggio
@ -18,11 +18,27 @@ buildPythonPackage rec {
sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3";
};
propagatedBuildInputs = [ six attrs arpeggio ];
checkInputs = [ pytest hypothesis pretend ];
postPatch = ''
substituteInPlace setup.py \
--replace "arpeggio ~= 1.7" "arpeggio"
'';
meta = {
description = "parver allows parsing and manipulation of PEP 440 version numbers.";
license = lib.licenses.mit;
propagatedBuildInputs = [
six
attrs
arpeggio
];
checkInputs = [
pytestCheckHook
hypothesis
pretend
];
meta = with lib; {
description = "Allows parsing and manipulation of PEP 440 version numbers";
homepage = "https://github.com/RazerM/parver";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-core";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.core";
inherit version;
hash = "sha256-gkvr1FgFWI1eurjbuUYhYj0D4eZTIBsDMRXSWrKiCP4=";
hash = "sha256-lH0Mi2nR4jqawvpvVfn79U0AflxE8lU1VLKvqAEXDOo=";
};
# pyroute2 sub-modules have no tests

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ethtool";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ethtool";
inherit version;
hash = "sha256-+/B+YQOluzyGYmnwAZonsjgZeiZPYl8LhJ9OjnvV/64=";
hash = "sha256-6o75plLeSle6ZFgoIZGKLCjx1hg4Z2okOq2RqAT2g8E=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipdb";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipdb";
inherit version;
hash = "sha256-sjlJ1eBoMQaJzEF/4Qk9ZwZB0s/yvR5wUUDP3UWBA50=";
hash = "sha256-sJ9Zzlrh9FWVWL7StyHpPPuXo6TtNLz2/lQBCl53Wrk=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipset";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipset";
inherit version;
hash = "sha256-j2vEQyfuuMH0QRtXw6acX9AMureQwgeS+Ap7m2uP9OY=";
hash = "sha256-icEMJno03WKUdIYTZ6BIAo9lm43RwMjxNXcoSkYF81M=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ndb";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ndb";
inherit version;
hash = "sha256-90DAbXCkoIFUbWZotKYkCSGsQvb7LrEpf6xGCviP40w=";
hash = "sha256-ASk6ycw3dQNMV4xmaxPAHDL1KtrY1JGQ5yJYcJ+OgUE=";
};
propagatedBuildInputs = [

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-nftables";
version = "0.6.8";
version = "0.6.9";
src = fetchPypi {
pname = "pyroute2.nftables";
inherit version;
sha256 = "sha256-SNebxs0mCFEI4bejuLMeU3wrO8KZZT1frnfQw8Gko6E=";
sha256 = "sha256-8BLz8IIobmrGb64PhXz1XWfl3KJTOhOL+j1C4/jlXuI=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-nslink";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.nslink";
inherit version;
hash = "sha256-bTGzXouEdVUFaT5mxGfonFu3aOMxZKRTDMaHFciofec=";
hash = "sha256-WZjRexKn1FWXj+5KZxqZXB0aZmnd0ECKWt3hvVDdz4w=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-protocols";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.protocols";
inherit version;
hash = "sha256-l07CEwZzDxym+QAnKFFEpX690RStOA+rAwMXiEd7FOs=";
hash = "sha256-7vP4rbid2cVGKlYUM5qsmYXQhUfvIWoaDXYnxSUnSJY=";
};
propagatedBuildInputs = [

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

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pyroute2";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-WhqjvCwKrUUBLKvjpva7pc94UIZvTf7j705Bt2DHyKQ=";
hash = "sha256-PRxNGnH7VpyrV49V9xNO8C1I6LMYK05+ZrKndWKO2vs=";
};
propagatedBuildInputs = [

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

@ -40,14 +40,14 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "1.5.6";
version = "1.5.8";
format = "setuptools";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-python";
rev = version;
sha256 = "sha256-PxoxOeFdmmfpXBnGs9D5aKP6vlGKx9nPO3ngYuTa+Rs=";
sha256 = "sha256-28MkwQog+Abk1PSDPWbah650YATiGCBWaTbFO52KgzY=";
};
propagatedBuildInputs = [

4
pkgs/development/ruby-modules/bundler/default.nix
View file

@ -4,8 +4,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
version = "2.3.6";
source.sha256 = "1531z805j3gls2x0pqp2bp1vv1rf5k7ynjl4qk72h8lpm1skqk9r";
version = "2.3.9";
source.sha256 = "sha256-VZiKuSDP3sSoBXUPcPmwHR/GbZs47NIF+ZlXtHSZWzg=";
dontPatchShebangs = true;
postFixup = ''

2
pkgs/development/tools/cfn-nag/Gemfile Normal file
View file

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'cfn-nag'

51
pkgs/development/tools/cfn-nag/Gemfile.lock Normal file
View file

@ -0,0 +1,51 @@
GEM
remote: https://rubygems.org/
specs:
aws-eventstream (1.2.0)
aws-partitions (1.568.0)
aws-sdk-core (3.130.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.55.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.113.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.4.0)
aws-eventstream (~> 1, >= 1.0.2)
cfn-model (0.6.6)
kwalify (= 0.7.2)
psych (~> 3)
cfn-nag (0.8.9)
aws-sdk-s3 (~> 1.76)
cfn-model (= 0.6.6)
lightly (~> 0.3.2)
logging (~> 2.2.2)
netaddr (~> 2.0.4)
optimist (~> 3.0.0)
rexml
jmespath (1.6.1)
kwalify (0.7.2)
lightly (0.3.3)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
multi_json (1.15.0)
netaddr (2.0.5)
optimist (3.0.1)
psych (3.3.2)
rexml (3.2.5)
PLATFORMS
ruby
DEPENDENCIES
cfn-nag
BUNDLED WITH
2.2.28

19
pkgs/development/tools/cfn-nag/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ lib, bundlerEnv, bundlerUpdateScript, ruby }:
bundlerEnv {
pname = "cfn-nag";
version = "0.8.9";
inherit ruby;
gemdir = ./.;
passthru.updateScript = bundlerUpdateScript "cfn-nag";
meta = with lib; {
description = "Linting tool for CloudFormation templates";
homepage = "https://github.com/stelligent/cfn_nag";
license = licenses.mit;
maintainers = with maintainers; [ wolfangaukang ];
platforms = platforms.unix;
};
}

189
pkgs/development/tools/cfn-nag/gemset.nix Normal file
View file

@ -0,0 +1,189 @@
{
aws-eventstream = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
type = "gem";
};
version = "1.2.0";
};
aws-partitions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ap27g6hxcczpb5dj7v0wzxrvywfa2kf3zx69xnjz1qvxf3plw54";
type = "gem";
};
version = "1.568.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm";
type = "gem";
};
version = "3.130.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi";
type = "gem";
};
version = "1.55.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax";
type = "gem";
};
version = "1.113.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
type = "gem";
};
version = "1.4.0";
};
cfn-model = {
dependencies = ["kwalify" "psych"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b3ix36yfnfwyxb4w9ss8a7nc6w15m1wbj3q8rarsqjrs3xj6wjs";
type = "gem";
};
version = "0.6.6";
};
cfn-nag = {
dependencies = ["aws-sdk-s3" "cfn-model" "lightly" "logging" "netaddr" "optimist" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14qlnflxx5chjvda9n2ka2axcfcjbmn9h00cija8k7kvpy1dgqga";
type = "gem";
};
version = "0.8.9";
};
jmespath = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
type = "gem";
};
version = "1.6.1";
};
kwalify = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ngxg3ysq5vip9dn3d32ajc7ly61kdin86hfycm1hkrcvkkn1vjf";
type = "gem";
};
version = "0.7.2";
};
lightly = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sgj2r6j7qxb9vqzkx5isjbphi38rplk4h8838am0cjcpq5h3jb3";
type = "gem";
};
version = "0.3.3";
};
little-plugger = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
type = "gem";
};
version = "1.1.4";
};
logging = {
dependencies = ["little-plugger" "multi_json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
type = "gem";
};
version = "2.2.2";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
type = "gem";
};
version = "1.15.0";
};
netaddr = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r7nln9xvrralwwhd5s1q4sghp0k9y7g9z5pinzpqkx715xcpdxm";
type = "gem";
};
version = "2.0.5";
};
optimist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
type = "gem";
};
version = "3.0.1";
};
psych = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10iawnkpa44hcfrapy7yw6zmjn4g1g0y09lw244qiv424f7jasn5";
type = "gem";
};
version = "3.3.2";
};
rexml = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.5";
};
}

6
pkgs/development/tools/gore/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gore";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "motemen";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uLU4uZaQA9u6BUQZ0Rb4Yqg/oJOZ529gIiOwmmyg05A=";
sha256 = "sha256-ipHvflsVBSjqohV/PliS0s0Nhie4nIP/HgupNH/Yui4=";
};
vendorSha256 = "sha256-/yggEibpQK9Uk116RkE5XbbJe6j4WsIC3GtKPU/P2hU=";
vendorSha256 = "sha256-HrdNWsUVz5G5tG/ZFz2z1Vt4kM12I088/6OIkRFyDl8=";
doCheck = false;

6
pkgs/development/tools/misc/act/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "act";
version = "0.2.25";
version = "0.2.26";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Eo5uWBLriYa7tLpPMa34+l6BYQe9useL1tN9gqUSt0k=";
sha256 = "sha256-DBiBJf4hEjn/sJXjAvsiARWz66sDBIz0hFEdCgS8D4g=";
};
vendorSha256 = "sha256-1v87WcQoVyTyCStiMAoThidIMRqJwdsYNF987kQp5YM=";
vendorSha256 = "sha256-5RvFdtEZEQBWvkUKIcV/A+tCSy9V9DJj4HujGQgTxq0=";
doCheck = false;

1
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
View file

@ -34,6 +34,7 @@
tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json;
tree-sitter-graphql = lib.importJSON ./tree-sitter-graphql.json;
tree-sitter-haskell = lib.importJSON ./tree-sitter-haskell.json;
tree-sitter-hcl = lib.importJSON ./tree-sitter-hcl.json;
tree-sitter-heex = lib.importJSON ./tree-sitter-heex.json;
tree-sitter-hjson = lib.importJSON ./tree-sitter-hjson.json;
tree-sitter-html = lib.importJSON ./tree-sitter-html.json;

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-go",
"rev": "0fa917a7022d1cd2e9b779a6a8fc5dc7fad69c75",
"date": "2022-01-06T10:54:10+01:00",
"path": "/nix/store/bw2hilbj37ys9lig2fzz58cvjy7nhn3l-tree-sitter-go",
"sha256": "0kgy4yyd0z8pydldnfwsfw2iwbhn4f43qxfhy94wvpwiwi74kfmg",
"rev": "07d722831382a043b16547b6d9202f3da07f3cb3",
"date": "2022-03-22T15:34:30+01:00",
"path": "/nix/store/9ay5gjwnip3jcmi096sw5fyi1kxqg1pk-tree-sitter-go",
"sha256": "0rc1p5jab08v1r81gzaz5xmxmbspl5i5zxba9immzax8ahzhhaxn",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

11
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json Normal file
View file

@ -0,0 +1,11 @@
{
"url": "https://github.com/MichaHoffmann/tree-sitter-hcl",
"rev": "3cb7fc28247efbcb2973b97e71c78838ad98a583",
"date": "2021-09-20T21:50:41+02:00",
"path": "/nix/store/rgd0p162smlfn90ggyq3y6y4q9sgybwh-tree-sitter-hcl",
"sha256": "0hg7w3hsvxjwz1rb1izknn46msm4mkjx2cnq603lzn7i9mb1pbyr",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

6
pkgs/development/tools/parsing/tree-sitter/update.nix
View file

@ -308,6 +308,10 @@ let
orga = "milisims";
repo = "tree-sitter-org";
};
"tree-sitter-hcl" = {
orga = "MichaHoffmann";
repo = "tree-sitter-hcl";
};
};
allGrammars =
@ -376,7 +380,7 @@ let
if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then
echo "rate limited" >&2
fi
release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name')"
release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name' | tr -d \")"
# github sometimes returns an empty list even tough there are releases
if [ "$release" = "null" ]; then
echo "uh-oh, latest for ${orga + "/" + repo} is not there, using HEAD" >&2

15
pkgs/development/tools/protoc-gen-go-grpc/default.nix
View file

@ -1,24 +1,21 @@
{ buildGoPackage
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoPackage rec {
buildGoModule rec {
pname = "protoc-gen-go-grpc";
version = "1.1.0";
goPackagePath = "google.golang.org/grpc";
version = "1.2.0";
modRoot = "cmd/protoc-gen-go-grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc-go";
rev = "cmd/protoc-gen-go-grpc/v${version}";
sha256 = "14rjb8j6fm07rnns3dpwgkzf3y6rmia6i9n7ns6cldc5mbf7nwi3";
sha256 = "sha256-pIHMykwwyu052rqwSV5Js0+JCKCNLrFVN6XQ3xjlEOI=";
};
subPackages = [ "cmd/protoc-gen-go-grpc" ];
goDeps = ./deps.nix;
vendorSha256 = "sha256-yxOfgTA5IIczehpWMM1kreMqJYKgRT5HEGbJ3SeQ/Lg=";
meta = with lib; {
description = "The Go language implementation of gRPC. HTTP/2 based RPC";

333
pkgs/development/tools/protoc-gen-go-grpc/deps.nix generated
View file

@ -1,333 +0,0 @@
# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix)
[
{
goPackagePath = "cloud.google.com/go";
fetch = {
type = "git";
url = "https://github.com/googleapis/google-cloud-go";
rev = "v0.26.0";
sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1";
moduleDir = "";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "v0.3.1";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
moduleDir = "";
};
}
{
goPackagePath = "github.com/census-instrumentation/opencensus-proto";
fetch = {
type = "git";
url = "https://github.com/census-instrumentation/opencensus-proto";
rev = "v0.2.1";
sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj";
moduleDir = "";
};
}
{
goPackagePath = "github.com/client9/misspell";
fetch = {
type = "git";
url = "https://github.com/client9/misspell";
rev = "v0.3.4";
sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
moduleDir = "";
};
}
{
goPackagePath = "github.com/cncf/udpa/go";
fetch = {
type = "git";
url = "https://github.com/cncf/udpa";
rev = "5459f2c99403";
sha256 = "0i3al193dsp91j7iywqrm6fr56y2sz51ci4vf19mb3j4n2x44gsi";
moduleDir = "go";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.0";
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
moduleDir = "";
};
}
{
goPackagePath = "github.com/envoyproxy/go-control-plane";
fetch = {
type = "git";
url = "https://github.com/envoyproxy/go-control-plane";
rev = "668b12f5399d";
sha256 = "0vmhc8ii081x1k2qw4kji7wjyg6l25zp1y6qxi27wq8m341i4rzb";
moduleDir = "";
};
}
{
goPackagePath = "github.com/envoyproxy/protoc-gen-validate";
fetch = {
type = "git";
url = "https://github.com/envoyproxy/protoc-gen-validate";
rev = "v0.1.0";
sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy";
moduleDir = "";
};
}
{
goPackagePath = "github.com/golang/glog";
fetch = {
type = "git";
url = "https://github.com/golang/glog";
rev = "23def4e6c14b";
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
moduleDir = "";
};
}
{
goPackagePath = "github.com/golang/mock";
fetch = {
type = "git";
url = "https://github.com/golang/mock";
rev = "v1.1.1";
sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
moduleDir = "";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "v1.4.2";
sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw";
moduleDir = "";
};
}
{
goPackagePath = "github.com/google/go-cmp";
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "v0.5.0";
sha256 = "04pzp583p6b32y34c6jygfxarff9qjs39rarvfh6467z24sdd9k4";
moduleDir = "";
};
}
{
goPackagePath = "github.com/google/uuid";
fetch = {
type = "git";
url = "https://github.com/google/uuid";
rev = "v1.1.2";
sha256 = "1rbpfa0v0ly9sdnixcxhf79swki54ikgm1zkwwkj64p1ws66syqd";
moduleDir = "";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
moduleDir = "";
};
}
{
goPackagePath = "github.com/prometheus/client_model";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
rev = "14fe0d1b01d4";
sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550";
moduleDir = "";
};
}
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
rev = "v0.1.0";
sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
moduleDir = "";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.5.1";
sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c2843e01d9a2";
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/exp";
fetch = {
type = "git";
url = "https://go.googlesource.com/exp";
rev = "509febef88a4";
sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/lint";
fetch = {
type = "git";
url = "https://go.googlesource.com/lint";
rev = "d0100b6bd8b3";
sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "d8887717615a";
sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "d2e6202438be";
sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "112230192c58";
sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "d0b11bdaac8a";
sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "2c0ae7006135";
sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk";
moduleDir = "";
};
}
{
goPackagePath = "golang.org/x/xerrors";
fetch = {
type = "git";
url = "https://go.googlesource.com/xerrors";
rev = "9bdfabe68543";
sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c";
moduleDir = "";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "v1.4.0";
sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn";
moduleDir = "";
};
}
{
goPackagePath = "google.golang.org/genproto";
fetch = {
type = "git";
url = "https://github.com/googleapis/go-genproto";
rev = "cb27e3aa2013";
sha256 = "0ml73ghqcwbz7ipfk8fnxb5indcml49b5p7vp1fsyny0abyyrmxf";
moduleDir = "";
};
}
{
goPackagePath = "google.golang.org/protobuf";
fetch = {
type = "git";
url = "https://go.googlesource.com/protobuf";
rev = "v1.25.0";
sha256 = "0apfl42x166dh96zfq5kvv4b4ax9xljik6bq1mnvn2240ir3mc23";
moduleDir = "";
};
}
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "20d25e280405";
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
moduleDir = "";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.2";
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
moduleDir = "";
};
}
{
goPackagePath = "honnef.co/go/tools";
fetch = {
type = "git";
url = "https://github.com/dominikh/go-tools";
rev = "ea95bdfd59fc";
sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic";
moduleDir = "";
};
}
]

24
pkgs/development/tools/udis86/default.nix
View file

@ -1,17 +1,31 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, python2 }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, python3
}:
stdenv.mkDerivation rec {
pname = "udis86";
version = "1.7.2";
version = "unstable-2014-12-25";
src = fetchFromGitHub {
owner = "vmt";
repo = "udis86";
rev = "v${version}";
sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1";
rev = "56ff6c87c11de0ffa725b14339004820556e343d";
hash = "sha256-bmm1rgzZeStQJXEmcT8vnplsnmgN3LJlYs7COmqsDU8=";
};
nativeBuildInputs = [ autoreconfHook python2 ];
patches = [
(fetchpatch {
name = "support-python3-for-building";
url = "https://github.com/vmt/udis86/commit/3c05ce60372cb2eba39d6eb87ac05af8a664e1b1.patch";
hash = "sha256-uF4Cwt7UMkyd0RX6cCMQt9xvkkUNQvTDH/Z/6nHtVT8=";
})
];
nativeBuildInputs = [ autoreconfHook python3 ];
configureFlags = [
"--enable-shared"

6
pkgs/games/katago/default.nix
View file

@ -29,14 +29,14 @@ assert !enableGPU -> (
# of gcc. If you need to use cuda10, please override stdenv with gcc8Stdenv
stdenv.mkDerivation rec {
pname = "katago";
version = "1.10.0";
githash = "ff49d04ad6bcfa056c63492439a41e2f3bce0847";
version = "1.11.0";
githash = "d8d0cd76cf73df08af3d7061a639488ae9494419";
src = fetchFromGitHub {
owner = "lightvector";
repo = "katago";
rev = "v${version}";
sha256 = "sha256-ZLJNNjZ5RdOktWDp88d/ItpokANl2EJ0Gbt9oMGm1Og=";
sha256 = "sha256-TZKkkYe2PPzgPhItBZBSJDwU3anhsujuCGIYru55OtU=";
};
fakegit = writeShellScriptBin "git" "echo ${githash}";

11
pkgs/games/polymc/default.nix
View file

@ -11,18 +11,20 @@
, libpulseaudio
, qtbase
, libGL
, glfw
, openal
, msaClientID ? ""
}:
mkDerivation rec {
pname = "polymc";
version = "1.0.6";
version = "1.1.0";
src = fetchFromGitHub {
owner = "PolyMC";
repo = "PolyMC";
rev = version;
sha256 = "sha256-KgLWbZxtxTpuFdMOJNyADYw9rMWoLgczrbSrH4qv6NI=";
sha256 = "sha256-p5vbpNZI/JiQJclEo/Pu/46qVul+3DAzaoow8jabHrI=";
fetchSubmodules = true;
};
@ -36,7 +38,7 @@ mkDerivation rec {
--replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")'
'';
cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++
cmakeFlags = [ "-DLauncher_PORTABLE=0" ] ++
lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
dontWrapQtApps = true;
@ -50,6 +52,8 @@ mkDerivation rec {
libXxf86vm
libpulseaudio
libGL
glfw
openal
];
in ''
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
@ -68,6 +72,7 @@ mkDerivation rec {
their associated options with a simple interface.
'';
platforms = platforms.linux;
changelog = "https://github.com/PolyMC/PolyMC/releases/tag/${version}";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ cleverca22 starcraft66 ];
};

22
pkgs/misc/autoadb/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "autoadb";
version = "unstable-2020-06-01";
src = fetchFromGitHub {
owner = "rom1v";
repo = pname;
rev = "7f8402983603a9854bf618a384f679a17cd85e2d";
sha256 = "sha256-9Sv38dCtvbqvxSnRpq+HsIwF/rfLUVZbi0J+mltLres=";
};
cargoSha256 = "1gzg1lhq8gp790mrc8fw8dg146k8lg20pnk45m2ssnmdka0826f7";
meta = with lib; {
description = "Execute a command whenever a device is adb-connected";
homepage = "https://github.com/rom1v/autoadb";
license = licenses.asl20;
maintainers = with maintainers; [ shawn8901 ];
};
}

12
pkgs/os-specific/linux/dmtcp/default.nix
View file

@ -1,16 +1,14 @@
{ lib, stdenv, fetchFromGitHub, bash, perl, python2 }:
# There are fixes for python3 compatibility on master
{ lib, stdenv, fetchFromGitHub, bash, perl, python3 }:
stdenv.mkDerivation rec {
pname = "dmtcp";
version = "unstable-2021-03-01";
version = "unstable-2022-02-28";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "f999adbb8e88fe452a0e57ceb43b6eed7b4409f9";
sha256 = "sha256-codCHQui3fGfUZSNq8GuH4ad/GjD6I/S9rX83o8oFPc=";
rev = "133687764c6742906006a1d247e3b83cd860fa1d";
hash = "sha256-9Vr8IhoeATCfyt7Lp7kYe/7e87mFX9KMNGTqxJgIztE=";
};
dontDisableStatic = true;
@ -30,7 +28,7 @@ stdenv.mkDerivation rec {
substituteInPlace test/autotest.py \
--replace /bin/bash ${bash}/bin/bash \
--replace /usr/bin/perl ${perl}/bin/perl \
--replace /usr/bin/python ${python2}/bin/python \
--replace /usr/bin/python ${python3.interpreter} \
--replace "os.environ['USER']" "\"nixbld1\"" \
--replace "os.getenv('USER')" "\"nixbld1\""
'';

8
pkgs/os-specific/linux/nixos-rebuild/default.nix
View file

@ -25,4 +25,12 @@ substituteAll {
passthru.tests = {
simple-installer-test = nixosTests.installer.simple;
};
meta = {
description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote.";
homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/nixos-rebuild";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.Profpatsch ];
mainProgram = "nixos-rebuild";
};
}

6
pkgs/servers/imgproxy/default.nix
View file

@ -3,16 +3,16 @@
buildGoModule rec {
pname = "imgproxy";
version = "3.3.2";
version = "3.3.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
sha256 = "sha256-LJsiZeKgetFTqX58I82jDr8fIgYJCDVhb44yg8uc/8w=";
sha256 = "sha256-VS2EZUMUvzuSP/Rs0pY0qo5VcB9VU3+IzZG6AdTrhmk=";
rev = "v${version}";
};
vendorSha256 = "sha256-088VEntNx3ZX2p6EiAZ6nSeWmM32XLAOmqXu2sd9QG4=";
vendorSha256 = "sha256-Rp0vTtpdKpYg/7UjX73Qwxu6dOqDr24nqp41fKN1IYw=";
doCheck = false;

2
pkgs/servers/mail/mailman/web.nix
View file

@ -16,7 +16,7 @@ buildPythonPackage rec {
# Django is depended on transitively by hyperkitty and postorius,
# and mailman_web has overly restrictive version bounds on it, so
# let's remove it.
sed -i '/^ Django/d' setup.cfg
sed -i '/^[[:space:]]*django/Id' setup.cfg
# Upstream seems to mostly target installing on top of existing
# distributions, and uses a path appropriate for that, but we are

6
pkgs/servers/monitoring/munin/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages
, python2, ruby, jre, nettools, bc
, python3, ruby, jre, nettools, bc
}:
stdenv.mkDerivation rec {
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
perlPackages.ListMoreUtils
perlPackages.LWP
perlPackages.DBDPg
python2
python3
ruby
jre
# tests
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
"DESTDIR=$(out)"
"PERLLIB=$(out)/${perlPackages.perl.libPrefix}"
"PERL=${perlPackages.perl.outPath}/bin/perl"
"PYTHON=${python2.outPath}/bin/python"
"PYTHON=${python3.interpreter}"
"RUBY=${ruby.outPath}/bin/ruby"
"JAVARUN=${jre.outPath}/bin/java"
"PLUGINUSER=munin"

15
pkgs/servers/u9fs/default.nix
View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchhg }:
{ lib, stdenv, fetchFromBitbucket }:
stdenv.mkDerivation {
pname = "u9fs";
version = "unstable-2020-11-21";
version = "unstable-2021-01-25";
src = fetchhg {
url = "https://code.9front.org/hg/plan9front";
rev = "6eef4d6a9bce";
sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6";
src = fetchFromBitbucket {
owner = "plan9-from-bell-labs";
repo = "u9fs";
rev = "d65923fd17e8b158350d3ccd6a4e32b89b15014a";
sha256 = "0h06l7ciikp3gzrr550z0fyrfp3y2067dfd3rxxw0q95z4l6vhy1";
};
installPhase = ''
@ -17,7 +18,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Serve 9P from Unix";
homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs";
homepage = "http://p9f.org/magic/man2html?man=u9fs&sect=4";
license = licenses.free;
maintainers = [ maintainers.ehmry ];
platforms = platforms.unix;

21
pkgs/tools/admin/syft/default.nix
View file

@ -2,27 +2,25 @@
buildGoModule rec {
pname = "syft";
version = "0.41.6";
version = "0.42.2";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ebs0IVdcll7bTNjoZalD5Ye0GFXJeas1nPseYLzZxOk=";
sha256 = "sha256-ejyUe2FM8pNQO9esWi9QbSiq6PVEjGbRu+AEnbCFqDE=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
postFetch = ''
cd "$out"
commit="$(git rev-parse HEAD)"
source_date_epoch="$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad)"
substituteInPlace "$out/internal/version/build.go" \
--replace 'gitCommit = valueNotProvided' "gitCommit = \"$commit\"" \
--replace 'buildDate = valueNotProvided' "buildDate = \"$source_date_epoch\""
git rev-parse HEAD > $out/COMMIT
# 0000-00-00T00:00:00Z
date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-/WGkQfCUDmolGdzNxIZKzZnXWnqO2vvizBLJgO+s4Ak=";
vendorSha256 = "sha256-o5Gq4ZN9H/rXSfIeU2hlExzV5KQZP9DfQsWbOZOB43E=";
nativeBuildInputs = [ installShellFiles ];
@ -32,10 +30,15 @@ buildGoModule rec {
"-s"
"-w"
"-X github.com/anchore/syft/internal/version.version=${version}"
"-X github.com/anchore/syft/internal/version.gitTreeState=clean"
"-X github.com/anchore/syft/internal/version.gitDescription=v${version}"
"-X github.com/anchore/syft/internal/version.gitTreeState=clean"
];
preBuild = ''
ldflags+=" -X github.com/anchore/syft/internal/version.gitCommit=$(cat COMMIT)"
ldflags+=" -X github.com/anchore/syft/internal/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
'';
# tests require a running docker instance
doCheck = false;

14
pkgs/tools/audio/essentia-extractor/default.nix
View file

@ -6,22 +6,20 @@ let
};
sha_table = {
"x86_64-linux" =
"d9902aadac4f442992877945da2a6fe8d6ea6b0de314ca8ac0c28dc5f253f7d8";
"i686-linux" =
"46deb0a053b4910c4e68737a7b6556ff5360260c8f86652f91a0130445f5c949";
"x86_64-linux" = "d9902aadac4f442992877945da2a6fe8d6ea6b0de314ca8ac0c28dc5f253f7d8";
"i686-linux" = "46deb0a053b4910c4e68737a7b6556ff5360260c8f86652f91a0130445f5c949";
};
arch = arch_table.${stdenv.system};
sha = sha_table.${stdenv.system};
throwSystem = throw "Unsupported system: ${stdenv.system}";
arch = arch_table.${stdenv.system} or throwSystem;
in
stdenv.mkDerivation rec {
pname = "essentia-extractor";
version = "2.1_beta2";
src = fetchurl {
url = "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
sha256 = sha;
url = "https://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
sha256 = sha_table.${stdenv.system} or throwSystem;
};
unpackPhase = "unpackFile $src ; export sourceRoot=.";

4
pkgs/tools/backup/dar/default.nix
View file

@ -9,12 +9,12 @@
with lib;
stdenv.mkDerivation rec {
version = "2.7.3";
version = "2.7.4";
pname = "dar";
src = fetchurl {
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
sha256 = "sha256-w7005RdZKjP7XrO/h43yM0Lsho4MOKWLynJimD2oHwY=";
sha256 = "sha256-esti2QXoq+5bic639eG96vZOSJboMVHmD+oRNAI6ic4=";
};
outputs = [ "out" "dev" ];

42
pkgs/tools/compression/pxz/default.nix
View file

@ -1,31 +1,42 @@
{ lib, stdenv, fetchFromGitHub, xz }:
{ lib
, stdenv
, fetchFromGitHub
, testVersion
, pxz
, xz
}:
stdenv.mkDerivation rec {
pname = "pxz";
version = "4.999.9beta+git";
version = "4.999.9beta";
src = fetchFromGitHub {
owner = "jnovy";
repo = "pxz";
rev = "124382a6d0832b13b7c091f72264f8f3f463070a";
sha256 = "15mmv832iqsqwigidvwnf0nyivxf0y8m22j2szy4h0xr76x4z21m";
hash = "sha256-NYhPujm5A0j810IKUZEHru/oLXCW7xZf5FjjKAbatZY=";
};
patches = [ ./flush-stdout-help-version.patch ];
postPatch = ''
substituteInPlace Makefile \
--replace '`date +%Y%m%d`' '19700101'
substituteInPlace pxz.c \
--replace 'XZ_BINARY "xz"' 'XZ_BINARY "${lib.getBin xz}/bin/xz"'
'';
buildInputs = [ xz ];
buildPhase = ''
gcc -o pxz pxz.c -llzma \
-fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \
-DPXZ_BUILD_DATE=\"nixpkgs\" \
-DXZ_BINARY=\"${xz.bin}/bin/xz\" \
-DPXZ_VERSION=\"${version}\"
'';
makeFlags = [
"BINDIR=${placeholder "out"}/bin"
"MANDIR=${placeholder "out"}/share/man"
];
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp pxz $out/bin
cp pxz.1 $out/share/man/man1
'';
passthru.tests.version = testVersion {
package = pxz;
};
meta = with lib; {
homepage = "https://jnovy.fedorapeople.org/pxz/";
@ -39,6 +50,7 @@ stdenv.mkDerivation rec {
resources to speed up compression time with minimal possible influence
on compression ratio
'';
mainProgram = "pxz";
platforms = with platforms; linux;
};
}

32
pkgs/tools/compression/pxz/flush-stdout-help-version.patch Normal file
View file

@ -0,0 +1,32 @@
From bba741ccd0f0a65cd9bfdd81504ebe5840fd37ad Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 22 Mar 2022 08:01:10 -0500
Subject: [PATCH] pxz: flush stdout before exec'ing xz, ensure our messages are
printed
Without this, they're presently dropped on my system when pxz
is piped to something, as in `pxz --help|less` or `pxz --version|cat`.
---
pxz.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pxz.c b/pxz.c
index 4240b6e..3b53cfa 100644
--- a/pxz.c
+++ b/pxz.c
@@ -184,10 +184,12 @@ void parse_args( int argc, char **argv, char **envp ) {
" -D, --context-size per-thread compression context size as a multiple\n"
" of dictionary size. Default is 3.\n\n"
"Usage and other options are same as in XZ:\n\n");
+ fflush(stdout);
run_xz(argv, envp);
break;
case 'V':
printf("Parallel PXZ "PXZ_VERSION" (build "PXZ_BUILD_DATE")\n");
+ fflush(stdout);
run_xz(argv, envp);
break;
case 'g':
--
2.35.1

4
pkgs/tools/misc/calamares/default.nix
View file

@ -6,12 +6,12 @@
mkDerivation rec {
pname = "calamares";
version = "3.2.53";
version = "3.2.54";
# release including submodule
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-LWkgQsvP7XmupBDSAnbwewWRT+ZaALyDFw3w7iz66X0=";
sha256 = "sha256-TfdLbDsjjPC/8BoEVm4mXePxQ8KX+9jgwKqUR1lcyOk=";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];

22
pkgs/tools/networking/clash/default.nix
View file

@ -1,24 +1,36 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ lib, fetchFromGitHub, buildGoModule, testVersion, clash }:
buildGoModule rec {
pname = "clash";
version = "1.6.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "Dreamacro";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XG/nci8Sj0vfa/SFPpJwl1Zmt/23LfKxocejplZtS0E=";
sha256 = "sha256-cAJjW+NzG48HcDRx12LLdj8VYyIroL+GWqrUrpHOOIk=";
};
vendorSha256 = "sha256-WR1CpjEMHRkpd0/iqrOm0oVXvyQO+r6GyeP0L0zx8aA=";
vendorSha256 = "sha256-hE2MgjaVme+4vG7+rmJXfjycd3N2R6cA5iSUUTFcQXE=";
doCheck = false;
postPatch = ''
# Do not build testing suit
rm -rf ./test
'';
CGO_ENABLED = 0;
ldflags = [
"-s"
"-w"
"-X github.com/Dreamacro/clash/constant.Version=${version}"
];
passthru.tests.version = testVersion {
package = clash;
command = "clash -v";
};
meta = with lib; {
description = "A rule-based tunnel in Go";
homepage = "https://github.com/Dreamacro/clash";

6
pkgs/tools/package-management/nix/default.nix
View file

@ -74,12 +74,12 @@ in lib.makeExtensible (self: {
unstable = lib.lowPrio (common rec {
version = "2.8";
suffix = "pre20220311_${lib.substring 0 7 src.rev}";
suffix = "pre20220322_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "d5322698a2abbc6d141e1d244e17b0d226a2f18b";
sha256 = "sha256-7rQSktGC8+DmeyGOnzFMy1QwAYnw4JJphv+lEwFCwfU=";
rev = "d5d4d980427aca3849b90bfe1694b6d1d14532fb";
sha256 = "sha256-fV7nUcRhVmgIvDUraAzHV2TDVHDn1jETfv2zdDMQ59Y=";
};
});
})

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-03-15";
version = "2022-03-22";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-whV7zg7njGGjUpxsXZiNwVfHgrlop2RLZnCsBWQ+HkY=";
sha256 = "sha256-2V6levydKfYtpctgcyBuLES0OujWi8eqlB3x/YoOyHY=";
};

25
pkgs/tools/text/miller/default.nix
View file

@ -1,22 +1,29 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }:
{ lib, fetchFromGitHub, buildGoModule }:
stdenv.mkDerivation rec {
buildGoModule rec {
pname = "miller";
version = "5.10.3";
version = "6.2.0";
src = fetchFromGitHub {
owner = "johnkerl";
repo = "miller";
rev = "v${version}";
sha256 = "sha256-Mag7bIfZNdp+sM54yKp8HdH3kWjwWRfyPBGthej2jd8=";
# NOTE: The tag v6.2.0 has still old version number, as reported by
# `mlr --version`. This is the current head of the 6.2.0 branch, with
# the correct version number.
#
# For future releases please check if we can use
# `rev = "v${version}"` again.
rev = "a6dc231eefc209eb66b50b0773542c2e63501bba";
sha256 = "sha256-hMWcf43o1wiVjHsgH+ZDBny5vlZQkKyoJN5np4gUy4w=";
};
nativeBuildInputs = [ autoreconfHook flex libtool ];
vendorSha256 = "sha256-2tl/twzkvWB1lnvi3fIptM77zi0lmAn7Pzoe0/lW6o4=";
subPackages = [ "cmd/mlr" ];
meta = with lib; {
description = "Like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON";
homepage = "http://johnkerl.org/miller/";
description = "Like awk, sed, cut, join, and sort for data formats such as CSV, TSV, JSON, JSON Lines, and positionally-indexed";
homepage = "https://github.com/johnkerl/miller";
license = licenses.bsd2;
maintainers = with maintainers; [ mstarzyk ];
platforms = platforms.all;

4
pkgs/tools/text/ugrep/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
version = "3.7.1";
version = "3.7.6";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
hash = "sha256-5ZlZ/nCUOiyOWagF1Vla945d7zKbMsHp56ZE4HwdEP4=";
sha256 = "sha256-fOp+nf/xZKOw8CDI1RSl/DQH52ay/M/aeSMf6MdfKmQ=";
};
buildInputs = [

8
pkgs/tools/typesetting/biblatex-check/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "biblatex-check";
version = "2019-11-09";
version = "1.0.1";
src = fetchFromGitHub {
owner = "Pezmc";
repo = "BibLatex-Check";
rev = "2db50bf94d1480f37edf1b3619e73baf4ef85938";
sha256 = "1bq0yqckhssazwkivipdjmn1jpsf301i4ppyl88qhc5igx39wg25";
rev = "v${version}";
sha256 = "sha256-Pe6Ume7vH8WJG2EqOw31g3VYilfFsDBmNHtHcUXxqf0=";
};
buildInputs = [ python3 ];

1
pkgs/top-level/aliases.nix
View file

@ -601,6 +601,7 @@ mapAliases ({
liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22
libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22
libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend";
libpng_apng = throw "libpng_apng has been removed, because it is equivalent to libpng"; # Added 2021-03-21
libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09
libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22
librdf = lrdf; # Added 2020-03-22

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

@ -234,6 +234,8 @@ with pkgs;
buf = callPackage ../development/tools/buf { };
cfn-nag = callPackage ../development/tools/cfn-nag { };
elfcat = callPackage ../tools/misc/elfcat { };
# Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with:
@ -1925,6 +1927,8 @@ with pkgs;
gopacked = callPackage ../applications/misc/gopacked { };
gotktrix = callPackage ../applications/networking/instant-messengers/gotktrix { };
gucci = callPackage ../tools/text/gucci { };
guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { };
@ -2611,7 +2615,9 @@ with pkgs;
clac = callPackage ../tools/misc/clac {};
clash = callPackage ../tools/networking/clash { };
clash = callPackage ../tools/networking/clash {
buildGoModule = buildGo118Module;
};
clasp = callPackage ../tools/misc/clasp { };
@ -6656,6 +6662,8 @@ with pkgs;
humanfriendly = with python3Packages; toPythonApplication humanfriendly;
hut = callPackage ../applications/version-management/git-and-tools/hut { };
hwinfo = callPackage ../tools/system/hwinfo { };
hybridreverb2 = callPackage ../applications/audio/hybridreverb2 {
@ -10301,7 +10309,9 @@ with pkgs;
systrayhelper = callPackage ../tools/misc/systrayhelper {};
syft = callPackage ../tools/admin/syft { };
syft = callPackage ../tools/admin/syft {
buildGoModule = buildGo118Module;
};
Sylk = callPackage ../applications/networking/Sylk {};
@ -13510,9 +13520,7 @@ with pkgs;
boost = boost172;
};
souffle = callPackage ../development/compilers/souffle {
autoreconfHook = buildPackages.autoreconfHook269;
};
souffle = callPackage ../development/compilers/souffle { };
spasm-ng = callPackage ../development/compilers/spasm-ng { };
@ -14389,6 +14397,8 @@ with pkgs;
augeas = callPackage ../tools/system/augeas { };
autoadb = callPackage ../misc/autoadb { };
inherit (callPackage ../tools/admin/ansible { })
ansible
ansible_2_8
@ -18692,7 +18702,6 @@ with pkgs;
libplacebo = callPackage ../development/libraries/libplacebo { };
libpng = callPackage ../development/libraries/libpng { };
libpng_apng = libpng.override { apngSupport = true; };
libpng12 = callPackage ../development/libraries/libpng/12.nix { };
libpostal = callPackage ../development/libraries/libpostal { };
@ -25844,6 +25853,8 @@ with pkgs;
tuigreet = callPackage ../os-specific/linux/tuigreet { };
};
goldberg-emu = callPackage ../applications/emulators/goldberg-emu { };
goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
inherit (darwin) libiconv;
};
@ -25957,7 +25968,6 @@ with pkgs;
firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
callPackage = newScope {
inherit (rustPackages) cargo rustc;
libpng = libpng_apng;
gnused = gnused_422;
inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
Kerberos AVFoundation MediaToolbox
@ -26381,6 +26391,10 @@ with pkgs;
gpsprune = callPackage ../applications/misc/gpsprune { };
gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { };
gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { };
gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { };
gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { };
@ -29441,7 +29455,6 @@ with pkgs;
thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix {
callPackage = newScope {
inherit (rustPackages) cargo rustc;
libpng = libpng_apng;
gnused = gnused_422;
inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
Kerberos AVFoundation MediaToolbox
@ -33192,6 +33205,8 @@ with pkgs;
clpeak = callPackage ../tools/misc/clpeak { };
collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { };
cups = callPackage ../misc/cups { };
cups-filters = callPackage ../misc/cups/filters.nix { };