ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 21:18:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-09-17 00:02:29 +00:00 committed by GitHub
commit dd947ab807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 302 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -16401,12 +16401,6 @@
fingerprint = "5D8B FA8B 286A C2EF 6EE4 8598 F742 B72C 8926 1A51";
}];
};
stepech = {
name = "stepech";
github = "stepech";
githubId = 29132060;
matrix = "@stepech:matrix.org";
};
stephank = {
email = "nix@stephank.nl";
matrix = "@skochen:matrix.org";

2
pkgs/applications/editors/nano/default.nix
View File

@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
(lib.enableFeature enableTiny "tiny")
];
postInstall = ''
postInstall = if enableTiny then null else ''
cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/
'';

13
pkgs/applications/misc/font-manager/default.nix
View File

@ -18,9 +18,8 @@
, desktop-file-utils
, wrapGAppsHook
, gobject-introspection
, libsoup
, glib-networking
, webkitgtk
# withWebkit enables the "webkit" feature, also known as Google Fonts
, withWebkit ? true, glib-networking, libsoup, webkitgtk
}:
stdenv.mkDerivation rec {
@ -29,9 +28,9 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "FontManager";
repo = "master";
repo = "font-manager";
rev = version;
sha256 = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo=";
hash = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo=";
};
nativeBuildInputs = [
@ -56,13 +55,15 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas # for font settings
gtk3
gnome.adwaita-icon-theme
libsoup
] ++ lib.optionals withWebkit [
glib-networking # for SSL so that Google Fonts can load
libsoup
webkitgtk
];
mesonFlags = [
"-Dreproducible=true" # Do not hardcode build directory…
(lib.mesonBool "webkit" withWebkit)
];
postPatch = ''

39
pkgs/applications/misc/pot/Cargo.lock generated
View File

