gador/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]
2022-07-28 00:03:04 +00:00
committed by GitHub
parent 64ddb6ad6b dbcce4801e
commit 18e044c779
35 changed files with 964 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/licenses.nix
+7
View File
@@ -520,6 +520,13 @@ in mkLicense lset) ({
free = false;
};
databricks-dbx = {
fullName = "DataBricks eXtensions aka dbx License";
url = "https://github.com/databrickslabs/dbx/blob/743b579a4ac44531f764c6e522dbe5a81a7dc0e4/LICENSE";
free = false;
redistributable = false;
};
issl = {
fullName = "Intel Simplified Software License";
url = "https://software.intel.com/en-us/license/intel-simplified-software-license";
maintainers/maintainer-list.nix
+6
View File
@@ -14830,4 +14830,10 @@
github = "nikstur";
githubId = 61635709;
};
yisuidenghua = {
email = "bileiner@gmail.com";
name = "Milena Yisui";
github = "yisuidenghua";
githubId = 102890144;
};
}
pkgs/applications/misc/batsignal/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "batsignal";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "electrickite";
repo = "batsignal";
rev = version;
sha256 = "sha256-gZMGbw7Ij1IVQSWOqG/91YrbWTG3I3l6Yp11QbVCfyY=";
sha256 = "sha256-lXxHvcUlIl5yb4QBJ/poLdTbwBMBlDYmTz4tSdNtCyY=";
};
buildInputs = [ libnotify glib ];
pkgs/applications/misc/bottles/default.nix
+3 -2
View File
@@ -3,8 +3,9 @@
, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk
, python3Packages, gettext
, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gtksourceview4, gnome
, steam, xdg-utils, pciutils, cabextract, wineWowPackages
, steam, xdg-utils, pciutils, cabextract
, freetype, p7zip, gamemode, mangohud
, wine
, bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs
, bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs
}:
@@ -80,7 +81,7 @@ python3Packages.buildPythonApplication rec {
xdg-utils
pciutils
cabextract
wineWowPackages.minimal
wine
freetype
p7zip
gamemode # programs.gamemode.enable
pkgs/applications/misc/dbx/default.nix
+103
View File
@@ -0,0 +1,103 @@
{ buildPythonPackage
, fetchFromGitHub
, databricks-cli
, scipy
, pathpy
, pathspec
, pydantic
, protobuf
, tqdm
, mlflow
, azure-identity
, ruamel-yaml
, emoji
, cookiecutter
, retry
, azure-mgmt-datafactory
, azure-mgmt-subscription
, pytestCheckHook
, pytest-asyncio
, pytest-timeout
, lib
}:
buildPythonPackage rec {
pname = "dbx";
version = "0.5.0";
src = fetchFromGitHub {
owner = "databrickslabs";
repo = "dbx";
rev = "v${version}";
sha256 = "gd466hhyTfPZwC3B3LlydRrkDtfzjY7SvTKy13HDFG8=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "protobuf==4.21.1" "protobuf>=3.19.4"
'';
propagatedBuildInputs = [
databricks-cli
scipy
pathpy
pathspec
pydantic
protobuf
tqdm
mlflow
azure-identity
ruamel-yaml
emoji
cookiecutter
retry
azure-mgmt-datafactory
azure-mgmt-subscription
];
checkInputs = [
pytestCheckHook
pytest-asyncio
pytest-timeout
];
disabledTests = [
# require a HOME for cookiecutter
"test_configure"
"test_datafactory_deploy"
"test_deploy_incorrect_artifact_location"
"test_deploy_listed_jobs"
"test_deploy_multitask_json"
"test_deploy_multitask_yaml"
"test_deploy_non_existent_env"
"test_deploy_path_adjustment_json"
"test_deploy_path_adjustment_yaml"
"test_deploy_with_jobs"
"test_deploy_with_requirements_and_branch"
"test_deployment_with_bad_env_variable"
"test_update_job_negative"
"test_update_job_positive"
"test_with_permissions"
"test_write_specs_to_file"
"test_awake_cluster"
"test_execute"
"test_preprocess_cluster_args"
"test_launch"
"test_launch_run_submit"
"test_launch_with_parameters"
"test_no_runs"
"test_no_runs_run_submit"
"test_payload_keys"
"test_trace_runs"
# fails because of dbfs CLI wrong call
"test_dbfs_unknown_user"
"test_dbfs_no_root"
];
meta = with lib; {
homepage = "https://github.com/databrickslabs/dbx";
description = "CLI tool for advanced Databricks jobs management";
license = licenses.databricks-dbx;
maintainers = with maintainers; [ GuillaumeDesforges ];
};
}
pkgs/applications/misc/logseq/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.7.8";
version = "0.7.9";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "sha256-5NEx4OEISa7q0tp6v4AWK9eMn58dje7non653iJhipE=";
sha256 = "sha256-tca9jWMlBT+r1CFyGKe8xMA6O0T/tnbmU7uVk+3o87o=";
name = "${pname}-${version}.AppImage";
};
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+3 -3
View File
@@ -87,7 +87,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "11.5";
version = "11.5.1";
lang = "en-US";
@@ -98,7 +98,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "sha256-Itag51LOYmxDrpDxafHXv0L+zMB6bs3dEdIIddd82cI=";
sha256 = "sha256-LgzvptQoTHGngW4xDZNfm5teSjpAjcUzMKDbBHRInoo=";
};
i686-linux = fetchurl {
@@ -107,7 +107,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "sha256-U0cTWusoRKM9VWZiOfoIU3dhKvR21OatoVvhHMDE9oo=";
sha256 = "sha256-J/ka/Qvu2UC5KTfatkWq0jc6bHTazA20vL9tz1sK/Rg=";
};
};
in
pkgs/applications/networking/cluster/terraform/default.nix
+2 -2
View File
@@ -169,8 +169,8 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.2.5";
sha256 = "sha256-dj6q+FwsXphR1e/LQApqBr7ytVM5FXexSbNklnU1jao=";
version = "1.2.6";
sha256 = "sha256-IUm08/zoL6Tw36vQrCl+kvQ6q8qArBh8LvbFf2QPn7M=";
vendorSha256 = "sha256-Whe1prBGsE0q0QdNkzAKwvAP7EVlnD/985gjngh+VI4=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
pkgs/applications/networking/n8n/node-packages.nix
Generated
+590 -113
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/office/zotero/default.nix
+2 -2
View File
@@ -41,12 +41,12 @@
stdenv.mkDerivation rec {
pname = "zotero";
version = "6.0.9";
version = "6.0.10";
src = fetchurl {
url =
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "sha256-yzMppbvdw7ShYtWdmE5HkqutgivwuJKPkAOGq6WkyuQ=";
sha256 = "sha256-+RFTFOZVf0w9HBlk05pEsssiFlEaPJ9XTq29QpuIil8=";
};
nativeBuildInputs = [ wrapGAppsHook ];
pkgs/applications/radio/soapysdr/default.nix
+5
View File
@@ -25,6 +25,11 @@ in stdenv.mkDerivation {
sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2";
};
patches = [
# see https://github.com/pothosware/SoapySDR/issues/352 for upstream issue
./fix-pkgconfig.patch
];
nativeBuildInputs = [ cmake makeWrapper pkg-config ];
buildInputs = [ libusb-compat-0_1 ncurses ]
++ lib.optionals usePython [ python swig2 ];
pkgs/applications/radio/soapysdr/fix-pkgconfig.patch
+14
View File
@@ -0,0 +1,14 @@
diff --git a/lib/SoapySDR.in.pc b/lib/SoapySDR.in.pc
index a1ca698..fd2f4c0 100644
--- a/lib/SoapySDR.in.pc
+++ b/lib/SoapySDR.in.pc
@@ -1,7 +1,5 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: Soapy SDR
Description: Vendor and platform neutral SDR interface library.
pkgs/applications/science/biology/bedops/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bedops";
version = "2.4.40";
version = "2.4.41";
src = fetchFromGitHub {
owner = "bedops";
repo = "bedops";
rev = "v${version}";
sha256 = "sha256-rJVl3KbzGblyQZ7FtJXeEv/wjQJmzYGNjzhvkoMoBWY=";
sha256 = "sha256-VJBoi1+tHA4oOVOsClUfimB+mOV5ZSQsDcDq3vAZwBA=";
};
buildInputs = [ zlib bzip2 jansson ];
pkgs/applications/version-management/git-lfs/default.nix
-1
View File
@@ -9,7 +9,6 @@ buildGoModule rec {
repo = "git-lfs";
rev = "v${version}";
sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI=";
leaveDotGit = true;
};
vendorSha256 = null;
pkgs/data/misc/hackage/pin.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"commit": "c58387b71e19d6dd43bbade8f84d6a44b6418e24",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c58387b71e19d6dd43bbade8f84d6a44b6418e24.tar.gz",
"sha256": "0xdvqn4392l65ns4wm47c8nyp1s7al4i506927dmkzz85m3hvyn0",
"msg": "Update from Hackage at 2022-07-26T16:57:53Z"
"commit": "84a258f1f060f5f31f44b2d966b6e96305932eb2",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/84a258f1f060f5f31f44b2d966b6e96305932eb2.tar.gz",
"sha256": "0nyiyxxqa5h46p50jmvrx6sphxy0j8ib2vy3jvfijdpc4d6d5gx6",
"msg": "Update from Hackage at 2022-07-27T11:03:11Z"
}
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+77 -23
View File
@@ -12345,7 +12345,7 @@ self: {
description = "A compiler from Curry to Haskell";
license = "unknown";
hydraPlatforms = lib.platforms.none;
}) {kics = null;};
}) {inherit (pkgs) kics;};
"KiCS-debugger" = callPackage
({ mkDerivation, base, containers, curry-base, directory, filepath
@@ -21670,8 +21670,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "WeakSets";
version = "1.2.3.0";
sha256 = "0skz318p0irm8nld2raqh61s127mav7cppbwi1iyjm7mwiw3x22g";
version = "1.2.4.0";
sha256 = "1hfs3zd9lq9m8fczs8mrl0k61005yv8ia44c4ls6mgfya606i8r3";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Simple set types. Useful to create sets of arbitrary types and nested sets.";
@@ -52728,8 +52728,8 @@ self: {
}:
mkDerivation {
pname = "cachix";
version = "0.8.0";
sha256 = "0wdqb5pm7nqlm0g9mkv0spbc1j2hxb2p2aihs1c3vrz112z40fxm";
version = "0.8.1";
sha256 = "0kpclk60yk0vj3d6adps02jr34h5k7ik8jyyv008n0ximd8fxzc3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -87027,8 +87027,8 @@ self: {
}:
mkDerivation {
pname = "ecta";
version = "1.0.0.2";
sha256 = "10d0dvwd5lrla509ncx7f9i72ak4b7g4z3459nlxba904qhr0gnm";
version = "1.0.0.3";
sha256 = "111p5wxlrr5c8qk8mhc1w57xqj3jgks724v2pvwip7dbfkjfz134";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -136623,6 +136623,42 @@ self: {
mainProgram = "hie-bios";
}) {};
"hie-bios_0_10_0" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
, co-log-core, conduit, conduit-extra, containers, cryptohash-sha1
, deepseq, directory, exceptions, extra, file-embed, filepath, ghc
, optparse-applicative, prettyprinter, process, tagged, tasty
, tasty-expected-failure, tasty-hunit, temporary, text, time
, transformers, unix-compat, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "hie-bios";
version = "0.10.0";
sha256 = "0k9d106y46dqwr5dw6yzmqvb03gshlp6qbzznz67qkwbkj2calyz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base base16-bytestring bytestring co-log-core conduit
conduit-extra containers cryptohash-sha1 deepseq directory
exceptions extra file-embed filepath ghc prettyprinter process
temporary text time transformers unix-compat unordered-containers
vector yaml
];
executableHaskellDepends = [
base co-log-core directory filepath ghc optparse-applicative
prettyprinter
];
testHaskellDepends = [
aeson base directory extra filepath ghc tagged tasty
tasty-expected-failure tasty-hunit temporary text
unordered-containers yaml
];
description = "Set up a GHC API session";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
mainProgram = "hie-bios";
}) {};
"hie-compat" = callPackage
({ mkDerivation, array, base, bytestring, containers, directory
, filepath, ghc, ghc-boot, transformers
@@ -159889,8 +159925,8 @@ self: {
}:
mkDerivation {
pname = "interval-patterns";
version = "0.3.0.1";
sha256 = "1jf4yj6bq3wwn7qbvwhh5i38gcfp80p6kgfmwrxiv233l7ihy9jq";
version = "0.4.0.0";
sha256 = "1gdimpx8yxx773zcdlnh8m9g39ic0fzya7fv3xxx0c3ylvdsfhbw";
libraryHaskellDepends = [
base containers groups lattices relude semirings time time-compat
];
@@ -159898,6 +159934,7 @@ self: {
base containers groups hspec lattices QuickCheck relude semirings
time time-compat
];
description = "Intervals, and monoids thereof";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -214621,8 +214658,8 @@ self: {
pname = "persistent";
version = "2.13.3.5";
sha256 = "0z69yvk0rd29dp5qdhi4p587b891y90azrzzpa3g10cxp3gyywvm";
revision = "1";
editedCabalFile = "1g9rf4kddz5xp4jrfc3kkzq0n29mrmhq7r22ilcalksyammsng3p";
revision = "2";
editedCabalFile = "1x802a6ldvgjjn7mdh8d2c0h5cl0jajvf3g75rza7c8cxrn8f2vw";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html bytestring
conduit containers fast-logger http-api-data lift-type monad-logger
@@ -214659,6 +214696,8 @@ self: {
pname = "persistent";
version = "2.14.0.3";
sha256 = "0r0pz7badjb2m47prhgs3hpwfcwqg07nimbwhnhc7mx3n0n2sjp6";
revision = "1";
editedCabalFile = "0bqs3l8f2014c82hc082x0ynhxkxsz37pm8c2nr0h9hn7993fvbn";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html bytestring
conduit containers fast-logger http-api-data lift-type monad-logger
@@ -251342,8 +251381,8 @@ self: {
pname = "servant-iCalendar";
version = "0.1.0.1";
sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
revision = "9";
editedCabalFile = "10r7kbil264vv090vhinhbb263zckjwdvp1sn1hx238yp5dzxlq0";
revision = "10";
editedCabalFile = "0d985fszx48n87ararrs3pzw5509hkr4mk9zk7a1aw210nnf31z6";
libraryHaskellDepends = [
base data-default http-media iCalendar servant
];
@@ -276327,6 +276366,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
"tasty-wai_0_1_2_0" = callPackage
({ mkDerivation, base, bytestring, http-types, HUnit, tasty, wai
, wai-extra
}:
mkDerivation {
pname = "tasty-wai";
version = "0.1.2.0";
sha256 = "18yw2qzzg969c99rpa8p154hxbm9i4iq64pma3jkr2gfdm6j4vvg";
libraryHaskellDepends = [
base bytestring http-types HUnit tasty wai wai-extra
];
testHaskellDepends = [ base http-types tasty wai ];
description = "Test 'wai' endpoints via Test.Tasty";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"tateti-tateti" = callPackage
({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }:
mkDerivation {
@@ -279070,7 +279126,7 @@ self: {
license = lib.licenses.bsd3;
}) {};
"text_2_0" = callPackage
"text_2_0_1" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-prim, QuickCheck, tasty
, tasty-bench, tasty-hunit, tasty-inspection-testing
@@ -279078,15 +279134,15 @@ self: {
}:
mkDerivation {
pname = "text";
version = "2.0";
sha256 = "15pcs9wdd0jjh4k2qis1s8bny14s0x85nys9i25nwr4a6xxpi6fm";
version = "2.0.1";
sha256 = "1nl7l15qn2rh7p8hfrzs5djm3ms0gsb28r77hl530b0fqmk282mh";
libraryHaskellDepends = [
array base binary bytestring deepseq ghc-prim template-haskell
];
testHaskellDepends = [
base bytestring deepseq directory ghc-prim QuickCheck tasty
tasty-hunit tasty-inspection-testing tasty-quickcheck
template-haskell
template-haskell transformers
];
benchmarkHaskellDepends = [
base bytestring containers deepseq directory filepath tasty-bench
@@ -285216,10 +285272,8 @@ self: {
}:
mkDerivation {
pname = "toysolver";
version = "0.7.0";
sha256 = "1r8z8fg3iyz5cc7cmwv29i7gwdcb789s7p6yklfgmz8w314m83gj";
revision = "4";
editedCabalFile = "10fq2a4bllhgf566hxv7qhldq7xmmqc19kk968s096ac5myhzc0x";
version = "0.8.0";
sha256 = "1vlswvlnj8xsz2lqwl0z9mnmznqgjzi0595jlcr2lw4d4na1sxs7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -304157,8 +304211,8 @@ self: {
({ mkDerivation, base, ghc-prim }:
mkDerivation {
pname = "word-compat";
version = "0.0.3";
sha256 = "1zr5jcvnhmr7g74ysyd5n8ykakl0n0shpfh7li42a9j7q5bq6ryb";
version = "0.0.4";
sha256 = "1pb1l8qxl7ys6db3wmp9rflqznjl6x11n477x159d920m7h5gz6k";
libraryHaskellDepends = [ base ghc-prim ];
testHaskellDepends = [ base ];
description = "Compatibility shim for the Int/Word internal change in GHC 9.2";
pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch
+20 -117
View File
@@ -1,22 +1,19 @@
From d0136f350b82ae845d56029db43d153c91d5e494 Mon Sep 17 00:00:00 2001
From aed1c4b0be7576d20eed81070da2c6f92573df18 Mon Sep 17 00:00:00 2001
From: Keshav Kini <keshav.kini@gmail.com>
Date: Sat, 30 May 2020 21:27:47 -0700
Subject: [PATCH] Fix some paths for Nix build
---
books/build/features.sh | 1 +
.../ipasir/load-ipasir-sharedlib-raw.lsp | 6 +--
books/projects/smtlink/config.lisp | 2 +-
books/projects/smtlink/examples/examples.lisp | 4 +-
books/projects/smtlink/smtlink-config | 2 +-
.../cl+ssl-20200610-git/src/reload.lisp | 53 +------------------
6 files changed, 8 insertions(+), 60 deletions(-)
books/build/features.sh | 1 +
books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp | 6 +-----
.../bundle/software/cl+ssl-20220707-git/src/reload.lisp | 3 +++
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/books/build/features.sh b/books/build/features.sh
index d45a7aa61..27256b7cd 100755
index feb5b2b59c..4b654e08bc 100755
--- a/books/build/features.sh
+++ b/books/build/features.sh
@@ -122,6 +122,7 @@ EOF
@@ -125,6 +125,7 @@ EOF
fi
echo "Determining whether an ipasir shared library is installed" 1>&2
@@ -25,7 +22,7 @@ index d45a7aa61..27256b7cd 100755
cat >> Makefile-features <<EOF
export OS_HAS_IPASIR ?= 1
diff --git a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
index 762e4ad4c..c9802cb58 100644
index 762e4ad4c0..c9802cb582 100644
--- a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
+++ b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
@@ -30,11 +30,7 @@
@@ -41,114 +38,20 @@ index 762e4ad4c..c9802cb58 100644
(error () (er hard? 'load-ipasir-shardlib-raw
"Couldn't load ipasir shared library from ~s0."
libname))))
diff --git a/books/projects/smtlink/config.lisp b/books/projects/smtlink/config.lisp
index c74073174..8d92355f7 100644
--- a/books/projects/smtlink/config.lisp
+++ b/books/projects/smtlink/config.lisp
@@ -51,7 +51,7 @@ where the system books are."))
(make-smtlink-config :interface-dir interface-dir
:smt-module "ACL2_to_Z3"
:smt-class "ACL22SMT"
- :smt-cmd "/usr/bin/env python"
+ :smt-cmd "python"
:pythonpath "")))
;; -----------------------------------------------------------------
diff --git a/books/projects/smtlink/examples/examples.lisp b/books/projects/smtlink/examples/examples.lisp
index 90534892f..4ab98b2f0 100644
--- a/books/projects/smtlink/examples/examples.lisp
+++ b/books/projects/smtlink/examples/examples.lisp
@@ -75,7 +75,7 @@ Subgoal 2
Subgoal 2.2
Subgoal 2.2'
Using default SMT-trusted-cp...
-; SMT solver: `/usr/bin/env python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes
+; SMT solver: `python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes
Proved!
Subgoal 2.2''
Subgoal 2.1
@@ -139,7 +139,7 @@ read back into ACL2. Below are the outputs from this clause processor called
@({
Using default SMT-trusted-cp...
-; SMT solver: `/usr/bin/env python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes
+; SMT solver: `python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes
Proved!
})
diff --git a/books/projects/smtlink/smtlink-config b/books/projects/smtlink/smtlink-config
index 0d2703545..0f58904ea 100644
--- a/books/projects/smtlink/smtlink-config
+++ b/books/projects/smtlink/smtlink-config
@@ -1 +1 @@
-smt-cmd=/usr/bin/env python
+smt-cmd=python
diff --git a/books/quicklisp/bundle/software/cl+ssl-20200610-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20200610-git/src/reload.lisp
index e5db28645..65eb818a1 100644
--- a/books/quicklisp/bundle/software/cl+ssl-20200610-git/src/reload.lisp
+++ b/books/quicklisp/bundle/software/cl+ssl-20200610-git/src/reload.lisp
@@ -37,59 +37,10 @@
diff --git a/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp
index d409b4440f..5c65c5b4da 100644
--- a/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp
+++ b/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp
@@ -87,6 +87,9 @@ sudo rm /usr/local/lib/libcrypto.dylib /usr/local/lib/libssl.dylib
;;
;; These are 32-bit only.
(cffi:define-foreign-library libcrypto
- (:windows (:or #+(and windows x86-64) "libcrypto-1_1-x64.dll"
- #+(and windows x86) "libcrypto-1_1.dll"
- "libeay32.dll"))
- (:openbsd "libcrypto.so")
- (:darwin (:or "/opt/local/lib/libcrypto.dylib" ;; MacPorts
- "/sw/lib/libcrypto.dylib" ;; Fink
- "/usr/local/opt/openssl/lib/libcrypto.dylib" ;; Homebrew
- "/usr/local/lib/libcrypto.dylib" ;; personalized install
- "libcrypto.dylib" ;; default system libcrypto, which may have insufficient crypto
- "/usr/lib/libcrypto.dylib"))
- (:cygwin (:or "cygcrypto-1.1.dll" "cygcrypto-1.0.0.dll")))
+ (t "@libcrypto@"))
(cffi:define-foreign-library libssl
- (:windows (:or #+(and windows x86-64) "libssl-1_1-x64.dll"
- #+(and windows x86) "libssl-1_1.dll"
- "libssl32.dll"
- "ssleay32.dll"))
- ;; The default OS-X libssl seems have had insufficient crypto algos
- ;; (missing TLSv1_[1,2]_XXX methods,
- ;; see https://github.com/cl-plus-ssl/cl-plus-ssl/issues/56)
- ;; so first try to load possible custom installations of libssl
- (:darwin (:or "/opt/local/lib/libssl.dylib" ;; MacPorts
- "/sw/lib/libssl.dylib" ;; Fink
- "/usr/local/opt/openssl/lib/libssl.dylib" ;; Homebrew
- "/usr/local/lib/libssl.dylib" ;; personalized install
- "libssl.dylib" ;; default system libssl, which may have insufficient crypto
- "/usr/lib/libssl.dylib"))
- (:solaris (:or "/lib/64/libssl.so"
- "libssl.so.0.9.8" "libssl.so" "libssl.so.4"))
- ;; Unlike some other systems, OpenBSD linker,
- ;; when passed library name without versions at the end,
- ;; will locate the library with highest macro.minor version,
- ;; so we can just use just "libssl.so".
- ;; More info at https://github.com/cl-plus-ssl/cl-plus-ssl/pull/2.
- (:openbsd "libssl.so")
- ((and :unix (not :cygwin)) (:or "libssl.so.1.1"
- "libssl.so.1.0.2m"
- "libssl.so.1.0.2k"
- "libssl.so.1.0.2"
- "libssl.so.1.0.1l"
- "libssl.so.1.0.1j"
- "libssl.so.1.0.1f"
- "libssl.so.1.0.1e"
- "libssl.so.1.0.1"
- "libssl.so.1.0.0q"
- "libssl.so.1.0.0"
- "libssl.so.0.9.8ze"
- "libssl.so.0.9.8"
- "libssl.so.10"
- "libssl.so.4"
- "libssl.so"))
- (:cygwin (:or "cygssl-1.1.dll" "cygssl-1.0.0.dll"))
- (t (:default "libssl3")))
+ (t "@libssl@"))
(unless (member :cl+ssl-foreign-libs-already-loaded
*features*)
+(cl+ssl/config:define-libssl-path "@libssl@")
+(cl+ssl/config:define-libcrypto-path "@libcrypto@")
+
(unless cl+ssl/config::*libcrypto-override*
(cffi:define-foreign-library libcrypto
(:windows (:or #+(and windows x86-64) "libcrypto-1_1-x64.dll"
--
2.31.1
pkgs/development/interpreters/acl2/default.nix
+2 -2
View File
@@ -17,13 +17,13 @@ let
in stdenv.mkDerivation rec {
pname = "acl2";
version = "8.4";
version = "8.5";
src = fetchFromGitHub {
owner = "acl2-devel";
repo = "acl2-devel";
rev = version;
sha256 = "16rr9zqmd3y1sd6zxff2f9gdd84l99pr7mdp1sjwmh427h661c68";
sha256 = "12cv5ms1j3vfrq066km020nwxb6x2dzh12g8nz6xxyxysn44wzzi";
};
# You can swap this out with any other IPASIR implementation at
pkgs/development/libraries/aravis/default.nix
+2 -2
View File
@@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null;
stdenv.mkDerivation rec {
pname = "aravis";
version = "0.8.21";
version = "0.8.22";
src = fetchFromGitHub {
owner = "AravisProject";
repo = pname;
rev = version;
sha256 = "sha256-z4fuo8tVyHf2Bw73ZfAEpAYmzbr9UIzEWPC5f95wnD8=";
sha256 = "sha256-S9DmXjywxNr5Rpx605zip76vGKBSrUwyerqXlBm05VI=";
};
outputs = [ "bin" "dev" "out" "lib" ];
pkgs/development/python-modules/pyfaidx/default.nix
+2 -2
View File
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "pyfaidx";
version = "0.7.0";
version = "0.7.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-mtXMk4Hw3pxD1L3sD68Qa4KM37b4FQ7HHKssp8i+53A=";
sha256 = "sha256-OXdjK3/SkEn4sRA11+neoOLF2pwjX5grTD+uBv8foj8=";
};
nativeBuildInputs = [
pkgs/development/tools/misc/coreboot-toolchain/default.nix
+6 -4
View File
@@ -1,4 +1,4 @@
{ lib, callPackage }:
{ stdenv, lib, callPackage }:
let
common = arch: callPackage (
{ bison
@@ -22,14 +22,14 @@ let
src = fetchgit {
url = "https://review.coreboot.org/coreboot";
rev = version;
sha256 = "073n8yid3v0l9wgwnrdqrlgzaj9mnhs33a007dgr7xq3z0iw3i52";
sha256 = "sha256-PCum+IvJ136eZQLovUi9u4xTLLs17MkMP5Oc0/2mMY4=";
fetchSubmodules = false;
leaveDotGit = true;
postFetch = ''
patchShebangs $out/util/crossgcc/buildgcc
PATH=${lib.makeBinPath [ getopt ]}:$PATH $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version
PATH=${lib.makeBinPath [ getopt ]}:$PATH ${stdenv.shell} $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version
rm -rf $out/.git
'';
allowedRequisites = [ ];
};
nativeBuildInputs = [ bison curl git perl ];
@@ -40,6 +40,8 @@ let
dontInstall = true;
postPatch = ''
patchShebangs $out/util/crossgcc/buildgcc
mkdir -p util/crossgcc/tarballs
${lib.concatMapStringsSep "\n" (
pkgs/development/tools/mysql-shell/default.nix
+4 -7
View File
@@ -40,16 +40,16 @@ let
in
stdenv.mkDerivation rec{
pname = "mysql-shell";
version = "8.0.29";
version = "8.0.30";
srcs = [
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz";
sha256 = "sha256-ijwyamQgMoUEcMNpIJjJxH/dRuRFpdcXGmQqpD+WrmA=";
sha256 = "sha256-/UJgcYkPG8RShZzybqdcMQDpNUTVWAfAa2p0Cm23fXA=";
})
(fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz";
sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY=";
sha256 = "sha256-yYjVxrqaVmkqbNbpgTRltfyTaO1LRh35cFmi/BYMi4Q=";
})
];
@@ -95,9 +95,6 @@ stdenv.mkDerivation rec{
-DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build
cmake --build ../mysql-${version}/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
# Get libv8_monolith
mkdir -p ../v8/lib && ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a
'';
cmakeFlags = [
@@ -110,7 +107,7 @@ stdenv.mkDerivation rec{
"-DWITH_PROTOBUF=${protobuf}"
"-DHAVE_V8=1"
"-DV8_INCLUDE_DIR=${v8}/include"
"-DV8_LIB_DIR=../v8/lib"
"-DV8_LIB_DIR=${v8}/lib"
"-DHAVE_PYTHON=1"
];
pkgs/games/pokete/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "pokete";
version = "0.7.3";
version = "0.8.0";
format = "other";
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "lxgr-linux";
repo = "pokete";
rev = version;
sha256 = "sha256-sP6fI3F/dQHei1ZJU6gChKxft9fGpTct4EyU3OdBtr4=";
sha256 = "sha256-DDKqxscXtl/i+YKiXAoFHXsGBQpcUvyHfOqwpe0hSgg=";
};
pythonPath = with python3.pkgs; [
pkgs/os-specific/linux/autosuspend/default.nix
+3 -3
View File
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "autosuspend";
version = "4.1.1";
version = "4.2.0";
src = fetchFromGitHub {
owner = "languitar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UdHaz1JIofUrw9G/K40AVhBWdvMdTK4Wa7FWb6ntwr0=";
rev = "refs/tags/v${version}";
sha256 = "sha256-aIWqE422xfAzAyF+4hARYOcomZHraTrtxtw2YfAxJ1M=";
};
postPatch = ''
pkgs/servers/roon-server/default.nix
+10 -10
View File
@@ -14,18 +14,18 @@
, openssl
, stdenv
}:
stdenv.mkDerivation rec {
let
version = "1.8-1021";
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
in
stdenv.mkDerivation {
pname = "roon-server";
version = "1.8-988";
inherit version;
src =
let
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version;
in
fetchurl {
url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-e8hSvHKeyJOIp6EWy1JLOWnj6HE2McFk9bw5vVZ96/I=";
};
src = fetchurl {
url = "https://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-obG6e/6AxNvUZkZzgS2QAxoSbJIM2pwuQDI0O2B90J8=";
};
dontConfigure = true;
dontBuild = true;
pkgs/shells/fish/default.nix
+2
View File
@@ -25,6 +25,7 @@
, runCommand
, writeText
, nixosTests
, nix-update-script
, useOperatingSystemEtc ? true
# An optional string containing Fish code that initializes the environment.
# This is run at the very beginning of initialization. If it sets $NIX_PROFILES
@@ -326,6 +327,7 @@ let
${fish}/bin/fish ${fishScript} && touch $out
'';
};
updateScript = nix-update-script { attrPath = pname; };
};
};
in
pkgs/tools/filesystems/genext2fs/default.nix
+20 -10
View File
@@ -1,22 +1,32 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libarchive }:
stdenv.mkDerivation rec {
pname = "genext2fs";
version = "1.4.1";
version = "1.5.0";
src = fetchurl {
url = "mirror://sourceforge/genext2fs/genext2fs-${version}.tar.gz";
sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0";
src = fetchFromGitHub {
owner = "bestouff";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9LAU5XuCwwEhU985MzZ2X+YYibvyECULQSn9X2jdj5I=";
};
# https://sourceforge.net/p/genext2fs/bugs/2/
# Will be fixed in the next release, whenever this happens
postPatch = ''
sed -e 's@4 [*] (EXT2_TIND_BLOCK+1)@-1+&@' -i genext2fs.c
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [
libarchive
];
configureFlags = [
"--enable-libarchive"
];
doCheck = true;
checkPhase = ''
./test.sh
'';
meta = with lib; {
homepage = "http://genext2fs.sourceforge.net/";
homepage = "https://github.com/bestouff/genext2fs";
description = "A tool to generate ext2 filesystem images without requiring root privileges";
license = licenses.gpl2;
platforms = platforms.all;
pkgs/tools/misc/bdf2psf/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
version = "1.208";
version = "1.209";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
sha256 = "0s57k2f11xkp8dddihkmvjj91s9chsny76qgk7nxq8svdwrv980g";
sha256 = "sha256-xLdn5MANZVvU+Vl3yaHDaNZCd48KaMY4UzuI/jc7jEQ=";
};
nativeBuildInputs = [ dpkg ];
pkgs/tools/misc/hyfetch/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonPackage rec {
pname = "HyFetch";
version = "1.1.2";
src = fetchFromGitHub {
repo = "hyfetch";
owner = "hykilpikonna";
rev = "92623417f90f0cf006c0dd2adcf3f24f4308fe0c";
sha256 = "sha256-26L2qt+RarRf3+L6+mMy/ZJNVBVirKs5oEclEsImtC0=";
};
propagatedBuildInputs = with python3Packages; [
typing-extensions
setuptools
];
preCheck = ''
rm -rf hyfetch/color_scale_numpy.py
'';
meta = with lib; {
description = "neofetch with pride flags <3";
longDescription = ''
HyFetch is a command-line system information tool fork of neofetch.
HyFetch displays information about your system next to your OS logo
in ASCII representation. The ASCII representation is then colored in
the pattern of the pride flag of your choice. The main purpose of
HyFetch is to be used in screenshots to show other users what
operating system or distribution you are running, what theme or
icon set you are using, etc.
'';
homepage = "https://github.com/hykilpikonna/HyFetch";
license = licenses.mit;
mainProgram = "hyfetch";
maintainers = [
maintainers.yisuidenghua
];
};
}
pkgs/tools/misc/upterm/default.nix
+6 -4
View File
@@ -7,22 +7,24 @@
buildGoModule rec {
pname = "upterm";
version = "0.8.2";
version = "0.9.0";
src = fetchFromGitHub {
owner = "owenthereal";
repo = "upterm";
rev = "v${version}";
hash = "sha256-JcUFsj7+Hu++izyxozttyxTGW51vBfgNSvAa/AIrsvs=";
hash = "sha256-ywwqX4aw9vc2kptYZisArTpdz7Cf49Z0jMdP90KXejs=";
};
vendorSha256 = null;
subPackages = [ "cmd/upterm" "cmd/uptermd" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
$out/bin/gendoc
rm $out/bin/gendoc
# force go to build for build arch rather than host arch during cross-compiling
CGO_ENABLED=0 GOOS= GOARCH= go run cmd/gendoc/main.go
installManPage etc/man/man*/*
installShellCompletion --bash --name upterm.bash etc/completion/upterm.bash_completion.sh
installShellCompletion --zsh --name _upterm etc/completion/upterm.zsh_completion
pkgs/tools/networking/vopono/default.nix
+3 -3
View File
@@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "vopono";
version = "0.10.0";
version = "0.10.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-89Mzn2knClBJwVlCglR5BOOo5dXRP1Gqp/mmwHvwM3c=";
sha256 = "sha256-JwtiqY56Cn2oY5lRz/oxmQe2rw4spFvCOp1zKKuVsys=";
};
cargoHash = "sha256-8m/zlmeYcYCxycP9W6eweRJ2Vf/8+GSYf+NNz3NtnIw=";
cargoHash = "sha256-NvdgyFlZ2udoWikJI7kzY14rfQi0KxpI2/P0+O5dqVA=";
meta = with lib; {
description = "Run applications through VPN connections in network namespaces";
pkgs/tools/package-management/nix/common.nix
+1 -1
View File
@@ -213,7 +213,7 @@ self = stdenv.mkDerivation {
passthru = {
inherit aws-sdk-cpp boehmgc;
perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; });
perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; });
};
};
in self
pkgs/tools/package-management/nix/nix-perl.nix
+4
View File
@@ -1,4 +1,5 @@
{ stdenv
, lib
, perl
, pkg-config
, curl
@@ -8,6 +9,7 @@
, autoreconfHook
, autoconf-archive
, nlohmann_json
, Security
}:
stdenv.mkDerivation {
@@ -16,6 +18,8 @@ stdenv.mkDerivation {
postUnpack = "sourceRoot=$sourceRoot/perl";
buildInputs = lib.optional (stdenv.isDarwin) Security;
# This is not cross-compile safe, don't have time to fix right now
# but noting for future travellers.
nativeBuildInputs = [
pkgs/tools/text/difftastic/default.nix
+3 -3
View File
@@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.30.0";
version = "0.31.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-7uVrE+HDEtZsbXI/PSZOAIbAs3spSkcm+1RGrcFxKLM=";
sha256 = "sha256-jxxrmlavHdfou9w6KRIoAG3kBDBpg1lpk7J+E8Rx/ew=";
};
depsExtraArgs = {
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
popd
'';
};
cargoSha256 = "sha256-SQSshOJ3+z+jHXSjWv31tsGivE4ESMHW1h58vuacQ3U=";
cargoSha256 = "sha256-QW7Y/27AFjuNj+MSwi+DPdjPWqglBW6mAtg9N6BhyAY=";
passthru.tests.version = testers.testVersion { package = difftastic; };
pkgs/top-level/all-packages.nix
+8 -2
View File
@@ -691,7 +691,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost177; # Configure checks for specific version.
protobuf = protobuf3_19;
icu = icu67;
icu = icu69;
v8 = v8_8_x;
};
@@ -3457,6 +3457,8 @@ with pkgs;
dbus-broker = callPackage ../os-specific/linux/dbus-broker { };
dbx = python3Packages.callPackage ../applications/misc/dbx { };
ioport = callPackage ../os-specific/linux/ioport {};
dgoss = callPackage ../tools/misc/dgoss { };
@@ -26096,7 +26098,9 @@ with pkgs;
bonzomatic = callPackage ../applications/editors/bonzomatic { };
bottles = callPackage ../applications/misc/bottles { };
bottles = callPackage ../applications/misc/bottles {
wine = wineWowPackages.minimal;
};
brave = callPackage ../applications/networking/browsers/brave { };
@@ -34798,6 +34802,8 @@ with pkgs;
hplipWithPlugin = hplip.override { withPlugin = true; };
hyfetch = callPackage ../tools/misc/hyfetch { };
hyperfine = callPackage ../tools/misc/hyperfine {
inherit (darwin.apple_sdk.frameworks) Security;
};