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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-05-23 00:03:01 +00:00 committed by GitHub
commit d95a50b7e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
136 changed files with 3392 additions and 23141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/periodic-merge-24h.yml vendored
View File

@ -38,6 +38,10 @@ jobs:
into: staging-next-22.11
- from: staging-next-22.11
into: staging-22.11
- from: release-23.05
into: staging-next-23.05
- from: staging-next-23.05
into: staging-23.05
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
steps:
- uses: actions/checkout@v3

2
.version
View File

@ -1 +1 @@
23.05
23.11

2
lib/trivial.nix
View File

@ -195,7 +195,7 @@ rec {
On each release the first letter is bumped and a new animal is chosen
starting with that new letter.
*/
codeName = "Stoat";
codeName = "Tapir";
/* Returns the current nixpkgs version suffix as string. */
versionSuffix =

13
maintainers/maintainer-list.nix
View File

@ -12497,6 +12497,12 @@
githubId = 3737;
name = "Peter Jones";
};
pjrm = {
email = "pedrojrmagalhaes@gmail.com";
github = "pjrm";
githubId = 4622652;
name = "Pedro Magalhães";
};
pkharvey = {
email = "kayharvey@protonmail.com";
github = "pkharvey";
@ -14229,6 +14235,13 @@
github = "sei40kr";
githubId = 11665236;
};
seirl = {
name = "Antoine Pietri";
email = "antoine.pietri1@gmail.com";
github = "seirl";
githubId = 4927883;
matrix = "@seirl:matrix.org";
};
sellout = {
email = "greg@technomadic.org";
github = "sellout";

1
nixos/doc/manual/release-notes/release-notes.md
View File

@ -3,6 +3,7 @@
This section lists the release notes for each stable version of NixOS and current unstable revision.
```{=include=} sections
rl-2311.section.md
rl-2305.section.md
rl-2211.section.md
rl-2205.section.md

12
nixos/doc/manual/release-notes/rl-2311.section.md Normal file
View File

@ -0,0 +1,12 @@
# Release 23.11 (“Tapir”, 2023.11/??) {#sec-release-23.11}
## Highlights {#sec-release-23.11-highlights}
## New Services {#sec-release-23.11-new-services}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
## Other Notable Changes {#sec-release-23.11-notable-changes}

22
nixos/modules/services/video/epgstation/default.nix
View File

@ -80,11 +80,11 @@ in
options.services.epgstation = {
enable = lib.mkEnableOption (lib.mdDoc description);
package = lib.mkOption {
default = pkgs.epgstation;
type = lib.types.package;
defaultText = lib.literalExpression "pkgs.epgstation";
description = lib.mdDoc "epgstation package to use";
package = lib.mkPackageOptionMD pkgs "epgstation" { };
ffmpeg = lib.mkPackageOptionMD pkgs "ffmpeg" {
default = [ "ffmpeg-headless" ];
example = "pkgs.ffmpeg-full";
};
usePreconfiguredStreaming = lib.mkOption {
@ -278,6 +278,8 @@ in
package = lib.mkDefault pkgs.mariadb;
ensureDatabases = [ cfg.database.name ];
# FIXME: enable once mysqljs supports auth_socket
# https://github.com/mysqljs/mysql/issues/1507
#
# ensureUsers = [ {
# name = username;
# ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
@ -295,8 +297,8 @@ in
database = cfg.database.name;
};
ffmpeg = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg";
ffprobe = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe";
ffmpeg = lib.mkDefault "${cfg.ffmpeg}/bin/ffmpeg";
ffprobe = lib.mkDefault "${cfg.ffmpeg}/bin/ffprobe";
# for disambiguation with TypeScript files
recordedFileExtension = lib.mkDefault ".m2ts";
@ -308,9 +310,15 @@ in
];
systemd.tmpfiles.rules = [
"d '/var/lib/epgstation/key' - ${username} ${groupname} - -"
"d '/var/lib/epgstation/streamfiles' - ${username} ${groupname} - -"
"d '/var/lib/epgstation/drop' - ${username} ${groupname} - -"
"d '/var/lib/epgstation/recorded' - ${username} ${groupname} - -"
"d '/var/lib/epgstation/thumbnail' - ${username} ${groupname} - -"
"d '/var/lib/epgstation/db/subscribers' - ${username} ${groupname} - -"
"d '/var/lib/epgstation/db/migrations/mysql' - ${username} ${groupname} - -"
"d '/var/lib/epgstation/db/migrations/postgres' - ${username} ${groupname} - -"
"d '/var/lib/epgstation/db/migrations/sqlite' - ${username} ${groupname} - -"
];
systemd.services.epgstation = {

182
pkgs/applications/audio/faust/faust2.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, coreutils
, fetchFromGitHub
, makeWrapper
@ -14,19 +15,21 @@
, p11-kit
, vim
, which
, ncurses
, fetchpatch
}:
with lib.strings;
let
version = "2.54.9";
version = "2.59.6";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
rev = version;
sha256 = "sha256-7eSZUsZ0h0vWJIpZWXaS+SHV6N2i9nv6Gr6a9cuu4Fg=";
sha256 = "sha256-m6dimBxI9C3KDhUxbJAn2Pf9z+LRahjrzD34W/bf1XA=";
fetchSubmodules = true;
};
@ -38,80 +41,97 @@ let
maintainers = with maintainers; [ magnetophon pmahoney ];
};
faust = stdenv.mkDerivation {
faust =
let ncurses_static = ncurses.override { enableStatic = true; };
in stdenv.mkDerivation {
pname = "faust";
inherit version;
pname = "faust";
inherit version;
inherit src;
inherit src;
nativeBuildInputs = [ makeWrapper pkg-config cmake vim which ];
buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
nativeBuildInputs = [ makeWrapper pkg-config cmake vim which ];
buildInputs = [
llvm
emscripten
openssl
libsndfile
libmicrohttpd
gnutls
libtasn1
p11-kit
ncurses_static
];
patches = [
# make preset management thread safe
# needed for magnetophonDSP.VoiceOfFaust
# see: https://github.com/grame-cncm/faust/issues/899
(fetchpatch {
url = "https://github.com/grame-cncm/faust/commit/a1c3a515abbcafea0a6e4e2ec7ecb0f092de5349.patch";
hash = "sha256-1Ndm+CgxvGEbS6TKGggeu9hW7N3pC+d1kluT2vhGzL8=";
})
];
passthru = {
inherit wrap wrapWithBuildEnv faust2ApplBase;
};
passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; };
preConfigure = ''
cd build
'';
cmakeFlags = [
"-C../backends/all.cmake"
"-C../targets/all.cmake"
];
postInstall = ''
# syntax error when eval'd directly
pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))"
(shopt -s extglob; rm "$out"/bin/$pattern)
'';
postFixup = ''
# The 'faustoptflags' is 'source'd into other faust scripts and
# not used as an executable, so patch 'uname' usage directly
# rather than use makeWrapper.
substituteInPlace "$out"/bin/faustoptflags \
--replace uname "${coreutils}/bin/uname"
# wrapper for scripts that don't need faust.wrap*
for script in "$out"/bin/faust2*; do
wrapProgram "$script" \
--prefix PATH : "$out"/bin
done
'';
meta = meta // {
description = "A functional programming language for realtime audio signal processing";
longDescription = ''
FAUST (Functional Audio Stream) is a functional programming
language specifically designed for real-time signal processing
and synthesis. FAUST targets high-performance signal processing
applications and audio plug-ins for a variety of platforms and
standards.
The Faust compiler translates DSP specifications into very
efficient C++ code. Thanks to the notion of architecture,
FAUST programs can be easily deployed on a large variety of
audio platforms and plugin formats (jack, alsa, ladspa, maxmsp,
puredata, csound, supercollider, pure, vst, coreaudio) without
any change to the FAUST code.
This package has just the compiler, libraries, and headers.
Install faust2* for specific faust2appl scripts.
preConfigure = ''
cd build
sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static
substituteInPlace Make.llvm.static \
--replace 'mkdir -p $@ && cd $@ && ar -x ../../$<' 'mkdir -p $@ && cd $@ && ar -x ../source/build/lib/libfaust.a && cd ../source/build/'
substituteInPlace Make.llvm.static \
--replace 'rm -rf $(TMP)' ' '
'';
};
};
cmakeFlags = [ "-C../backends/all.cmake" "-C../targets/all.cmake" ];
postInstall = ''
# syntax error when eval'd directly
pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))"
(shopt -s extglob; rm "$out"/bin/$pattern)
'';
postFixup = ''
# The 'faustoptflags' is 'source'd into other faust scripts and
# not used as an executable, so patch 'uname' usage directly
# rather than use makeWrapper.
substituteInPlace "$out"/bin/faustoptflags \
--replace uname "${coreutils}/bin/uname"
# wrapper for scripts that don't need faust.wrap*
for script in "$out"/bin/faust2*; do
wrapProgram "$script" \
--prefix PATH : "$out"/bin
done
'';
meta = meta // {
description =
"A functional programming language for realtime audio signal processing";
longDescription = ''
FAUST (Functional Audio Stream) is a functional programming
language specifically designed for real-time signal processing
and synthesis. FAUST targets high-performance signal processing
applications and audio plug-ins for a variety of platforms and
standards.
The Faust compiler translates DSP specifications into very
efficient C++ code. Thanks to the notion of architecture,
FAUST programs can be easily deployed on a large variety of
audio platforms and plugin formats (jack, alsa, ladspa, maxmsp,
puredata, csound, supercollider, pure, vst, coreaudio) without
any change to the FAUST code.
This package has just the compiler, libraries, and headers.
Install faust2* for specific faust2appl scripts.
'';
};
};
# Default values for faust2appl.
faust2ApplBase =
{ baseName
, dir ? "tools/faust2appls"
, scripts ? [ baseName ]
, ...
}@args:
{ baseName, dir ? "tools/faust2appls", scripts ? [ baseName ], ... }@args:
args // {
name = "${baseName}-${version}";
@ -141,7 +161,8 @@ let
'';
meta = meta // {
description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing";
description =
"The ${baseName} script, part of faust functional programming language for realtime audio signal processing";
};
};
@ -161,11 +182,7 @@ let
#
# The build input 'faust' is automatically added to the
# propagatedBuildInputs.
wrapWithBuildEnv =
{ baseName
, propagatedBuildInputs ? [ ]
, ...
}@args:
wrapWithBuildEnv = { baseName, propagatedBuildInputs ? [ ], ... }@args:
stdenv.mkDerivation ((faust2ApplBase args) // {
@ -205,26 +222,25 @@ let
# simply need to be wrapped with some dependencies on PATH.
#
# The build input 'faust' is automatically added to the PATH.
wrap =
{ baseName
, runtimeInputs ? [ ]
, ...
}@args:
wrap = { baseName, runtimeInputs ? [ ], ... }@args:
let
runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs));
runtimePath =
concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs));
in stdenv.mkDerivation ((faust2ApplBase args) // {
in
stdenv.mkDerivation ((faust2ApplBase args) // {
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
postFixup = ''
for script in "$out"/bin/*; do
wrapProgram "$script" --prefix PATH : "${runtimePath}"
done
'';
});
});
in faust
in
faust

4
pkgs/applications/audio/faustPhysicalModeling/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "faustPhysicalModeling";
version = "2.54.9";
version = "2.59.6";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
rev = version;
sha256 = "sha256-1ZS7SVTWI1vNOGycZIDyKLgwfNooIGDa8Wmr6qfFSkU=";
sha256 = "sha256-Z/hAq6JlhlWBzWlodwQW/k9AkozVeMXmbVhkicNZ5os=";
};
buildInputs = [ faust2jaqt faust2lv2 ];

4
pkgs/applications/audio/sunvox/default.nix
View File

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "SunVox";
version = "2.0e";
version = "2.1c";
src = fetchurl {
url = "https://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
sha256 = "sha256-v4dQnRr7pusOAHX8ytDChKixYxEIjg30vOTD6uA/S0o=";
sha256 = "sha256-yPVcbtlAVbO9uMsFlfZ51T408hA1VPJAI+R+Jdjcyjw=";
};
nativeBuildInputs = [ unzip ];

4
pkgs/applications/blockchains/nbxplorer/default.nix
View File

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "nbxplorer";
version = "2.3.62";
version = "2.3.63";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
rev = "v${version}";
sha256 = "sha256-FpAMkVgvl0SxJ59FjL4H3Fvqb1LKsET2I+A01TQlvFA=";
sha256 = "sha256-K3dlXwzKNzwJstp1DW5T5s5Gs0ebPNWXtzqr3rw5294=";
};
projectFile = "NBXplorer/NBXplorer.csproj";

18
pkgs/applications/editors/vscode/generic.nix
View File

@ -16,6 +16,9 @@
# sourceExecutableName is the name of the binary in the source archive, over
# which we have no control
, sourceExecutableName ? executableName
, useVSCodeRipgrep ? false
, ripgrep
}:
let
@ -131,10 +134,17 @@ let
# and the window immediately closes which renders VSCode unusable
# see https://github.com/NixOS/nixpkgs/issues/152939 for full log
ln -rs "$unpacked" "$packed"
# this fixes bundled ripgrep
chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg
'';
'' + (let
vscodeRipgrep = if stdenv.isDarwin then
"Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg"
else
"resources/app/node_modules/@vscode/ripgrep/bin/rg";
in if !useVSCodeRipgrep then ''
rm ${vscodeRipgrep}
ln -s ${ripgrep}/bin/rg ${vscodeRipgrep}
'' else ''
chmod +x ${vscodeRipgrep}
'');
inherit meta;
};

3
pkgs/applications/editors/vscode/vscode.nix
View File

@ -1,6 +1,7 @@
{ stdenv, lib, callPackage, fetchurl
, isInsiders ? false
, commandLineArgs ? ""
, useVSCodeRipgrep ? false
}:
let
@ -34,7 +35,7 @@ in
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
shortName = "Code" + lib.optionalString isInsiders " - Insiders";
inherit commandLineArgs;
inherit commandLineArgs useVSCodeRipgrep;
src = fetchurl {
name = "VSCode_${version}_${plat}.${archive_fmt}";

4
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "" }:
{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "", useVSCodeRipgrep ? false }:
let
inherit (stdenv.hostPlatform) system;
@ -24,7 +24,7 @@ let
sourceRoot = if stdenv.isDarwin then "" else ".";
in
callPackage ./generic.nix rec {
inherit sourceRoot commandLineArgs;
inherit sourceRoot commandLineArgs useVSCodeRipgrep;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.

2
pkgs/applications/misc/blender/default.nix
View File

@ -183,6 +183,8 @@ stdenv.mkDerivation rec {
done
'';
passthru = { inherit python; };
meta = with lib; {
description = "3D Creation/Animation/Publishing System";
homepage = "https://www.blender.org";

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

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "fluidd";
version = "1.23.5";
version = "1.24.0";
src = fetchurl {
name = "fluidd-v${version}.zip";
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
sha256 = "sha256-od/RoxFjnOuyz7+D+avQJyJzpqpovzs+g4ErfyDJQpY=";
sha256 = "sha256-2J5SVEtlLhZhDzqakOh/gt8XTkSaM9KBa0zCYM4UZAQ=";
};
nativeBuildInputs = [ unzip ];

16
pkgs/applications/misc/kaufkauflist/default.nix
View File

@ -3,40 +3,36 @@
let
esbuild' = buildPackages.esbuild.override {
buildGoModule = args: buildPackages.buildGoModule (args // rec {
version = "0.16.15";
version = "0.17.19";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-iTAtPHjrBvHweSIiAbkkbBLgjF3v68jipJEzc0I4G04=";
hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
};
in buildNpmPackage rec {
pname = "kaufkauflist";
version = "2.0.0";
version = "2.2.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "annaaurora";
repo = "kaufkauflist";
rev = "v${version}";
hash = "sha256-oXrb6n1oD27bHt/zPWP0REQyCyZXI8BB57pdR/q42gY=";
hash = "sha256-a7C4yHTHPhL5/p1/XsrMA0PnbIzer6FShDiwUMOg69Y=";
};
npmDepsHash = "sha256-lSnGLK7+ac/wEpAxlpkZS/kgr9F+8WK+nRjCzkrPJt0=";
npmDepsHash = "sha256-uQ4XoaR3JjvPm8EQ2pnDM+x4zjVn4PEHq7BRqVbvFyw=";
ESBUILD_BINARY_PATH = "${lib.getExe esbuild'}";
installPhase = ''
runHook preInstall
postInstall = ''
mkdir -p $out/share/kaufkauflist $out/share/pocketbase
cp -vr build/* $out/share/kaufkauflist/
cp -v pb_schema.json $out/share/pocketbase/
runHook postInstall
'';
# Uncomment this when nix-update-script supports Gitea.

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

@ -37,13 +37,13 @@
stdenv.mkDerivation rec {
pname = "synergy";
version = "1.14.5.22";
version = "1.14.6.19-stable";
src = fetchFromGitHub {
owner = "symless";
repo = "synergy-core";
rev = version;
sha256 = "sha256-rqQ4n8P8pZSWRCxaQLa2PuduXMt2XeaFs051qcT3/o8=";
sha256 = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY=";
fetchSubmodules = true;
};

61
pkgs/applications/misc/webfontkitgenerator/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ appstream-glib
, desktop-file-utils
, fetchFromGitHub
, gettext
, glib-networking
, gobject-introspection
, gtk4
, gtksourceview5
, lib
, libadwaita
, libsoup_3
, meson
, ninja
, pkg-config
, python3
, stdenv
, wrapGAppsHook4
}:
stdenv.mkDerivation (finalAttrs: {
pname = "webfont-kit-generator";
version = "1.0.3";
src = fetchFromGitHub {
owner = "rafaelmardojai";
repo = "webfont-kit-generator";
rev = finalAttrs.version;
hash = "sha256-aD/1moWIiU4zpLTW+VHH9n/sj10vCZ8UzB2ey3mR0/k=";
};
nativeBuildInputs = [
appstream-glib
desktop-file-utils
gettext
gobject-introspection
gtk4 # For gtk4-update-icon-cache
meson
ninja
pkg-config
wrapGAppsHook4
];
buildInputs = [
glib-networking
gtk4
gtksourceview5
libadwaita
libsoup_3
(python3.withPackages (ps: with ps; [
fonttools
pygobject3
]))
];
meta = with lib; {
description = "Webfont Kit Generator is a simple utility that allows you to generate woff, woff2 and the necessary CSS boilerplate from non-web font formats (otf & ttf)";
homepage = "https://apps.gnome.org/app/com.rafaelmardojai.WebfontKitGenerator";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ benediktbroich ];
platforms = platforms.unix;
};
})

18
pkgs/applications/networking/cluster/spark/default.nix
View File

@ -13,13 +13,13 @@
}:
let
spark = { pname, version, sha256, extraMeta ? {} }:
spark = { pname, version, hash, extraMeta ? {} }:
stdenv.mkDerivation rec {
inherit pname version;
jdk = if hadoopSupport then hadoop.jdk else jdk8;
src = fetchzip {
url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
sha256 = sha256;
inherit hash;
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk python3Packages.python ]
@ -74,6 +74,18 @@ in
spark_3_4 = spark rec {
pname = "spark";
version = "3.4.0";
sha256 = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk=";
hash = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk=";
};
spark_3_3 = spark rec {
pname = "spark";
version = "3.3.2";
hash = "sha256-AeKe2QN+mhUJgZRSIgbi/DttAWlDgwC1kl9p7syEvbo=";
extraMeta.knownVulnerabilities = [ "CVE-2023-22946" ];
};
spark_3_2 = spark rec {
pname = "spark";
version = "3.2.4";
hash = "sha256-xL4W+dTWbvmmncq3/8iXmhp24rp5SftvoRfkTyxCI8E=";
extraMeta.knownVulnerabilities = [ "CVE-2023-22946" ];
};
}

38
pkgs/applications/networking/cluster/tf-summarize/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildGoModule
, fetchFromGitHub
, testers
, tf-summarize
}:
buildGoModule rec {
pname = "tf-summarize";
version = "0.3.2";
src = fetchFromGitHub {
owner = "dineshba";
repo = "tf-summarize";
rev = "v${version}";
sha256 = "0c6fcz0n22mq8bqr82h9lfxx4n1bk9gjlc7d131lpf14yiacih3p";
};
vendorSha256 = "cnybdZth7qlP2BHK8uvLCoqJtggMIkvaL2+YugiUZRE=";
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
];
passthru.tests.version = testers.testVersion {
package = tf-summarize;
command = "tf-summarize -v";
inherit version;
};
meta = with lib; {
description = "Command-line utility to print the summary of the terraform plan";
homepage = "https://github.com/dineshba/tf-summarize";
license = licenses.mit;
maintainers = with maintainers; [ pjrm ];
};
}

2009
pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
pkgs/applications/networking/instant-messengers/flare-signal/default.nix
View File

@ -16,23 +16,23 @@
stdenv.mkDerivation rec {
pname = "flare";
version = "0.6.0";
version = "0.8.0";
src = fetchFromGitLab {
domain = "gitlab.com";
owner = "Schmiddiii";
repo = pname;
rev = version;
hash = "sha256-wY95sXWGDjEy8vvP79XliJOn5GQkAvDmOXKmRz0TPEw=";
hash = "sha256-w4WaWcUsjKiWfNe5StwRcPlcXqWz0427It96L1NsR0U=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"curve25519-dalek-3.2.1" = "sha256-T/NGZddFQWq32eRu6FYfgdPqU8Y4Shi1NpMaX4GeQ54=";
"libsignal-protocol-0.1.0" = "sha256-gapAurbs/BdsfPlVvWWF7Ai1nXZcxCW8qc5gQdbnthM=";
"libsignal-service-0.1.0" = "sha256-AXWCR1maqgIPk8H/IKR22BvMToqJrtlaOelFAnMJ6kI=";
"presage-0.4.0" = "sha256-HtqSNEaQXgvgrs9xvm76W1v7PLmdsJ5M3fbqH2Dpw8A=";
"curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0=";
"libsignal-protocol-0.1.0" = "sha256-IBhmd3WzkICiADO24WLjDJ8pFILGwWNUHLXKpt+Y0IY=";
"libsignal-service-0.1.0" = "sha256-art5O06X4lhp9PoAd23mi6F1wRWkUcyON7AK8uBDoK8=";
"presage-0.6.0-dev" = "sha256-DVImXySYL0zlGkwss/5DnQ3skTaBa7l55VWIGCd6kQU=";
};
};

12
pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
View File

@ -14,17 +14,17 @@
let
pname = "mattermost-desktop";
version = "5.1.0";
version = "5.3.1";
srcs = {
"x86_64-linux" = {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
hash = "sha256-KmtQUqg2ODbZ6zJjsnwlvB+vhR1xbK2X9qqmZpyTR78=";
hash = "sha256-rw+SYCFmN2W4t5iIWEpV9VHxcvwTLOckMV58WRa5dZE=";
};
"i686-linux" = {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";
hash = "sha256-X8Zrthw1hZOqmcYidt72l2vonh31iiA3EDGmCQr7e4c=";
"aarch64-linux" = {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz";
hash = "sha256-FEIldkb3FbUfVAYRkjs7oPRJDHdsIGDW5iaC2Qz1dpc=";
};
};
@ -86,7 +86,7 @@ stdenv.mkDerivation {
homepage = "https://about.mattermost.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.asl20;
platforms = [ "x86_64-linux" "i686-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = [ maintainers.joko ];
};
}

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View File

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230510";
version = "20230518";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-EsFF9fPpHfVmbLm2hRpcJBmwfovfK4CV3LukrG9nP3U=";
hash = "sha256-wtCCQtYYYR+aFpNLS/pABEyYrTEW0W0Fh4kDClJn0dg=";
};
postPatch = ''

4
pkgs/applications/networking/maestral-qt/default.nix
View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
version = "1.7.1";
version = "1.7.2";
disabled = python3.pythonOlder "3.7";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "refs/tags/v${version}";
hash = "sha256-YYlH9s3iNEIacs8izEnIU32j+2lruQ5JJrjvDIzQjRE=";
hash = "sha256-o2KuqKiy+8fbzogR3ATPVkK60JAKYXQ9dogU/g6CS/M=";
};
format = "pyproject";

4
pkgs/applications/networking/sniffers/savvycan/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "savvycan";
version = "208";
version = "213";
src = fetchFromGitHub {
owner = "collin80";
repo = "SavvyCAN";
rev = "V${version}";
hash = "sha256-agvCl8c7LqGyIKe0K3PdzuBUqTJZtUr434134olbUMw=";
hash = "sha256-duITY6s/uadeBCFuG42JbLCaq7yaYv1qB8Q3GA8UJ0A=";
};
buildInputs = [ qtbase qttools qtserialbus qtserialport qtdeclarative ];

101
pkgs/applications/science/chemistry/apbs/default.nix Normal file
View File

@ -0,0 +1,101 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, blas
, superlu
, suitesparse
, python3
, libintl
, libiconv
}:
let
# this is a fork version of fetk (http://www.fetk.org/)
# which is maintained by apbs team
fetk = stdenv.mkDerivation (finalAttrs: {
pname = "fetk";
version = "1.9.3";
src = fetchFromGitHub {
owner = "Electrostatics";
repo = "fetk";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-uFA1JRR05cNcUGaJj9IyGNONB2hU9IOBPzOj/HucNH4=";
};
nativeBuildInputs = [
cmake
];
cmakeFlags = [
"-DBLAS_LIBRARIES=${blas}/lib"
"-DBLA_STATIC=OFF"
"-DBUILD_SUPERLU=OFF"
];
buildInputs = [
blas
superlu
suitesparse
];
meta = with lib; {
description = "Fork of the Finite Element ToolKit from fetk.org";
homepage = "https://github.com/Electrostatics/FETK";
changelog = "https://github.com/Electrostatics/FETK/releases/tag/${finalAttrs.version}";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix;
};
});
in
stdenv.mkDerivation (finalAttrs: {
pname = "apbs";
version = "3.4.1";
src = fetchFromGitHub {
owner = "Electrostatics";
repo = "apbs";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-2DnHU9hMDl4OJBaTtcRiB+6R7gAeFcuOUy7aI63A3gQ=";
};
postPatch = ''
# ImportFETK.cmake downloads source and builds fetk
substituteInPlace CMakeLists.txt \
--replace "include(ImportFETK)" "" \
--replace 'import_fetk(''${FETK_VERSION})' ""
'';
nativeBuildInputs = [
cmake
];
buildInputs = [
fetk
suitesparse
blas
python3
] ++ lib.optionals stdenv.isDarwin [
libintl
libiconv
];
cmakeFlags = [
"-DPYTHON_VERSION=${python3.version}"
"-DAPBS_LIBS=mc;maloc"
"-DCMAKE_MODULE_PATH=${fetk}/share/fetk/cmake;"
"-DENABLE_TESTS=1"
];
doCheck = true;
meta = with lib; {
description = "Software for biomolecular electrostatics and solvation calculations";
homepage = "https://www.poissonboltzmann.org/";
changelog = "https://github.com/Electrostatics/apbs/releases/tag/v${finalAttrs.version}";
license = licenses.bsd3;
maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix;
};
})

6
pkgs/applications/science/logic/lean/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "lean";
version = "3.50.3";
version = "3.51.0";
src = fetchFromGitHub {
owner = "leanprover-community";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
# from. this is then used to check whether an olean file should be
# rebuilt. don't use a tag as rev because this will get replaced into
# src/githash.h.in in preConfigure.
rev = "855e5b74e3a52a40552e8f067169d747d48743fd";
sha256 = "sha256-RH4w7PpzC+fhqCHikXQO2pUUvWD2qrA0mVMUGxpauwE=";
rev = "9fc1dee97a72a3e34d658aefb4b8a95ecd3d477c";
hash = "sha256-Vcsph4dTNLafeaTtVwJS8tWoWCgcP6pxF0ssZDE/YfM=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/science/math/clp/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }:
stdenv.mkDerivation rec {
version = "1.17.7";
version = "1.17.8";
pname = "clp";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Clp";
rev = "releases/${version}";
hash = "sha256-CfAK/UbGaWvyk2ZxKEgziVruzZfz7WMJVi/YvdR/UNA=";
hash = "sha256-3Z6ysoCcDVB8UePiwbZNqvO/o/jgPcv6XFkpJZBK+Os=";
};
nativeBuildInputs = [ pkg-config ];

1
pkgs/applications/science/math/sage/sage.nix
View File

@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.sagemath.org";
license = licenses.gpl2Plus;
maintainers = teams.sage.members;
platforms = platforms.linux;
};
}

4
pkgs/applications/terminal-emulators/st/xst.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "xst";
version = "0.8.4.1";
version = "0.9.0";
src = fetchFromGitHub {
owner = "gnotclub";
repo = pname;
rev = "v${version}";
sha256 = "nOJcOghtzFkl7B/4XeXptn2TdrGQ4QTKBo+t+9npxOA=";
sha256 = "sha256-V7WzletBFOOXBXClDJZIGT2comnC5WDApO1ZCoPKThY=";
};
nativeBuildInputs = [

6
pkgs/applications/version-management/srvc/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "srvc";
version = "0.17.1";
version = "0.18.0";
src = fetchFromGitHub {
owner = "insilica";
repo = "rs-srvc";
rev = "v${version}";
hash = "sha256-WpzJzjGzYX1IxC9Vz//JhRYCPZyLchv+iv+kuKkw2Os=";
hash = "sha256-/NLqQcuJML0Yxu08dGma6WjTmuEsf5GbsgjX90f2K5U=";
};
cargoHash = "sha256-WhmcJQRh2x6DZRXwzy/KtK81XXIDmNMnUtq7ylCpwTw=";
cargoHash = "sha256-OlzMKiibWLmba2MhcUWzvgBDMyTqTBqaXYI2a0Uw7Jw=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices

57
pkgs/applications/video/epgstation/client/package.json
View File

@ -1,57 +0,0 @@
{
"name": "epgstation-client",
"version": "2.6.20",
"private": true,
"scripts": {
"build": "vue-cli-service build",
"lint": "vue-cli-service lint",
"watch": "vue-cli-service build --watch --mode development"
},
"dependencies": {
"@mdi/font": "6.5.95",
"aribb24.js": "1.8.8",
"axios": "0.24.0",
"eventemitter2": "6.4.5",
"hls.js": "1.1.2",
"inversify": "6.0.1",
"json-stable-stringify": "1.0.1",
"lodash": "4.17.21",
"material-design-icons-iconfont": "6.1.1",
"mpegts.js": "1.6.10",
"reflect-metadata": "0.1.13",
"resize-observer-polyfill": "1.5.1",
"roboto-fontface": "*",
"smoothscroll-polyfill": "0.4.4",
"socket.io-client": "4.3.2",
"typeface-roboto": "1.1.13",
"vue": "2.6.14",
"vue-class-component": "7.2.6",
"vue-property-decorator": "9.1.2",
"vue-router": "3.5.3",
"vuetify": "2.5.10",
"vuetify-datetime-picker": "2.1.1",
"@types/hls.js": "0.13.3",
"@types/json-stable-stringify": "1.0.33",
"@types/lodash": "4.14.178",
"@types/smoothscroll-polyfill": "0.3.1",
"@types/socket.io-client": "1.4.36",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"@vue/cli-plugin-eslint": "4.5.12",
"@vue/cli-plugin-typescript": "4.5.13",
"@vue/cli-plugin-vuex": "4.5.13",
"@vue/cli-service": "4.5.13",
"@vue/eslint-config-prettier": "6.0.0",
"@vue/eslint-config-typescript": "7.0.0",
"eslint": "7.32.0",
"eslint-plugin-prettier": "3.4.1",
"eslint-plugin-vue": "7.20.0",
"prettier": "2.4.1",
"sass": "1.32.12",
"sass-loader": "10.2.0",
"typescript": "4.4.4",
"vue-cli-plugin-vuetify": "2.4.3",
"vue-template-compiler": "2.6.14",
"vuetify-loader": "1.7.3"
}
}

140
pkgs/applications/video/epgstation/default.nix
View File

@ -1,17 +1,19 @@
{ lib
, stdenv
, fetchpatch
, fetchFromGitHub
, buildNpmPackage
, installShellFiles
, makeWrapper
, bash
, nodejs
, gzip
, callPackage
, python3
}:
let
# NOTE: use updateScript to bump the package version
pname = "EPGStation";
buildNpmPackage rec {
pname = "epgstation";
version = "2.6.20";
src = fetchFromGitHub {
owner = "l3tnun";
repo = "EPGStation";
@ -19,68 +21,73 @@ let
sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig=";
};
client = nodejs.pkgs.epgstation-client.override (drv: {
# This is set to false to keep devDependencies at build time. Build time
# dependencies are pruned afterwards.
production = false;
patches = [
./use-mysql-over-domain-socket.patch
meta = drv.meta // {
inherit (nodejs.meta) platforms;
};
});
# upgrade dependencies to make it compatible with node 18
(fetchpatch {
url = "https://github.com/midchildan/EPGStation/commit/5d6cad746b7d9b6d246adcdecf9c991b77c9d89e.patch";
sha256 = "sha256-9a8VUjczlyQHVO7w9MYorPIZunAuBuif1HNmtp1yMk8=";
})
(fetchpatch {
url = "https://github.com/midchildan/EPGStation/commit/c948e833e485c2b7cb7fb33b953cca1e20de3a70.patch";
sha256 = "sha256-nM6KkVRURuQFZLXZ2etLU1a1+BoaJnfjngo07TFbe58=";
})
];
server = nodejs.pkgs.epgstation.override (drv: {
# NOTE: updateScript relies on version matching the src.
inherit version src;
npmDepsHash = "sha256-dohencRGuvc+vSoclLVn5iles4GOuTq26BrEVeJ4GC4=";
npmBuildScript = "build-server";
npmRootPath = "/lib/node_modules/epgstation";
# This is set to false to keep devDependencies at build time. Build time
# dependencies are pruned afterwards.
production = false;
buildInputs = [ bash ];
nativeBuildInputs = [ installShellFiles makeWrapper python3 ];
buildInputs = (drv.buildInputs or [ ]) ++ [ bash ];
nativeBuildInputs = (drv.nativeBuildInputs or [ ]) ++ [
makeWrapper
];
clientDir = buildNpmPackage {
pname = "${pname}-client";
inherit version src installPhase meta;
preRebuild = ''
# Fix for OpenSSL compat with newer Node.js
export NODE_OPTIONS=--openssl-legacy-provider
npmDepsHash = "sha256-a/cDPABWI4lPxvSOI4D90O71A9lm8icPMak/g6DPYQY=";
npmRootPath = "";
# Fix for not being able to connect to mysql using domain sockets.
patch -p1 < ${./use-mysql-over-domain-socket.patch}
sourceRoot = "source/client";
NODE_OPTIONS = "--openssl-legacy-provider";
};
# Workaround for https://github.com/svanderburg/node2nix/issues/275
sed -i -e "s|#!/usr/bin/env node|#! ${nodejs}/bin/node|" node_modules/node-gyp-build/bin.js
postBuild = ''
rm -rf client
cp -r ${clientDir} client
'';
# Optional typeorm dependency that does not build on aarch64-linux
rm -r node_modules/oracledb
# installPhase is shared with clientDir
installPhase = ''
runHook preInstall
find . -name package-lock.json -delete
'';
npm prune --omit dev --no-save \
$npmInstallFlags \
"''${npmInstallFlagsArray[@]}" \
$npmFlags \
"''${npmFlagsArray[@]}"
postInstall = let
mkdir -p $out$npmRootPath
cp -r . $out$npmRootPath
runHook postInstall
'';
postInstall =
let
runtimeDeps = [ nodejs bash ];
in
''
mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1}
mkdir -p $out/{bin,libexec,share/doc/epgstation}
pushd $out/lib/node_modules/epgstation
cp -r ${client}/lib/node_modules/epgstation-client/{package-lock.json,node_modules} client/
chmod -R u+w client/{package-lock.json,node_modules}
npm run build
npm prune --production
pushd client
npm prune --production
popd
pushd $out$npmRootPath
mv config/enc.js.template $out/libexec/enc.js
mv LICENSE Readme.md $out/share/doc/epgstation
mv doc/* $out/share/doc/epgstation
sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \
| ${gzip}/bin/gzip > $out/share/man/man1/epgstation.1.gz
sed 's/@DESCRIPTION@/${meta.description}/g' ${./epgstation.1} > doc/epgstation.1
installManPage doc/epgstation.1
rm -rf doc
# just log to stdout and let journald do its job
@ -90,42 +97,27 @@ let
# symlinks. Without this, they would all be non-writable because they
# reside in the Nix store. Note that the source path won't be accessible
# at build time.
rm -r config data recorded thumbnail
rm -r config data drop recorded thumbnail src/db/subscribers src/db/migrations
ln -sfT /etc/epgstation config
ln -sfT /var/lib/epgstation data
ln -sfT /var/lib/epgstation/drop drop
ln -sfT /var/lib/epgstation/recorded recorded
ln -sfT /var/lib/epgstation/thumbnail thumbnail
ln -sfT /var/lib/epgstation/db/subscribers src/db/subscribers
ln -sfT /var/lib/epgstation/db/migrations src/db/migrations
makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \
--chdir "$out/lib/node_modules/epgstation" \
--chdir $out$npmRootPath \
--prefix PATH : ${lib.makeBinPath runtimeDeps} \
--set APP_ROOT_PATH "$out/lib/node_modules/epgstation"
--set APP_ROOT_PATH $out$npmRootPath
popd
'';
# NOTE: this may take a while since it has to update all packages in
# nixpkgs.nodePackages
passthru.updateScript = callPackage ./update.nix { };
# nodePackages.epgstation is a stub package to fetch npm dependencies and
# its meta.platforms is made empty to prevent users from installing it
# directly. This technique ensures epgstation can share npm packages with
# the rest of nixpkgs while still allowing us to heavily customize the
# build. It also allows us to provide devDependencies for the epgstation
# build process without doing the same for all the other node packages.
meta = drv.meta // {
inherit (nodejs.meta) platforms;
};
});
in
server // {
name = "${pname}-${version}";
meta = with lib; server.meta // {
meta = with lib; {
description = "DVR software compatible with Mirakurun.";
homepage = "https://github.com/l3tnun/EPGStation";
license = licenses.mit;
maintainers = with maintainers; [ midchildan ];
# NOTE: updateScript relies on this being correct
position = toString ./default.nix + ":1";
};
}

72
pkgs/applications/video/epgstation/package.json
View File

@ -1,72 +0,0 @@
{
"name": "epgstation",
"version": "2.6.20",
"description": "DTV Software in Japan.",
"repository": {
"type": "git",
"url": "git+https://github.com/l3tnun/EPGStation-V2.git"
},
"author": "l3tnun",
"license": "MIT",
"bugs": {
"url": "https://github.com/l3tnun/EPGStation-V2/issues"
},
"homepage": "https://github.com/l3tnun/EPGStation-V2#readme",
"dependencies": {
"arib-subtitle-timedmetadater": "4.0.9",
"aribts": "2.1.12",
"axios": "0.24.0",
"body-parser": "1.19.0",
"cors": "2.8.5",
"diskusage-ng": "1.0.2",
"express": "4.17.1",
"express-openapi": "9.3.0",
"file-type": "16.5.3",
"inversify": "5.1.1",
"js-yaml": "4.1.0",
"lodash": "4.17.21",
"log4js": "6.3.0",
"minimist": "1.2.5",
"mirakurun": "3.9.0-beta.26",
"mkdirp": "1.0.4",
"multer": "1.4.3",
"mysql": "2.18.1",
"openapi-types": "9.3.0",
"reflect-metadata": "0.1.13",
"socket.io": "4.3.1",
"source-map-support": "0.5.20",
"sqlite3": "5.0.11",
"swagger-ui-dist": "3.52.5",
"typeorm": "0.2.38",
"url-join": "4.0.1",
"@types/body-parser": "1.19.1",
"@types/express": "4.17.13",
"@types/file-type": "10.9.1",
"@types/js-yaml": "4.0.4",
"@types/lodash": "4.14.176",
"@types/minimist": "1.2.2",
"@types/mkdirp": "1.0.2",
"@types/mongodb": "4.0.6",
"@types/multer": "1.4.7",
"@types/node": "16.11.6",
"@types/socket.io": "3.0.1",
"@types/source-map-support": "0.5.4",
"@types/sqlite3": "3.1.7",
"@types/url-join": "4.0.1",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"del": "6.0.0",
"eslint": "7.32.0",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-prettier": "3.4.1",
"gulp": "4.0.2",
"gulp-eslint": "6.0.0",
"gulp-plumber": "1.2.1",
"gulp-sourcemaps": "3.0.0",
"gulp-typescript": "5.0.1",
"prettier": "2.4.1",
"ts-loader": "9.2.6",
"ts-node": "10.4.0",
"typescript": "4.4.4"
}
}

62
pkgs/applications/video/epgstation/update.nix
View File

@ -1,62 +0,0 @@
{ gitUpdater
, writers
, jq
, yq
, gnused
, _experimental-update-script-combinators
}:
let
updateSource = gitUpdater {
rev-prefix = "v";
};
updateLocks = writers.writeBash "update-epgstation" ''
set -euxo pipefail
cd "$1"
# Get the path to the latest source. Note that we can't just pass the value
# of epgstation.src directly because it'd be evaluated before we can run
# updateScript.
SRC="$(nix-build ../../../.. --no-out-link -A epgstation.src)"
if [[ "$UPDATE_NIX_OLD_VERSION" == "$(${jq}/bin/jq -r .version "$SRC/package.json")" ]]; then
echo "[INFO] Already using the latest version of $UPDATE_NIX_PNAME" >&2
exit
fi
# Regenerate package.json from the latest source.
${jq}/bin/jq '. + {
dependencies: (.dependencies + .devDependencies),
} | del(.devDependencies, .main, .scripts)' \
"$SRC/package.json" \
> package.json
${jq}/bin/jq '. + {
dependencies: (.dependencies + .devDependencies),
} | del(.devDependencies, .main, .scripts)' \
"$SRC/client/package.json" \
> client/package.json
# Fix issue with old sqlite3 version pinned that depends on very old node-gyp 3.x
${gnused}/bin/sed -i -e 's/"sqlite3":\s*"5.0.[0-9]\+"/"sqlite3": "5.0.11"/' package.json
# Regenerate node packages to update the pre-overridden epgstation derivation.
# This must come *after* package.json has been regenerated.
pushd ../../../development/node-packages
./generate.sh
popd
# Generate default streaming settings for the nixos module.
pushd ../../../../nixos/modules/services/video/epgstation
${yq}/bin/yq -j '{ urlscheme , stream }' \
"$SRC/config/config.yml.template" \
> streaming.json
# Fix generated output for EditorConfig compliance
printf '\n' >> streaming.json # rule: insert_final_newline
popd
'';
in
_experimental-update-script-combinators.sequence [
updateSource
[updateLocks ./.]
]

2
pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch
View File

@ -16,7 +16,7 @@ index 5591853b..838c06cb 100644
ormConfig.charset = config.mysql.charset;
}
+ if (config.mysql.socketPath) {
+ ormConfig.socketPath = config.mysql.socketPath;
+ ormConfig.extra = { socketPath: config.mysql.socketPath };
+ } else {
+ ormConfig.host = config.mysql.host;
+ ormConfig.port = config.mysql.port;

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

@ -47,13 +47,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "75.0.0";
version = "76.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "c3I2ULSvKBTYIm1chVHPkaV0TxblLglBjzeUJ5TRmGw=";
sha256 = "sha256-jeuok3sspLQRnLCYvsmIbjhuf00eSS/4FjmzlRyzYzc=";
};
nativeBuildInputs = [

4
pkgs/applications/virtualization/ecs-agent/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "amazon-ecs-agent";
version = "1.71.0";
version = "1.71.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
hash = "sha256-+/aeLI1+VE80NdeAqc7ctZsS6i0Ymj/GXssduP8X//c=";
hash = "sha256-v3sICXijHStJDPYJq0VHd3CY1G1dlPwSdyPzpEHpc90=";
};
vendorHash = null;

4
pkgs/data/fonts/doulos-sil/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "doulos-sil";
version = "6.101";
version = "6.200";
src = fetchzip {
url = "https://software.sil.org/downloads/r/doulos/DoulosSIL-${version}.zip";
hash = "sha256-CPjk6SLgsDYjachZZ1hanp6Q+cxTxfHOkoeU59Om5b8=";
hash = "sha256-kpbXJVAEQLr5HMFaE+8OgAYrMGQoetgMi0CcPn4a3Xw=";
};
installPhase = ''

6
pkgs/data/fonts/unifont/default.nix
View File

@ -4,16 +4,16 @@
stdenv.mkDerivation rec {
pname = "unifont";
version = "15.0.01";
version = "15.0.02";
ttf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
hash = "sha256-KZRZvDTpFbHBjdOGd3OfQdCyptebk/SAzRV+8k2mdas=";
hash = "sha256-DvWkQo+ZYWwoCCA69iyDmQtS/Qxwg7b2spLPqiSauL4=";
};
pcf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0=";
hash = "sha256-01yEB9We5MkeCF6uva0SDTpt+4Ln2TaNh6jkCS66PUE=";
};
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];

4
pkgs/data/fonts/unifont_upper/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "unifont_upper";
version = "15.0.01";
version = "15.0.02";
src = fetchurl {
url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf";
hash = "sha256-o6ItW9fME+f4t2cvhj96r3ZG9nKLAUznn/pdukFYnxw=";
hash = "sha256-Ikd2VotAvktUd083vzZZFLzmXtZi4EGYRJ9eKP4yveE=";
};
dontUnpack = true;

5
pkgs/data/themes/adwaita-qt/default.nix
View File

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "adwaita-qt";
version = "1.4.1";
version = "1.4.2";
outputs = [ "out" "dev" ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "FedoraQt";
repo = pname;
rev = version;
sha256 = "sha256-t9vv1KcMUg8Qe7lhVMN4GO+VPoT7QzeoQ6hV4fesA8U=";
sha256 = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";
};
nativeBuildInputs = [
@ -62,6 +62,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = teams.gnome.members ++ (with maintainers; [ ]);
platforms = platforms.all;
broken = stdenv.isDarwin; # broken since 2021-12-05 on hydra, broken until qt515 will be used for darwin
};
}

4
pkgs/desktops/gnustep/gorm/default.nix
View File

@ -1,11 +1,11 @@
{ fetchzip, base, back, gsmakeDerivation, gui }:
gsmakeDerivation rec {
pname = "gorm";
version = "1.2.28";
version = "1.3.1";
src = fetchzip {
url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz";
sha256 = "0n92xr16w0wnwfzh7i9xhsly61pyz9l9f615dp324a6r3444hn0z";
sha256 = "sha256-W+NgbvLjt1PpDiauhzWFaU1/CUhmDACQz+GoyRUyWB8=";
};
buildInputs = [ base back gui ];

4
pkgs/development/compilers/closure/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "closure-compiler";
version = "20221102";
version = "20230502";
src = fetchurl {
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
sha256 = "sha256-xaVAmt2GVywRVB7n6mqKqsYlfEAjRZEnfspf9c1Qluc=";
sha256 = "sha256-h/kKVX49KuivQwrG9KQr7PG0U0heiQmZd3pSyQvanSI=";
};
dontUnpack = true;

4
pkgs/development/compilers/mercury/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "mercury";
version = "22.01.5";
version = "22.01.6";
src = fetchurl {
url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
sha256 = "sha256-fhstGxMMCvxlVCvjwuSDmc8sJdegStPEJ+AicVsJig8=";
sha256 = "sha256-dpRW+DRGJZPIvUv6/y1TLAFjrPOldKBtpwn87nOgIt8=";
};
nativeBuildInputs = [ makeWrapper ];

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

@ -14,7 +14,7 @@
}:
let
version = "11.2";
version = "12.1";
bootstrapFromC = ! ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isx86_64);
arch = if stdenv.isLinux && stdenv.isAarch64 then
@ -34,10 +34,10 @@ stdenv.mkDerivation {
if stdenv.isLinux && stdenv.isAarch64
then fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-aarch64le.tar.gz";
sha256 = "11maixldk20wqb5js5p4imq221zz9nf27649v9pqkdf8fv7rnrs9";
sha256 = "12ra9bc93x8g07impbd8jr6djjzwpb9qvh9zhxvvrba3332zx3vh";
} else fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
sha256 = "17822hs9y07vcviv2af17p3va7qh79dird49nj50bwi9rz64ia3w";
sha256 = "035f92vni0vqmgj9hq2i7vwasz7crx52wll4823vhfkm1qdv5ywc";
};
buildInputs = [ ncurses ] ++ lib.optionals enableX11 [ libX11 ];

4
pkgs/development/compilers/p4c/default.nix
View File

@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation rec {
pname = "p4c";
version = "1.2.3.8";
version = "1.2.3.9";
src = fetchFromGitHub {
owner = "p4lang";
repo = "p4c";
rev = "v${version}";
sha256 = "sha256-EvMoooB6kAV0fJ3XBFJKpams87ImybTXw0C5P9YAa9Q=";
sha256 = "sha256-mnJluusDei95B6LMAwre8FjjxwlpK99tzvzLwroQQsM=";
fetchSubmodules = true;
};

1
pkgs/development/compilers/rust/default.nix
View File

@ -69,7 +69,6 @@ in
# Use boot package set to break cycle
inherit (bootstrapRustPackages) cargo rustc;
rustPlatform = bootRustPlatform;
} // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
stdenv = llvmBootstrapForDarwin.stdenv;
pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };

2
pkgs/development/compilers/rust/rustc.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
, fetchurl, file, python3
, darwin, cargo, cmake, rust, rustc, rustPlatform
, darwin, cargo, cmake, rust, rustc
, pkg-config, openssl, xz
, libiconv
, which, libffi

4
pkgs/development/compilers/tvm/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "tvm";
version = "0.11.1";
version = "0.12.0";
src = fetchFromGitHub {
owner = "apache";
repo = "incubator-tvm";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-D6j5KHx7I9UmcI6SSuDMYQE/4ae9ZfDef1bdIzryefk=";
sha256 = "sha256-NHfYx45Zad+jsILR24c2U+Xmb2rKaTyl8xl5uxAFtak=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/interpreters/janet/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.27.0";
version = "1.28.0";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UsM7J1LsiO5g3yxpO245Yr0oJQaCxs7LMNvxuHv6pTk=";
sha256 = "sha256-QfW17BDP+xa+Qy9FuIioe8UY6BBGsvbSyyz6GFODg5g=";
};
postPatch = ''

31
pkgs/development/interpreters/wamr/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "wamr";
version = "1.2.2";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wasm-micro-runtime";
rev = "WAMR-${version}";
hash = "sha256-jpT42up9HAVJpo03cFrffQQk2JiHEAEepBGlU4RUfNU=";
};
nativeBuildInputs = [ cmake ];
sourceRoot = "source/product-mini/platforms/linux";
meta = with lib; {
description = "WebAssembly Micro Runtime";
homepage = "https://github.com/bytecodealliance/wasm-micro-runtime";
license = licenses.asl20;
maintainers = with maintainers; [ ereslibre ];
# TODO (ereslibre): this derivation should be improved to support
# more platforms.
broken = !stdenv.isLinux;
};
}

16
pkgs/development/interpreters/wasmtime/default.nix
View File

@ -1,27 +1,29 @@
{ rustPlatform, fetchFromGitHub, lib, stdenv }:
{ rustPlatform, fetchFromGitHub, Security, lib, stdenv }:
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "8.0.1";
version = "9.0.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-xSHwR2MGL49VDKjzAh+xYHbLz3FFg3KYVBjALVgKSQI=";
hash = "sha256-9ga7BKJoaw7naX8t4o+zNnWkjIvSII5oVRM0dYMrseo=";
fetchSubmodules = true;
};
cargoHash = "sha256-A2JhjRFKPltHubiJYHBXj2H4cdU43Y2x6UjEpRGPX7U=";
cargoHash = "sha256-GkL78aAIGdSlcxeRTIVp1jcXIg1ZtvB2LNIoPEViNcs=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
outputs = [ "out" "dev" ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
# SIMD tests are only executed on platforms that support all
# required processor features (e.g. SSE3, SSSE3, SSE4.1 and SSE4.2 on x86_64):
# https://github.com/bytecodealliance/wasmtime/blob/207cd1ce15ecc504dafaec490c5eae801cac4691/cranelift/codegen/src/isa/x64/mod.rs#L228
doCheck = with stdenv.buildPlatform; (isx86_64 -> sse3Support && ssse3Support && sse4_1Support && sse4_2Support);
# required processor features (e.g. SSE3, SSSE3 and SSE4.1 on x86_64):
# https://github.com/bytecodealliance/wasmtime/blob/v9.0.0/cranelift/codegen/src/isa/x64/mod.rs#L220
doCheck = with stdenv.buildPlatform; (isx86_64 -> sse3Support && ssse3Support && sse4_1Support);
cargoTestFlags = ["--package" "wasmtime-runtime"];
postInstall = ''

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "apr";
version = "1.7.2";
version = "1.7.4";
src = fetchurl {
url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
sha256 = "sha256-ded8yGd2wDDApcQI370L8qC3Xu1TUeUtVDn6HlUJpD4=";
sha256 = "sha256-/GSN6YPzoqbJ543qHxgGOb0vrWwG1VbUNnpwH+XDVXc=";
};
patches = [

13
pkgs/development/libraries/crocoddyl/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, example-robot-data
, pinocchio
@ -10,16 +11,24 @@
stdenv.mkDerivation rec {
pname = "crocoddyl";
version = "1.9.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "loco-3d";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IQ+8ZZXVTTRFa4uGetpylRab4P9MSTU2YtytYA3z6ys=";
fetchSubmodules = true;
hash = "sha256-wDHCHTJXmJjU7mhQ2huUVdEc9ap7PMeqlHPrKm//jBQ=";
};
patches = [
# error: no matching function for call to 'max(double&, int)'
(fetchpatch {
url = "https://github.com/loco-3d/crocoddyl/commit/d2e4116257595317740975e745739bb76b92e5c0.patch";
hash = "sha256-M79jNdIxzx9PfW3TStRny76dVo/HDf/Rp08ZPx+ymBg";
})
];
strictDeps = true;
nativeBuildInputs = [

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

@ -7,11 +7,11 @@
stdenv.mkDerivation rec{
pname = "gloox";
version = "1.0.26";
version = "1.0.27";
src = fetchurl {
url = "https://camaya.net/download/gloox-${version}.tar.bz2";
sha256 = "sha256-a0WzkNOwNGo89swRjVzK/N8Q1RvlegKwB27fBkAzq28=";
sha256 = "sha256-C4tzcUObxY2eUThLYWyWSxi3tBuHrxt4VRBDgO2ob/s=";
};
# needed since gcc12

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

@ -4,11 +4,11 @@
# the ngspice derivation.
stdenv.mkDerivation rec {
pname = "libngspice";
version = "37";
version = "40";
src = fetchurl {
url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
sha256 = "1gpcic6b6xk3g4956jcsqljf33kj5g43cahmydq6m8rn39sadvlv";
sha256 = "sha256-4wPKe8D1lOLWqoT2h4VCPmvwyNrQCbsgvk1XQliOiQ0=";
};
nativeBuildInputs = [ flex bison ];

2
pkgs/development/libraries/wayland/default.nix
View File

@ -124,6 +124,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ primeos codyopel qyliss ];
};
passthru.version = version;
}

2
pkgs/development/node-packages/node-packages.json
View File

@ -128,8 +128,6 @@
, "elm-test"
, "emoj"
, "emojione"
, {"epgstation": "../../applications/video/epgstation"}
, {"epgstation-client": "../../applications/video/epgstation/client"}
, "escape-string-regexp"
, "eslint"
, "eslint_d"

4346
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

14
pkgs/development/node-packages/overrides.nix
View File

@ -139,20 +139,6 @@ final: prev: {
name = "eask";
};
# NOTE: this is a stub package to fetch npm dependencies for
# ../../applications/video/epgstation
epgstation = prev."epgstation-../../applications/video/epgstation".override (oldAttrs: {
buildInputs = [ pkgs.postgresql ];
nativeBuildInputs = [ final.node-pre-gyp final.node-gyp-build pkgs.which ];
meta = oldAttrs.meta // { platforms = lib.platforms.none; };
});
# NOTE: this is a stub package to fetch npm dependencies for
# ../../applications/video/epgstation/client
epgstation-client = prev."epgstation-client-../../applications/video/epgstation/client".override (oldAttrs: {
meta = oldAttrs.meta // { platforms = lib.platforms.none; };
});
expo-cli = prev."expo-cli".override (oldAttrs: {
# The traveling-fastlane-darwin optional dependency aborts build on Linux.
dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") oldAttrs.dependencies;

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

@ -17,13 +17,13 @@
buildPythonPackage rec {
pname = "basemap";
version = "1.3.6";
version = "1.3.7";
src = fetchFromGitHub {
owner = "matplotlib";
repo = "basemap";
rev = "refs/tags/v${version}";
hash = "sha256-BSWifzh+Y1f+x89oNYMBvttWY9qZ0IM5QYqSgyVb1fE=";
hash = "sha256-oWKCUARTMCiXDp4SCOOrOUQLUDU4DIzwsmUXCXoDvx0=";
};
sourceRoot = "source/packages/basemap";

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

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "can";
version = "4.2.0";
version = "4.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "hardbyte";
repo = "python-can";
rev = "refs/tags/v${version}";
hash = "sha256-KY+WViWcKbrO6SO6cIo5dWylyBDEdmAR6wYwJogeCjs=";
hash = "sha256-3luuff/yAAERaptMsKCYISwWrzqDJClm+dnoJpjBkVY=";
};
postPatch = ''

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "desktop-notifier";
version = "3.5.2";
version = "3.5.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SamSchott";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-IZY5vGQoJHcnMBcPjsrYYyuBI4WWyLCRZ/PC3TeVX9k=";
hash = "sha256-IA9LTsjO9se3Gx6Jm36m+tUxUHPjwmVCt9gAw1ZqDgg=";
};
nativeBuildInputs = [

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

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "emborg";
version = "1.35";
version = "1.37";
format = "flit";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "KenKundert";
repo = "emborg";
rev = "refs/tags/v${version}";
hash = "sha256-T6RfZNJ4k7ONYByy4J6Iuc7sVLKHlXti7p7x1QKgkNo=";
hash = "sha256-bHYs+vlNku/T5Hb9u77Xml9/FNj5vgqPeXSzcilsS+I=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "frozendict";
version = "2.3.5";
version = "2.3.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Marco-Sulla";
repo = "python-frozendict";
rev = "refs/tags/v${version}";
hash = "sha256-IlKhqQvNaYz4+U8UJ/fGUNNTC3RjyGKCJUzJ6J431Vw=";
hash = "sha256-4a0DvZOzNJqpop7wi+FagUR+8oaekz4EDNIYdUaAWC8=";
};
postPatch = ''

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "geopandas";
version = "0.12.2";
version = "0.13.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "geopandas";
repo = "geopandas";
rev = "refs/tags/v${version}";
hash = "sha256-ntOZ2WCoMz5ZpqPeupqPC3cN8mbQmEAvJGaFblu0ibY=";
hash = "sha256-GYEd679EX+gyGb2fpfyrJlGYPduc+W7I2tjTHegyWi8=";
};
propagatedBuildInputs = [

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "glyphslib";
version = "6.1.0";
version = "6.2.2";
format = "pyproject";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "googlefonts";
repo = "glyphsLib";
rev = "refs/tags/v${version}";
hash = "sha256-TulMOubqY1hI1No0yW4d9Wo5xjqBm0qXqmo17+Fvq0w=";
hash = "sha256-JY1Gs2RTjp7eCwyK9ZI2OpqExxYR8unt4DcjarXWiZk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "holoviews";
version = "1.15.4";
version = "1.16.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-StwTN1DmDnNiZ+3iF2NW5qMDFDiwkTZ8tPKzhN6ZrgM=";
hash = "sha256-E0FqJRhY6tAwSVcNnns5zfGRjTnmRTChjlUrZ3ERWho=";
};
propagatedBuildInputs = [

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

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "ipyparallel";
version = "8.4.1";
version = "8.6.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Zwu+BXVTgXQuHqARd9xCj/jz6Urx8NVkLJ0Z83yoKJs=";
hash = "sha256-o5ql75VgFwvw6a/typ/wReG5wYMsSTAzd+3Mkc6p+3c=";
};
nativeBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "llfuse";
version = "1.4.3";
version = "1.4.4";
format = "pyproject";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "python-llfuse";
repo = "python-llfuse";
rev = "refs/tags/release-${version}";
hash = "sha256-37l6HrAKrXtEhlWTIdlw3L6wCGeOA7IW/aaJn3wf4QY=";
hash = "sha256-qsnmhnZsK0j9dPhXT9mymQTzVHmmGnB5vgONatxDLIo=";
};
nativeBuildInputs = [ cython pkg-config setuptools ];

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

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "mailsuite";
version = "1.9.14";
version = "1.9.15";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-8vybabJPQyR0XMXaNp8lQFyuPajrhucgdfazt2ci8Gs=";
hash = "sha256-R4nAphydamZojQR7pro5Y3dZg3nYK0+X5lFBMJUpCfw=";
};
nativeBuildInputs = [

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "nbsphinx";
version = "0.8.12";
version = "0.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-dlcEFs3svrIdv1w9aqIEztbB3X6+9Ad7XCG4xuzpUz8=";
hash = "sha256-Wbv7e8Z2pmR4Bfs8qDSQM4rn+WwWdKnl5wfwVcJyxZ0=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/ocrmypdf/default.nix
View File

@ -4,6 +4,7 @@
, deprecation
, fetchFromGitHub
, ghostscript
, hypothesis
, img2pdf
, importlib-resources
, jbig2enc
@ -29,7 +30,7 @@
buildPythonPackage rec {
pname = "ocrmypdf";
version = "14.1.0";
version = "14.2.0";
disabled = pythonOlder "3.8";
@ -45,7 +46,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-Jyx9FPXNjcA04s+l2wY/LVX83RqExt78/EAHsL1VNMU=";
hash = "sha256-vbNYCnC71l+8omttCGK7+4i3WBiAyb9C5pfApm+SsC0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -85,6 +86,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
hypothesis
pytest-xdist
pytestCheckHook
];

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "phonopy";
version = "2.17.1";
version = "2.19.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-t+1i1S8UVd0s9/Fda0H2kaouDDBVS+x6G40Meb2rLYc=";
hash = "sha256-ObQuPCDjpjjz4mq831IsU0muNMlDZVoNFAX6PUCTVbU=";
};
propagatedBuildInputs = [

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pycotap";
version = "1.2.2";
version = "1.3.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-+Tjs1JMczRnZWY+2M9Xqu3k48IuEcXMV5SUmqmJ3yew=";
hash = "sha256-Z0NV8BMAvgPff4cXhOSYZSwtiawZzXfujmFlJjSi+Do=";
};
meta = with lib; {

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

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pyinfra";
version = "2.6.2";
version = "2.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Fizzadar";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-8eYbsPBMcRhFk5eouSAHEr3q/Llj0RqR76iwn/TrSSg=";
hash = "sha256-drfxNpdhqSxCeB0SbwyKOd3DDA7bFkmDmFQJS3JwOlA=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pylink-square";
version = "1.0.0";
version = "1.1.0";
format = "setuptools";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "square";
repo = "pylink";
rev = "refs/tags/v${version}";
hash = "sha256-05mg2raHiKg0gHxF/7zFd81C/8OrhStThMwEnpaFGSc=";
hash = "sha256-pICSU33n/oH+LRbWNYOdnTaa5qAGRRXWsO1NjO4ylzw=";
};
propagatedBuildInputs = [ psutil six future ];

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

@ -8,13 +8,13 @@
}:
buildPythonPackage rec {
version = "0.3.0";
version = "0.4.0";
pname = "pyvcd";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "ec4d9198bd20f9e07d78f6558ff8bcd45b172ee332e7e8a4588727eeb6a362bc";
sha256 = "sha256-Mb4/UBRBqbjF3HJmD/e5z++bQ7ISGiPZb1htKGMnApA=";
};
buildInputs = [ setuptools-scm ];

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

@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "pywbem";
version = "1.6.0";
version = "1.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-4mqwMkR17lMp10lx+UK0sxW2rA7a8njnDha1YDJ475g=";
hash = "sha256-q9vWzgi2xZfN1sdzDmtJqELZE/L2s8xitYXFjsPueUU=";
};
propagatedBuildInputs = [

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

@ -1,11 +1,11 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python,
{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python,
cudaSupport ? false, cudaPackages, magma,
useSystemNccl ? true,
MPISupport ? false, mpi,
buildDocs ? false,
# Native build inputs
cmake, util-linux, linkFarm, symlinkJoin, which, pybind11, removeReferencesTo,
cmake, linkFarm, symlinkJoin, which, pybind11, removeReferencesTo,
pythonRelaxDepsHook,
# Build inputs
@ -39,7 +39,7 @@
# dependencies for torch.utils.tensorboard
pillow, six, future, tensorboard, protobuf,
isPy3k, pythonOlder,
pythonOlder,
# ROCm dependencies
rocmSupport ? false,
@ -277,7 +277,6 @@ in buildPythonPackage rec {
nativeBuildInputs = [
cmake
util-linux
which
ninja
pybind11

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

@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "trytond";
version = "6.6.7";
version = "6.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-pnFsIv7Rl6NHUV0ETqaN7UYQuRlV3G68F5p4gzHzihQ=";
hash = "sha256-+G3ELH0KnBGA1YJk67ID7VedmCN0vrhGBN+WA8aEcNg=";
};
propagatedBuildInputs = [

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

@ -3,13 +3,13 @@
nixosTests }:
buildGoModule rec {
pname = "buildkite-agent";
version = "3.46.0";
version = "3.46.1";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
sha256 = "sha256-4SCQcirphI/vmWa/5OrVh9k8utMmX4pUOYhIE1t1NRU=";
sha256 = "sha256-IhTzN0L5wKXmo2GkuSy6mQyqyUjh97Dugd6SQ0c2ng8=";
};
vendorHash = "sha256-54v3P4uqU7A77yizjWAIzlvpjUaG8HHmH3j9p8d+LQc=";

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "coursier";
version = "2.1.2";
version = "2.1.4";
src = fetchurl {
url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
sha256 = "WuZnwVFycHTzU/3x07Yd5dcirwdHM7qAVR7Jq0Zqn/4=";
sha256 = "i/z/IuSxvLDBJ9QZGuIo3b3IZFy/J55mEbZftWyFnz8=";
};
nativeBuildInputs = [ makeWrapper ];

7
pkgs/development/tools/halfempty/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, glib, util-linux, scowl }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, glib, hexdump, scowl }:
stdenv.mkDerivation rec {
pname = "halfempty";
@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY=";
};
nativeBuildInputs = [ pkg-config util-linux ];
nativeBuildInputs = [ pkg-config hexdump ];
buildInputs = [ glib ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
enableParallelBuilding = true;
patches = [
@ -41,5 +43,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/googleprojectzero/halfempty/";
maintainers = with lib.maintainers; [ fpletz ];
license = with lib.licenses; [ asl20 ];
platforms = lib.platforms.unix;
};
}

6
pkgs/development/tools/kind/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kind";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
sha256 = "sha256-ei0klTKLTyxhCkwhG/CSswFd1JPimCMR32pKwPYPvQU=";
sha256 = "sha256-JMOfnpoDFP7UWT5FvrZeEkFUYxvGYFpnbkIiJoSfAFk=";
};
patches = [
@ -16,7 +16,7 @@ buildGoModule rec {
./kernel-module-path.patch
];
vendorSha256 = "sha256-J/sJd2LLMBr53Z3sGrWgnWA8Ry+XqqfCEObqFyUD96g=";
vendorHash = "sha256-J/sJd2LLMBr53Z3sGrWgnWA8Ry+XqqfCEObqFyUD96g=";
CGO_ENABLED = 0;
GOFLAGS = [ "-trimpath" ];

32
pkgs/development/tools/misc/funzzy/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "funzzy";
version = "0.6.0";
src = fetchFromGitHub {
owner = "cristianoliveira";
repo = "funzzy";
rev = "v${version}";
hash = "sha256-vrfhxGlNCsUifEYnQS+3CkU8Eh1QCb9gFQeXwqSXvVk=";
};
cargoHash = "sha256-AOI1wSWD9JfIawMK0WPnApkWLODWkj5zFLRZrru1CnA=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
meta = with lib; {
description = "A lightweight watcher";
homepage = "https://github.com/cristianoliveira/funzzy";
changelog = "https://github.com/cristianoliveira/funzzy/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

40
pkgs/development/tools/misc/jsonfmt/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, buildGoModule
, fetchFromGitHub
, testers
, jsonfmt
}:
buildGoModule rec {
pname = "jsonfmt";
version = "0.5.0";
src = fetchFromGitHub {
owner = "caarlos0";
repo = "jsonfmt";
rev = "v${version}";
hash = "sha256-rVv7Dv4vQmss4eiiy+KaO9tZ5U58WlRlsOz4QO0gdfM=";
};
vendorHash = "sha256-xtwN+TemiiyXOxZ2DNys4G6w4KA3BjLSWAmzox+boMY=";
ldflags = [
"-s"
"-w"
"-X=main.version=${version}"
];
passthru.tests = {
version = testers.testVersion {
package = jsonfmt;
};
};
meta = with lib; {
description = "Formatter for JSON files";
homepage = "https://github.com/caarlos0/jsonfmt";
changelog = "https://github.com/caarlos0/jsonfmt/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

32
pkgs/development/tools/misc/kool/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "kool";
version = "2.1.0";
src = fetchFromGitHub {
owner = "kool-dev";
repo = "kool";
rev = version;
hash = "sha256-dMmokaFPzunpCdkJFVc3422SEKZNIOi8nzRB99Gi5Tg=";
};
vendorHash = "sha256-8t+OZB9jrlOVHLURPmtz0ent6COEOVMFfObe2LH1jRM=";
ldflags = [
"-s"
"-w"
"-X=kool-dev/kool/commands.version=${version}"
];
meta = with lib; {
description = "From local development to the cloud: development workflow made easy";
homepage = "https://kool.dev";
changelog = "https://github.com/kool-dev/kool/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

45
pkgs/development/tools/misc/scip/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib
, buildGoModule
, fetchFromGitHub
, testers
, scip
}:
buildGoModule rec {
pname = "scip";
version = "0.2.3";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "scip";
rev = "v${version}";
hash = "sha256-0ErEA44vRRntWxajUKiQXqaKvQtqCPPXnI/sBktQyIo=";
};
vendorHash = "sha256-T0NYucDVBnTxROVYXlccOvHX74Cs6czXL/fy14I8MZc=";
ldflags = [
"-s"
"-w"
"-X=main.Reproducible=true"
];
postInstall = ''
mv $out/bin/{cmd,scip}
'';
passthru.tests = {
version = testers.testVersion {
package = scip;
version = "v${version}";
};
};
meta = with lib; {
description = "SCIP Code Intelligence Protocol CLI";
homepage = "https://github.com/sourcegraph/scip";
changelog = "https://github.com/sourcegraph/scip/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
};
}

1012
pkgs/development/tools/misc/topiary/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

37
pkgs/development/tools/misc/topiary/default.nix
View File

@ -1,35 +1,56 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
}:
rustPlatform.buildRustPackage rec {
pname = "topiary";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "tweag";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Gm6AzzVLUXZi2jzJ1b/c4yjIvRRA2e5mC2CMVyly2X8=";
hash = "sha256-OJdR+8eGbcDjirupjcczztYbGKGKaRywZnqqjv0EOSU=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tree-sitter-bash-0.19.0" = "sha256-5gBH0tBnNevAdBwlsLQAI9JOyz2lDY7Gb54HVCD4+Zs=";
"tree-sitter-nickel-0.0.1" = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE=";
"tree-sitter-bash-0.19.0" = "sha256-Po2r+wUWJwC+ODk/xotYI7PsmjC3TFSu1dU0FrrnAXQ=";
"tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs=";
"tree-sitter-nickel-0.0.1" = "sha256-NLgbTl1Te/lHTGra4DdxLtqIg6yXf5lfyl37qpp8SNQ=";
"tree-sitter-ocaml-0.20.1" = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y=";
"tree-sitter-query-0.0.1" = "sha256-dWWof8rYFTto3A4BfbKTKcNieRbwFdF6xDXW9tQvAqQ=";
"tree-sitter-query-0.1.0" = "sha256-Gv882sbL2fmR++h4/I7dFCp+g6pddRCaLyX7+loEoHU=";
"web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M=";
};
};
patches = [
# the versions in `Cargo.toml`s are outdated
(fetchpatch {
name = "bump-version-to-0.2.0.patch";
url = "https://github.com/tweag/topiary/commit/612fdb64f50ab15889a0b508bf727f159f26a112.patch";
hash = "sha256-MHaAnYyjXdKbh/pE3bL2iAPX6bMQkK+LUGYCL5mBM44=";
})
];
cargoBuildFlags = [ "-p" "topiary-cli" ];
cargoTestFlags = cargoBuildFlags;
env = {
TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages";
};
postInstall = ''
install -Dm444 languages/* -t $out/share/languages
'';
TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages";
meta = with lib; {
description = "A uniform formatter for simple languages, as part of the Tree-sitter ecosystem";
homepage = "https://github.com/tweag/topiary";
changelog = "https://github.com/tweag/topiary/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};

49
pkgs/development/tools/rcodesign/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "rcodesign";
version = "0.22.0";
src = fetchFromGitHub {
owner = "indygreg";
repo = "apple-platform-rs";
rev = "apple-codesign/${version}";
hash = "sha256-ndbDBGtTOfHHUquKrETe4a+hB5Za9samlnXwVGVvWy4=";
};
cargoHash = "sha256-cpQBdxTw/ge4VtzjdL2a2xgSeCT22fMIjuKu5UEedhI=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Security
];
cargoBuildFlags = [
# Only build the binary we want
"--bin"
"rcodesign"
];
checkFlags = [
# Does network IO
"--skip=ticket_lookup::test::lookup_ticket"
];
meta = with lib; {
description = "A cross-platform CLI interface to interact with Apple code signing.";
longDescription = ''
rcodesign provides various commands to interact with Apple signing,
including signing and notarizing binaries, generating signing
certificates, and verifying existing signed binaries.
For more information, refer to the [documentation](https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_rcodesign.html).
'';
homepage = "https://github.com/indygreg/apple-platform-rs";
license = licenses.mpl20;
maintainers = with maintainers; [ euank ];
};
}

41
pkgs/development/tools/rust/cargo-benchcmp/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, rustPlatform
, fetchFromGitHub
, substituteAll
, rust
, stdenv
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-benchcmp";
version = "0.4.4";
src = fetchFromGitHub {
owner = "BurntSushi";
repo = "cargo-benchcmp";
rev = version;
hash = "sha256-pg3/VUC1DQ7GbSQDfVZ0WNisXvzXy0O0pr2ik2ar2h0=";
};
cargoHash = "sha256-vxy9Ym3Twx034I1E5fWNnbP1ttfLolMbO1IgRiPfhRw=";
patches = [
# patch the binary path so tests can find the binary when `--target` is present
(substituteAll {
src = ./fix-test-binary-path.patch;
shortTarget = rust.toRustTarget stdenv.hostPlatform;
})
];
checkFlags = [
# thread 'different_input_colored' panicked at 'assertion failed: `(left == right)`
"--skip=different_input_colored"
];
meta = with lib; {
description = "A small utility to compare Rust micro-benchmarks";
homepage = "https://github.com/BurntSushi/cargo-benchcmp";
license = with licenses; [ mit unlicense ];
maintainers = with maintainers; [ figsoda ];
};
}

30
pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch Normal file
View File

@ -0,0 +1,30 @@
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -16,20 +16,13 @@ impl CommandUnderTest {
fn new() -> CommandUnderTest {
// To find the directory where the built binary is, we walk up the directory tree of the test binary until the
// parent is "target/".
- let mut binary_path = env::current_exe().expect("need current binary path to find binary to test");
- loop {
- {
- let parent = binary_path.parent();
- if parent.is_none() {
- panic!("Failed to locate binary path from original path: {:?}", env::current_exe());
- }
- let parent = parent.unwrap();
- if parent.is_dir() && parent.file_name().unwrap() == "target" {
- break;
- }
- }
- binary_path.pop();
- }
+ let mut binary_path = PathBuf::from(
+ env::current_dir()
+ .unwrap()
+ .join("target")
+ .join("@shortTarget@")
+ .join(env!("cargoBuildType")),
+ );
binary_path.push(
if cfg!(target_os = "windows") {

25
pkgs/development/tools/rust/critcmp/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "critcmp";
version = "0.1.7";
src = fetchFromGitHub {
owner = "BurntSushi";
repo = "critcmp";
rev = version;
hash = "sha256-B9unlodAhdmRogHX7tqky320xpaUG2p8nRZS7uGOXGY=";
};
cargoHash = "sha256-Y1vfUOwCWAjMnNlm40XM9sQvooVtnGETTpIIsN/HTOU=";
meta = with lib; {
description = "A command line tool for comparing benchmarks run by Criterion";
homepage = "https://github.com/BurntSushi/critcmp";
license = with licenses; [ mit unlicense ];
maintainers = with maintainers; [ figsoda ];
};
}

6
pkgs/development/tools/typos/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.14.10";
version = "1.14.11";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-RPdDPVOV2V+WK2crZ9e84BjNOYGJCgLhYDTj17QX+IM=";
hash = "sha256-4E28pBZ+uWDaEXty4ZgbbEcO3lpluOXopgPr/6Xl/z4=";
};
cargoHash = "sha256-LAZcyGU/qrBhmF+Nx+ypmSzCieW49ZQCqmG+0h6yB3g=";
cargoHash = "sha256-BegIKd+1K1Dh1ULIiRcpkq/5JdlofRURmRTtyD0tWMg=";
meta = with lib; {
description = "Source code spell checker";

58
pkgs/games/prismlauncher/default.nix
View File

@ -3,29 +3,17 @@
, fetchFromGitHub
, cmake
, ninja
, jdk8
, jdk17
, zlib
, file
, wrapQtAppsHook
, xorg
, libpulseaudio
, qtbase
, qtsvg
, qtwayland
, libGL
, quazip
, glfw
, openal
, extra-cmake-modules
, tomlplusplus
, ghc_filesystem
, msaClientID ? ""
, jdks ? [ jdk17 jdk8 ]
, gamemodeSupport ? true
, gamemode
, msaClientID ? null
, gamemodeSupport ? true
}:
let
libnbtplusplus = fetchFromGitHub {
owner = "PrismLauncher";
@ -34,9 +22,8 @@ let
sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=";
};
in
stdenv.mkDerivation rec {
pname = "prismlauncher";
pname = "prismlauncher-unwrapped";
version = "6.3";
src = fetchFromGitHub {
@ -46,51 +33,26 @@ stdenv.mkDerivation rec {
sha256 = "sha256-7tptHKWkbdxTn6VIPxXE1K3opKRiUW2zv9r6J05dcS8=";
};
nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 ninja wrapQtAppsHook ];
nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ];
buildInputs = [
qtbase
qtsvg
zlib
quazip
ghc_filesystem
tomlplusplus
]
++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland
++ lib.optional gamemodeSupport gamemode.dev;
] ++ lib.optional gamemodeSupport gamemode;
cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]
hardeningEnable = [ "pie" ];
cmakeFlags = lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]
++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ];
postUnpack = ''
rm -rf source/libraries/libnbtplusplus
mkdir source/libraries/libnbtplusplus
ln -s ${libnbtplusplus}/* source/libraries/libnbtplusplus
chmod -R +r+w source/libraries/libnbtplusplus
chown -R $USER: source/libraries/libnbtplusplus
ln -s ${libnbtplusplus} source/libraries/libnbtplusplus
'';
qtWrapperArgs =
let
libpath = with xorg;
lib.makeLibraryPath ([
libX11
libXext
libXcursor
libXrandr
libXxf86vm
libpulseaudio
libGL
glfw
openal
stdenv.cc.cc.lib
] ++ lib.optional gamemodeSupport gamemode.lib);
in
[
"--set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath}"
"--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
"--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}"
];
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://prismlauncher.org/";

Some files were not shown because too many files have changed in this diff Show More