@ -628,22 +628,6 @@ dependencies = [
"objc",
]
[[package]]
name = "cocoa"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
dependencies = [
"bitflags 1.3.2",
"block",
"cocoa-foundation",
"core-foundation",
"core-graphics 0.23.1",
"foreign-types 0.5.0",
"libc",
"objc",
]
[[package]]
name = "cocoa-foundation"
version = "0.1.1"
@ -3760,7 +3744,6 @@ dependencies = [
"tiny_http",
"walkdir",
"window-shadows",
"window-vibrancy",
"windows 0.44.0",
"zip",
]
@ -5080,7 +5063,7 @@ dependencies = [
"bitflags 1.3.2",
"cairo-rs",
"cc",
"cocoa 0.24.1",
"cocoa",
"core-foundation",
"core-graphics 0.22.3",
"crossbeam-channel",
@ -5157,7 +5140,7 @@ dependencies = [
"anyhow",
"base64 0.21.3",
"bytes",
"cocoa 0.24.1",
"cocoa",
"dirs-next",
"embed_plist",
"encoding_rs",
@ -5375,7 +5358,7 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b"
dependencies = [
"cocoa 0.24.1",
"cocoa",
"gtk",
"percent-encoding",
"rand 0.8.5",
@ -6280,24 +6263,12 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29d30320647cfc3dc45554c8ad825b84831def81f967a2f7589931328ff9b16d"
dependencies = [
"cocoa 0.24.1",
"cocoa",
"objc",
"raw-window-handle",
"windows-sys 0.42.0",
]
[[package]]
name = "window-vibrancy"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c0a73f45692662acb5dfe1ac22f33fbd5b3db2f1ef413985b480e655b61f5ee"
dependencies = [
"cocoa 0.25.0",
"objc",
"raw-window-handle",
"windows-sys 0.48.0",
]
[[package]]
name = "windows"
version = "0.37.0"
@ -6665,7 +6636,7 @@ checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea"
dependencies = [
"base64 0.13.1",
"block",
"cocoa 0.24.1",
"cocoa",
"core-graphics 0.22.3",
"crossbeam-channel",
"dunce",

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

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "pot";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "pot-app";
repo = "pot-desktop";
rev = version;
hash = "sha256-PvbqPGT8BTHEufYp+TUSd0tTSBnTBDIYHxaeI7FEVDE=";
hash = "sha256-KVrm7KEpIIahd/QU1HUJ2VkfECttcY5pRCHsYHS5svM=";
};
sourceRoot = "${src.name}/src-tauri";

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

@ -69,7 +69,7 @@ let
in
stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.6.0";
version = "2.6.1";
nativeBuildInputs = [
cmake
@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
hash = "sha256-6AZdwNcgddHePyB0bNS7xGmpz38uzhAwUxgo48OQLuU=";
hash = "sha256-t5lnBL7SZVfyR680ZK29YXgE3pag+uVv4+BGJZq40/A=";
rev = "version_${version}";
};

16
pkgs/applications/misc/terminal-typeracer/default.nix
View File

@ -1,7 +1,9 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitLab
, rustPlatform
, pkg-config
, libgit2
, openssl
, sqlite
, libiconv
@ -10,20 +12,24 @@
rustPlatform.buildRustPackage rec {
pname = "terminal-typeracer";
version = "2.0.8";
version = "2.1.3";
src = fetchFromGitLab {
owner = "ttyperacer";
repo = pname;
rev = "v${version}";
sha256 = "Fb2MCQaQaJseXa8Csesz1s5Yel4wcSMxfMeKSW7rlU4=";
hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU=";
};
cargoSha256 = "sha256-SAVDSUm2jpDwTfwo4L6MVUKzBxZvCfjn4UNIGUJziSY=";
cargoHash = "sha256-OwbFIbKB/arj+3gq2tfEq8yTKSUPBQNYJNzrWvDv4A4=";
buildInputs = [ openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgit2 openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
OPENSSL_NO_VENDOR = 1;
LIBGIT2_NO_VENDOR = 1;
meta = with lib; {
description = "An open source terminal based version of Typeracer written in rust";
homepage = "https://gitlab.com/ttyperacer/terminal-typeracer";

6
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View File

@ -33,16 +33,16 @@ let
in
buildNpmPackage rec {
pname = "deltachat-desktop";
version = "1.40.3";
version = "1.40.4";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-UVsjka/ptUiSN9aqRESdFZA3uh+FJnJot/YXWUPCJtc=";
hash = "sha256-cNCM0McWBmHUUutMDa/Cy0qOxhx4NJnhjrW++HRl/nU=";
};
npmDepsHash = "sha256-r0IUQNZJEpY8VE0G/WLdygup32iQ6DxfGkvOgFi7R4k=";
npmDepsHash = "sha256-CoWa0l2If+SGqD47nP91qsvUlTzOEWP5or5zNUdV7P0=";
nativeBuildInputs = [
makeWrapper

4
pkgs/applications/networking/newsreaders/liferea/default.nix
View File

@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "liferea";
version = "1.15.2";
version = "1.15.3";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "TpuET1VLOXwZHdpYg6vXT1MDGpV0IKbSIduf3bkNbeI=";
hash = "sha256-FKjsosSSW0U8fQwV6QYhsbuuaTeCt6SfHEcY0v5xUO4=";
};
nativeBuildInputs = [

4
pkgs/applications/networking/nextcloud-client/default.nix
View File

@ -25,7 +25,7 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.9.4";
version = "3.10.0";
outputs = [ "out" "dev" ];
@ -33,7 +33,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-h8lOstl085haesmCmzq2o0OlQrO5U/mfGngQunynIuQ=";
sha256 = "sha256-BNqMKL888DKuRiM537V7CBuCabg5YmGYGpWARtvs7go=";
};
patches = [

4
pkgs/applications/video/mpv/scripts/mpvacious.nix
View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mpvacious";
version = "0.23";
version = "0.24";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "mpvacious";
rev = "v${version}";
sha256 = "sha256-b0JUT5Y0u/H9p5whuFTU8EgQnKzFCUR2HA9NO+mxe04=";
sha256 = "sha256-o0YcoSI+4934HlyIoI5V1h/FalCe+6tXS8Lg6kXWjSg=";
};
postPatch = ''

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

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "subtitleedit";
version = "4.0.0";
version = "4.0.1";
src = fetchzip {
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip";
sha256 = "sha256-b98+D2XkPly2J+SliKJ7YGJoSiK+1qGGOqZXzIV6nn4=";
hash = "sha256-Z7NVn4F19Hx55YWPNmbpWZ8yQulXd50bcy2A/8pCqJ4=";
stripRoot = false;
};

10
pkgs/build-support/build-fhsenv-bubblewrap/default.nix
View File

@ -17,12 +17,12 @@
, meta ? {}
, passthru ? {}
, extraBwrapArgs ? []
, unshareUser ? true
, unshareIpc ? true
, unsharePid ? true
, unshareUser ? false
, unshareIpc ? false
, unsharePid ? false
, unshareNet ? false
, unshareUts ? true
, unshareCgroup ? true
, unshareUts ? false
, unshareCgroup ? false
, dieWithParent ? true
, ...
} @ args:

0
pkgs/development/dotnet-modules/boogie-deps.nix → pkgs/by-name/bo/boogie/deps.nix generated
View File

61
pkgs/by-name/bo/boogie/install-check-file.bpl Normal file
View File

@ -0,0 +1,61 @@
// RUN: %parallel-boogie "%s" > "%t"
// RUN: %diff "%s.expect" "%t"
type X;
function {:builtin "MapAdd"} mapadd([X]int, [X]int) : [X]int;
function {:builtin "MapSub"} mapsub([X]int, [X]int) : [X]int;
function {:builtin "MapMul"} mapmul([X]int, [X]int) : [X]int;
function {:builtin "MapDiv"} mapdiv([X]int, [X]int) : [X]int;
function {:builtin "MapMod"} mapmod([X]int, [X]int) : [X]int;
function {:builtin "MapConst"} mapconstint(int) : [X]int;
function {:builtin "MapConst"} mapconstbool(bool) : [X]bool;
function {:builtin "MapAnd"} mapand([X]bool, [X]bool) : [X]bool;
function {:builtin "MapOr"} mapor([X]bool, [X]bool) : [X]bool;
function {:builtin "MapNot"} mapnot([X]bool) : [X]bool;
function {:builtin "MapIte"} mapiteint([X]bool, [X]int, [X]int) : [X]int;
function {:builtin "MapIte"} mapitebool([X]bool, [X]bool, [X]bool) : [X]bool;
function {:builtin "MapLe"} maple([X]int, [X]int) : [X]bool;
function {:builtin "MapLt"} maplt([X]int, [X]int) : [X]bool;
function {:builtin "MapGe"} mapge([X]int, [X]int) : [X]bool;
function {:builtin "MapGt"} mapgt([X]int, [X]int) : [X]bool;
function {:builtin "MapEq"} mapeq([X]int, [X]int) : [X]bool;
function {:builtin "MapIff"} mapiff([X]bool, [X]bool) : [X]bool;
function {:builtin "MapImp"} mapimp([X]bool, [X]bool) : [X]bool;
const FF: [X]bool;
axiom FF == mapconstbool(false);
const TT: [X]bool;
axiom TT == mapconstbool(true);
const MultisetEmpty: [X]int;
axiom MultisetEmpty == mapconstint(0);
function {:inline} MultisetSingleton(x: X) : [X]int
{
MultisetEmpty[x := 1]
}
function {:inline} MultisetPlus(a: [X]int, b: [X]int) : [X]int
{
mapadd(a, b)
}
function {:inline} MultisetMinus(a: [X]int, b: [X]int) : [X]int
{
mapiteint(mapgt(a, b), mapsub(a, b), mapconstint(0))
}
procedure foo() {
var x: X;
assert FF != TT;
assert mapnot(FF) == TT;
assert MultisetSingleton(x) != MultisetEmpty;
assert MultisetPlus(MultisetEmpty, MultisetSingleton(x)) == MultisetSingleton(x);
assert MultisetMinus(MultisetPlus(MultisetEmpty, MultisetSingleton(x)), MultisetSingleton(x)) == MultisetEmpty;
assert MultisetMinus(MultisetEmpty, MultisetSingleton(x)) == MultisetEmpty;
}

57
pkgs/by-name/bo/boogie/package.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib, buildDotnetModule, fetchFromGitHub, z3 }:
buildDotnetModule rec {
pname = "Boogie";
version = "3.0.4";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie";
rev = "v${version}";
sha256 = "sha256-yebThnIOpZ5crYsSZtbDj8Gn6DznTNJ4T/TsFR3gWvs=";
};
projectFile = [ "Source/Boogie.sln" ];
nugetDeps = ./deps.nix;
executables = [ "BoogieDriver" ];
makeWrapperArgs = [
"--prefix PATH : ${z3}/bin"
];
postInstall = ''
# so that this derivation can be used as a vim plugin to install syntax highlighting
vimdir=$out/share/vim-plugins/boogie
install -Dt $vimdir/syntax/ Util/vim/syntax/boogie.vim
mkdir $vimdir/ftdetect
echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim
mkdir -p $out/share/nvim
ln -s $out/share/vim-plugins/boogie $out/share/nvim/site
'';
postFixup = ''
ln -s "$out/bin/BoogieDriver" "$out/bin/boogie"
rm -f $out/bin/{Microsoft,NUnit3,System}.* "$out/bin"/*Tests
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/boogie ${./install-check-file.bpl}
'';
meta = with lib; {
description = "An intermediate verification language";
homepage = "https://github.com/boogie-org/boogie";
longDescription = ''
Boogie is an intermediate verification language (IVL), intended as a
layer on which to build program verifiers for other languages.
This derivation may be used as a vim plugin to provide syntax highlighting.
'';
license = licenses.mspl;
maintainers = [ maintainers.taktoa ];
platforms = with platforms; (linux ++ darwin);
};
}

4
pkgs/development/compilers/fleng/default.nix → pkgs/by-name/fl/fleng/package.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fleng";
version = "14";
version = "17";
src = fetchurl {
url = "http://www.call-with-current-continuation.org/fleng/fleng-${finalAttrs.version}.tgz";
hash = "sha256-Js9bllX/399t9oeiRrqJNUFyYJwJVb/xSzwrcMrdi08=";
hash = "sha256-mZ0JDt1wDWUUvK5FNvGRkz1BEunmZAzHAuhURA1P89Q=";
};
doCheck = true;

56
pkgs/by-name/na/nawk/package.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, stdenv
, fetchFromGitHub
, bison
, buildPackages
, installShellFiles
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nawk";
version = "20230909";
src = fetchFromGitHub {
owner = "onetrueawk";
repo = "awk";
rev = finalAttrs.version;
hash = "sha256-sBJ+ToFkhU5Ei84nqzbS0bUbsa+60iLSz2oeV5+PXEk=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
bison
installShellFiles
];
outputs = [ "out" "man" ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"HOSTCC=${if stdenv.buildPlatform.isDarwin then "clang" else "cc"}"
];
installPhase = ''
runHook preInstall
install -Dm755 a.out "$out/bin/nawk"
mv awk.1 nawk.1
installManPage nawk.1
runHook postInstall
'';
meta = {
homepage = "https://github.com/onetrueawk/awk";
description = "The one, true implementation of AWK";
longDescription = ''
This is the version of awk described in "The AWK Programming Language", by
Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN
0-201-07981-X).
'';
changelog = "https://github.com/onetrueawk/awk/blob/${finalAttrs.src.rev}/ChangeLog";
license = lib.licenses.mit;
mainProgram = "nawk";
maintainers = with lib.maintainers; [ AndersonTorres konimex ];
platforms = lib.platforms.all;
};
})

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

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "lesscpy";
version = "0.13.0";
version = "0.15.1";
src = fetchPypi {
inherit pname version;
sha256 = "1bbjag13kawnjdn7q4flfrkd0a21rgn9ycfqsgfdmg658jsx1ipk";
sha256 = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw=";
};
checkInputs = with python3Packages; [ pytestCheckHook ];

4
pkgs/development/python-modules/dvc-studio-client/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dvc-studio-client";
version = "0.13.0";
version = "0.15.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-m4UJRRwY+aJdPIMHPIWe3En7FCADeT1qCZnu3BJeYXc=";
hash = "sha256-azv9B5TiDlKzPD1+8tUOyMo8LDVgcSwiikwLrM/9ZEg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -15,7 +15,7 @@
let
pname = "findpython";
version = "0.3.1";
version = "0.4.0";
in
buildPythonPackage {
inherit pname version;
@ -25,7 +25,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-diH4qcGZpw0hmDHN2uuEyn6D4guDWBcr/0eHGhil7aQ=";
hash = "sha256-GLFNEVZ42hiuku4i1wAcwwkV6lMQU/dwEO4Fo5aA9Dg=";
};
nativeBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "geopandas";
version = "0.13.2";
version = "0.14.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "geopandas";
repo = "geopandas";
rev = "refs/tags/v${version}";
hash = "sha256-8H0IO+Oabl1ZOHHvMFHnPEyW0xH/G4wuUtkZrsP6K3k=";
hash = "sha256-lhQXYSY2JrY3+GgMnfTJugnOD/g3VjG0tgw+cEgpIP8=";
};
propagatedBuildInputs = [

42
pkgs/development/python-modules/msprime/default.nix
View File

@ -10,7 +10,7 @@
, newick
, tskit
, demes
, pytest
, pytestCheckHook
, pytest-xdist
, scipy
}:
@ -45,33 +45,29 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
pytest
pytestCheckHook
pytest-xdist
scipy
];
disabledTests = [
"tests/test_ancestry.py::TestSimulator::test_debug_logging"
"tests/test_ancestry.py::TestSimulator::test_debug_logging_dtw"
];
disabledTestPaths = [
"tests/test_demography.py"
"tests/test_algorithms.py"
"tests/test_provenance.py"
"tests/test_dict_encoding.py"
];
checkPhase = ''
runHook preCheck
# avoid adding the current directory to sys.path
# https://docs.pytest.org/en/7.1.x/explanation/pythonpath.html#invoking-pytest-versus-python-m-pytest
# need pythonPackages.stdpopsim
# need pythonPackages.bintrees
# need pythonPachages.python_jsonschema_objects
# ModuleNotFoundError: No module named 'lwt_interface.dict_encoding_testlib'
# fails for python311
# fails for python311
pytest -v --import-mode append \
--ignore=tests/test_demography.py \
--ignore=tests/test_algorithms.py \
--ignore=tests/test_provenance.py \
--ignore=tests/test_dict_encoding.py \
--deselect=tests/test_ancestry.py::TestSimulator::test_debug_logging \
--deselect=tests/test_ancestry.py::TestSimulator::test_debug_logging_dtwf
runHook postCheck
# `python -m pytest` puts $PWD in sys.path, which causes the extension
# modules imported as `msprime._msprime` to be unavailable, failing the
# tests. This deletes the `msprime` folder such that only what's installed in
# $out is used for the imports. See also discussion at:
# https://github.com/NixOS/nixpkgs/issues/255262
preCheck = ''
rm -r msprime
'';
pythonImportsCheck = [
"msprime"
];

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

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pyathena";
version = "3.0.6";
version = "3.0.7";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-7m6hdRNIlCCa8sa+GFm3vkNx93QfqnpY+fl5Bf9qc6Q=";
hash = "sha256-Mdb+pEkXbwRVx3wxpPdwkCweNO48/GuYiOLATbPUpwQ=";
};
nativeBuildInputs = [

6
pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix
View File

@ -14,6 +14,10 @@ buildNpmPackage rec {
hash = "sha256-uwwwF1eMoSA2C5h56BBllTZW8zRHueNeVwhwtycrNfA=";
};
preBuild = ''
npm run prepublishOnly
'';
npmDepsHash = "sha256-lI+tkUBR0rmWcU57jU0y7XaMK3JADNU7fcbCxMmz/7s=";
meta = {
@ -22,6 +26,6 @@ buildNpmPackage rec {
homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs";
license = lib.licenses.mit;
mainProgram = "docker-langserver";
maintainers = with lib.maintainers; [ rvolosatovs ];
maintainers = with lib.maintainers; [ rvolosatovs net-mist ];
};
}

72
pkgs/development/tools/language-servers/millet/Cargo.lock generated
View File

@ -28,7 +28,7 @@ dependencies = [
[[package]]
name = "analysis"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"config",
"diagnostic",
@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chain-map"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"fast-hash",
"str-util",
@ -131,7 +131,7 @@ source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a7847
[[package]]
name = "cm-syntax"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"lex-util",
"paths",
@ -160,7 +160,7 @@ dependencies = [
[[package]]
name = "config"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"fast-hash",
"serde",
@ -188,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
[[package]]
name = "cov-mark"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"fast-hash",
"once_cell",
@ -427,7 +427,7 @@ dependencies = [
[[package]]
name = "input"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"cm-syntax",
"config",
@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
[[package]]
name = "lang-srv"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"analysis",
"anyhow",
@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lex-util"
version = "0.13.2"
version = "0.13.3"
[[package]]
name = "libc"
@ -575,7 +575,7 @@ dependencies = [
[[package]]
name = "millet-cli"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"analysis",
"codespan-reporting",
@ -593,7 +593,7 @@ dependencies = [
[[package]]
name = "millet-ls"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"anyhow",
"env_logger",
@ -613,7 +613,7 @@ dependencies = [
[[package]]
name = "mlb-hir"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"fast-hash",
"paths",
@ -624,7 +624,7 @@ dependencies = [
[[package]]
name = "mlb-statics"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"config",
"diagnostic",
@ -648,7 +648,7 @@ dependencies = [
[[package]]
name = "mlb-syntax"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"lex-util",
"paths",
@ -711,7 +711,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "panic-hook"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"better-panic",
]
@ -924,7 +924,7 @@ dependencies = [
[[package]]
name = "slash-var-path"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"fast-hash",
"str-util",
@ -932,14 +932,14 @@ dependencies = [
[[package]]
name = "sml-comment"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"sml-syntax",
]
[[package]]
name = "sml-dynamics"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"fast-hash",
"fmt-util",
@ -950,7 +950,7 @@ dependencies = [
[[package]]
name = "sml-dynamics-tests"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"config",
"pretty_assertions",
@ -966,7 +966,7 @@ dependencies = [
[[package]]
name = "sml-file-syntax"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"config",
"elapsed",
@ -980,7 +980,7 @@ dependencies = [
[[package]]
name = "sml-fixity"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"fast-hash",
"once_cell",
@ -989,7 +989,7 @@ dependencies = [
[[package]]
name = "sml-hir"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"la-arena",
"sml-lab",
@ -1000,7 +1000,7 @@ dependencies = [
[[package]]
name = "sml-hir-lower"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"config",
"cov-mark",
@ -1015,14 +1015,14 @@ dependencies = [
[[package]]
name = "sml-lab"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"str-util",
]
[[package]]
name = "sml-lex"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"cov-mark",
"diagnostic",
@ -1037,7 +1037,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7
[[package]]
name = "sml-naive-fmt"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"fast-hash",
"sml-comment",
@ -1046,11 +1046,11 @@ dependencies = [
[[package]]
name = "sml-namespace"
version = "0.13.2"
version = "0.13.3"
[[package]]
name = "sml-parse"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"diagnostic",
"event-parse",
@ -1062,14 +1062,14 @@ dependencies = [
[[package]]
name = "sml-path"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"str-util",
]
[[package]]
name = "sml-scon"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"num-bigint",
"num-traits",
@ -1078,7 +1078,7 @@ dependencies = [
[[package]]
name = "sml-statics"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"chain-map",
"config",
@ -1101,7 +1101,7 @@ dependencies = [
[[package]]
name = "sml-statics-types"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"chain-map",
"code-h2-md-map",
@ -1120,7 +1120,7 @@ dependencies = [
[[package]]
name = "sml-symbol-kind"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"sml-namespace",
"sml-statics-types",
@ -1128,7 +1128,7 @@ dependencies = [
[[package]]
name = "sml-syntax"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"code-h2-md-map",
"fast-hash",
@ -1139,7 +1139,7 @@ dependencies = [
[[package]]
name = "sml-ty-var-scope"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"fast-hash",
"sml-hir",
@ -1210,7 +1210,7 @@ dependencies = [
[[package]]
name = "tests"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"analysis",
"cm-syntax",
@ -1554,7 +1554,7 @@ dependencies = [
[[package]]
name = "xtask"
version = "0.13.2"
version = "0.13.3"
dependencies = [
"anyhow",
"flate2",

4
pkgs/development/tools/language-servers/millet/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
version = "0.13.2";
version = "0.13.3";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
hash = "sha256-GiuP5Cx4Qx2LH34v6VeGyWgjJgPR8/qLUOZIrh9ES1U=";
hash = "sha256-zbj1wFaPmxhPHIo+P3kbx0S0kksWDK+TgJ68ntzvcek=";
};
cargoLock = {

6
pkgs/tools/backup/tsm-client/default.nix
View File

@ -45,7 +45,7 @@
# point to this derivations `/dsmi_dir` directory symlink.
# Other environment variables might be necessary,
# depending on local configuration or usage; see:
# https://www.ibm.com/docs/en/spectrum-protect/8.1.19?topic=solaris-set-api-environment-variables
# https://www.ibm.com/docs/en/spectrum-protect/8.1.20?topic=solaris-set-api-environment-variables
# The newest version of TSM client should be discoverable by
@ -104,10 +104,10 @@ let
unwrapped = stdenv.mkDerivation rec {
name = "tsm-client-${version}-unwrapped";
version = "8.1.19.0";
version = "8.1.20.0";
src = fetchurl {
url = mkSrcUrl version;
hash = "sha512-HF4w8R6R+7gfIFsYlO3R6mkDxMo4TvL/KeK7IuuspGLiajGnBU2B7yg9/oUiT11YUBHjklaINyceQWWJoFSQJw==";
hash = "sha512-UZ5hRXGlB/1B4gZ8/i9OCHsxSuRkbAcp195zl/M75HtTi8o0rOfOh3LMmn4x4/M1V8d60ix7Tn4Mv8xkm7QXzw==";
};
inherit meta passthru;

4
pkgs/tools/misc/snapper/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "snapper";
version = "0.10.5";
version = "0.10.6";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "snapper";
rev = "v${version}";
sha256 = "sha256-PJ1KfZZdo+wyeK1NyEg6SSqs/dxqNdiZ4z/BKuVFwSc=";
sha256 = "sha256-tKxjzJ69wr48QQEgYLp7G6aOqxs9CCUiTHV1kaRCiHM=";
};
nativeBuildInputs = [

2
pkgs/tools/networking/burpsuite/default.nix
View File

@ -74,6 +74,6 @@ buildFHSEnv {
license = licenses.unfree;
platforms = jdk.meta.platforms;
hydraPlatforms = [ ];
maintainers = with maintainers; [ bennofs stepech ];
maintainers = with maintainers; [ bennofs ];
};
}

40
pkgs/tools/text/nawk/default.nix
View File

@ -1,40 +0,0 @@
{ lib, stdenv, fetchFromGitHub, bison, buildPackages, installShellFiles }:
stdenv.mkDerivation rec {
pname = "nawk";
version = "20230909";
src = fetchFromGitHub {
owner = "onetrueawk";
repo = "awk";
rev = version;
hash = "sha256-sBJ+ToFkhU5Ei84nqzbS0bUbsa+60iLSz2oeV5+PXEk=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison installShellFiles ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"HOSTCC=${if stdenv.buildPlatform.isDarwin then "clang" else "cc"}"
];
installPhase = ''
runHook preInstall
install -Dm755 a.out "$out/bin/nawk"
installManPage awk.1
runHook postInstall
'';
meta = {
description = "The one, true implementation of AWK";
longDescription = ''
This is the version of awk described in "The AWK Programming
Language", by Al Aho, Brian Kernighan, and Peter Weinberger
(Addison-Wesley, 1988, ISBN 0-201-07981-X).
'';
homepage = "https://www.cs.princeton.edu/~bwk/btl.mirror/";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.konimex ];
platforms = lib.platforms.all;
};
}

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

@ -2624,8 +2624,6 @@ with pkgs;
flix = callPackage ../development/compilers/flix { };
fleng = callPackage ../development/compilers/fleng { };
fsrx = callPackage ../tools/misc/fsrx { };
fsuae = callPackage ../applications/emulators/fs-uae { };
@ -11028,8 +11026,6 @@ with pkgs;
navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; };
nawk = callPackage ../tools/text/nawk { };
nbd = callPackage ../tools/networking/nbd { };
xnbd = callPackage ../tools/networking/xnbd { };
@ -39693,8 +39689,6 @@ with pkgs;
beluga = callPackage ../applications/science/logic/beluga { };
boogie = dotnetPackages.Boogie;
cbmc = callPackage ../applications/science/logic/cbmc { };
cadical = callPackage ../applications/science/logic/cadical { };

51
pkgs/top-level/dotnet-packages.nix
View File

@ -9,9 +9,13 @@
, glib
, mono
, overrides ? {}
, boogie
}:
let self = dotnetPackages // overrides; dotnetPackages = with self; {
# ALIASES FOR MOVED PACKAGES
Boogie = boogie;
# BINARY PACKAGES
@ -125,53 +129,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
# SOURCE PACKAGES
Boogie = buildDotnetModule rec {
pname = "Boogie";
version = "2.15.7";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie";
rev = "v${version}";
sha256 = "16kdvkbx2zwj7m43cra12vhczbpj23wyrdnj0ygxf7np7c2aassp";
};
projectFile = [ "Source/Boogie.sln" ];
nugetDeps = ../development/dotnet-modules/boogie-deps.nix;
postInstall = ''
mkdir -pv "$out/lib/dotnet/${pname}"
ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/${pname}/z3.exe"
# so that this derivation can be used as a vim plugin to install syntax highlighting
vimdir=$out/share/vim-plugins/boogie
install -Dt $vimdir/syntax/ Util/vim/syntax/boogie.vim
mkdir $vimdir/ftdetect
echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim
mkdir -p $out/share/nvim
ln -s $out/share/vim-plugins/boogie $out/share/nvim/site
'';
postFixup = ''
ln -s "$out/bin/BoogieDriver" "$out/bin/boogie"
rm -f $out/bin/{Microsoft,NUnit3,System}.* "$out/bin"/*Tests
'';
meta = with lib; {
description = "An intermediate verification language";
homepage = "https://github.com/boogie-org/boogie";
longDescription = ''
Boogie is an intermediate verification language (IVL), intended as a
layer on which to build program verifiers for other languages.
This derivation may be used as a vim plugin to provide syntax highlighting.
'';
license = licenses.mspl;
maintainers = [ maintainers.taktoa ];
platforms = with platforms; (linux ++ darwin);
};
};
MonoAddins = buildDotnetPackage rec {
pname = "Mono.Addins";
version = "1.2";