Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c73393b6c7
@ -1,6 +1,6 @@
|
||||
{ version, sha256 }:
|
||||
|
||||
{ lib, stdenv, fetchurl, writeText, sbclBootstrap
|
||||
{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap
|
||||
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
|
||||
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)
|
||||
, disableImmobileSpace ? false
|
||||
@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [texinfo];
|
||||
|
||||
patches = lib.optional
|
||||
(lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8")
|
||||
(fetchpatch {
|
||||
# Fix segfault on ARM when reading large core files
|
||||
url = "https://github.com/sbcl/sbcl/commit/8fa3f76fba2e8572e86ac6fc5754e6b2954fc774.patch";
|
||||
sha256 = "1ic531pjnws1k3xd03a5ixbq8cn10dlh2nfln59k0vbm0253g3lv";
|
||||
});
|
||||
|
||||
postPatch = ''
|
||||
echo '"${version}.nixos"' > version.lisp-expr
|
||||
|
||||
|
||||
@ -1,54 +1,46 @@
|
||||
From 43d23211dd7d22b5264ed06d446f89d632125da8 Mon Sep 17 00:00:00 2001
|
||||
From d0136f350b82ae845d56029db43d153c91d5e494 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 1/2] Fix some paths for Nix build
|
||||
Subject: [PATCH] Fix some paths for Nix build
|
||||
|
||||
---
|
||||
books/build/features.sh | 1 +
|
||||
.../ipasir/load-ipasir-sharedlib-raw.lsp | 16 +++----
|
||||
.../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-20181018-git/src/reload.lisp | 48 ++-----------------
|
||||
.../shellpool-20150505-git/src/main.lisp | 20 +-------
|
||||
7 files changed, 15 insertions(+), 78 deletions(-)
|
||||
.../cl+ssl-20200610-git/src/reload.lisp | 53 +------------------
|
||||
6 files changed, 8 insertions(+), 60 deletions(-)
|
||||
|
||||
diff --git a/books/build/features.sh b/books/build/features.sh
|
||||
index c8493d51a..def853f53 100755
|
||||
index d45a7aa61..27256b7cd 100755
|
||||
--- a/books/build/features.sh
|
||||
+++ b/books/build/features.sh
|
||||
@@ -84,6 +84,7 @@ fi
|
||||
|
||||
@@ -122,6 +122,7 @@ EOF
|
||||
fi
|
||||
|
||||
echo "Determining whether an ipasir shared library is installed" 1>&2
|
||||
+IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasirglucose4@/lib/libipasirglucose4.so}
|
||||
if [[ $IPASIR_SHARED_LIBRARY != '' ]];
|
||||
then
|
||||
if [[ -e $IPASIR_SHARED_LIBRARY ]];
|
||||
+IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasir@}
|
||||
if check_ipasir; then
|
||||
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 c6b0b3185..5ac5c675a 100644
|
||||
index 762e4ad4c..c9802cb58 100644
|
||||
--- a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
|
||||
+++ b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
|
||||
@@ -28,13 +28,9 @@
|
||||
;
|
||||
; Original authors: Sol Swords <sswords@centtech.com>
|
||||
@@ -30,11 +30,7 @@
|
||||
|
||||
-(er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*)))
|
||||
- (if libname
|
||||
- (handler-case
|
||||
- (cffi::load-foreign-library libname)
|
||||
- (error () (er hard? 'load-ipasir-shardlib-raw
|
||||
- "Couldn't load the specified ipasir shared library, ~s0."
|
||||
- libname)))
|
||||
- (er hard? 'load-ipasir-shardlib-raw
|
||||
- "Couldn't load an ipasir library because the ~
|
||||
- IPASIR_SHARED_LIBRARY environment variable was unset.")))
|
||||
+(let ((libname "@libipasirglucose4@/lib/libipasirglucose4.so"))
|
||||
+ (handler-case
|
||||
+ (cffi::load-foreign-library libname)
|
||||
+ (error () (er hard? 'load-ipasir-shardlib-raw
|
||||
+ "Couldn't load the specified ipasir shared library, ~s0."
|
||||
+ libname))))
|
||||
(er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*)))
|
||||
(handler-case
|
||||
- (cffi::load-foreign-library
|
||||
- (or libname
|
||||
- (cw "WARNING: $IPASIR_SHARED_LIBRARY not specified, ~
|
||||
- defaulting to \"libipasirglucose4.so\"")
|
||||
- "libipasirglucose4.so"))
|
||||
+ (cffi::load-foreign-library (or libname "@libipasir@"))
|
||||
(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
|
||||
@ -63,7 +55,7 @@ index c74073174..8d92355f7 100644
|
||||
|
||||
;; -----------------------------------------------------------------
|
||||
diff --git a/books/projects/smtlink/examples/examples.lisp b/books/projects/smtlink/examples/examples.lisp
|
||||
index bc66e0165..24f0d639c 100644
|
||||
index 90534892f..4ab98b2f0 100644
|
||||
--- a/books/projects/smtlink/examples/examples.lisp
|
||||
+++ b/books/projects/smtlink/examples/examples.lisp
|
||||
@@ -75,7 +75,7 @@ Subgoal 2
|
||||
@ -91,25 +83,32 @@ index 0d2703545..0f58904ea 100644
|
||||
@@ -1 +1 @@
|
||||
-smt-cmd=/usr/bin/env python
|
||||
+smt-cmd=python
|
||||
diff --git a/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp
|
||||
index 3f6aa35d0..ac4012363 100644
|
||||
--- a/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp
|
||||
+++ b/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp
|
||||
@@ -20,54 +20,12 @@
|
||||
(in-package :cl+ssl)
|
||||
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 @@
|
||||
;; 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")))
|
||||
- "/usr/lib/libcrypto.dylib"))
|
||||
- (:cygwin (:or "cygcrypto-1.1.dll" "cygcrypto-1.0.0.dll")))
|
||||
+ (t "@openssl@/lib/libcrypto.so"))
|
||||
|
||||
(cffi:define-foreign-library libssl
|
||||
- (:windows (:or "libssl32.dll" "ssleay32.dll"))
|
||||
- (: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)
|
||||
@ -128,11 +127,13 @@ index 3f6aa35d0..ac4012363 100644
|
||||
- ;; 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.0.2m"
|
||||
- ((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"
|
||||
@ -142,49 +143,12 @@ index 3f6aa35d0..ac4012363 100644
|
||||
- "libssl.so.10"
|
||||
- "libssl.so.4"
|
||||
- "libssl.so"))
|
||||
- (:cygwin "cygssl-1.0.0.dll")
|
||||
- (:cygwin (:or "cygssl-1.1.dll" "cygssl-1.0.0.dll"))
|
||||
- (t (:default "libssl3")))
|
||||
-
|
||||
-(cffi:define-foreign-library libeay32
|
||||
- (:windows "libeay32.dll"))
|
||||
+ (t "@openssl@/lib/libssl.so"))
|
||||
|
||||
+(cffi:define-foreign-library libeay32)
|
||||
|
||||
(unless (member :cl+ssl-foreign-libs-already-loaded
|
||||
*features*)
|
||||
diff --git a/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp b/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp
|
||||
index cda8dc94c..11035ea09 100644
|
||||
--- a/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp
|
||||
+++ b/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp
|
||||
@@ -106,26 +106,8 @@
|
||||
; Glue
|
||||
|
||||
|
||||
-#-sbcl
|
||||
(defun find-bash ()
|
||||
- #+windows "bash.exe"
|
||||
- #-windows "bash")
|
||||
-
|
||||
-#+sbcl
|
||||
-;; SBCL (on Linux, at least) won't successfully run "bash" all by itself. So,
|
||||
-;; on SBCL, try to find a likely bash. BOZO this probably isn't great. It
|
||||
-;; would be better to search the user's PATH for which bash to use.
|
||||
-(let ((found-bash))
|
||||
- (defun find-bash ()
|
||||
- (or found-bash
|
||||
- (let ((paths-to-try '("/bin/bash"
|
||||
- "/usr/bin/bash"
|
||||
- "/usr/local/bin/bash")))
|
||||
- (loop for path in paths-to-try do
|
||||
- (when (cl-fad::file-exists-p path)
|
||||
- (setq found-bash path)
|
||||
- (return-from find-bash path)))
|
||||
- (error "Bash not found among ~s" paths-to-try)))))
|
||||
+ "@bash@/bin/bash")
|
||||
|
||||
#+(or allegro lispworks)
|
||||
(defstruct bashprocess
|
||||
--
|
||||
2.25.4
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From b0ccf68f277d0bd5e6fc9d41742f31ddda99a955 Mon Sep 17 00:00:00 2001
|
||||
From: Keshav Kini <keshav.kini@gmail.com>
|
||||
Date: Mon, 1 Jun 2020 21:42:24 -0700
|
||||
Subject: [PATCH 2/2] Restrict RDTSC to x86
|
||||
|
||||
Backported from [1]. According to Curtis Dunham, this should fix the ACL2 base
|
||||
system build on ARM.
|
||||
|
||||
[1]: https://github.com/acl2/acl2/commit/292fa2ccc6217e6307d7bb8373eb90f5d258ea5e
|
||||
---
|
||||
memoize-raw.lisp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/memoize-raw.lisp b/memoize-raw.lisp
|
||||
index 205e78653..478198dee 100644
|
||||
--- a/memoize-raw.lisp
|
||||
+++ b/memoize-raw.lisp
|
||||
@@ -189,7 +189,7 @@
|
||||
;; RDTSC nonsense, but we still can report mysterious results since we have no
|
||||
;; clue about which core we are running on in CCL (or, presumably, SBCL).
|
||||
|
||||
-#+(or ccl sbcl)
|
||||
+#+(and (or ccl sbcl) x86-64)
|
||||
(eval-when
|
||||
(:execute :compile-toplevel :load-toplevel)
|
||||
(when #+ccl (fboundp 'ccl::rdtsc)
|
||||
--
|
||||
2.25.4
|
||||
|
||||
@ -1,50 +1,53 @@
|
||||
{ lib, stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll
|
||||
{ lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll
|
||||
, sbcl, bash, which, perl, nettools
|
||||
, openssl, glucose, minisat, abc-verifier, z3, python2
|
||||
, openssl, glucose, minisat, abc-verifier, z3, python
|
||||
, certifyBooks ? true
|
||||
} @ args:
|
||||
|
||||
let
|
||||
# Disable immobile space so we don't run out of memory on large books; see
|
||||
# Disable immobile space so we don't run out of memory on large books, and
|
||||
# supply 2GB of dynamic space to avoid exhausting the heap while building the
|
||||
# ACL2 system itself; see
|
||||
# https://www.cs.utexas.edu/users/moore/acl2/current/HTML/installation/requirements.html#Obtaining-SBCL
|
||||
sbcl = args.sbcl.override { disableImmobileSpace = true; };
|
||||
|
||||
# Wrap to add `-model` argument because some of the books in 8.3 need this.
|
||||
# Fixed upstream (https://github.com/acl2/acl2/commit/0359538a), so this can
|
||||
# be removed in ACL2 8.4.
|
||||
glucose = writeShellScriptBin "glucose" ''exec ${args.glucose}/bin/glucose -model "$@"'';
|
||||
sbcl' = args.sbcl.override { disableImmobileSpace = true; };
|
||||
sbcl = runCommandLocal args.sbcl.name { buildInputs = [ makeWrapper ]; } ''
|
||||
makeWrapper ${sbcl'}/bin/sbcl $out/bin/sbcl \
|
||||
--add-flags "--dynamic-space-size 2000"
|
||||
'';
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "acl2";
|
||||
version = "8.3";
|
||||
version = "8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acl2-devel";
|
||||
repo = "acl2-devel";
|
||||
rev = version;
|
||||
sha256 = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5";
|
||||
sha256 = "16rr9zqmd3y1sd6zxff2f9gdd84l99pr7mdp1sjwmh427h661c68";
|
||||
};
|
||||
|
||||
libipasirglucose4 = callPackage ./libipasirglucose4 { };
|
||||
# You can swap this out with any other IPASIR implementation at
|
||||
# build time by using overrideAttrs (make sure the derivation you
|
||||
# use has a "libname" attribute so we can plug it into the patch
|
||||
# below). Or, you can override it at runtime by setting the
|
||||
# $IPASIR_SHARED_LIBRARY environment variable.
|
||||
libipasir = callPackage ./libipasirglucose4 { };
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./0001-Fix-some-paths-for-Nix-build.patch;
|
||||
inherit bash libipasirglucose4;
|
||||
openssl = openssl.out;
|
||||
})
|
||||
./0002-Restrict-RDTSC-to-x86.patch
|
||||
];
|
||||
patches = [(substituteAll {
|
||||
src = ./0001-Fix-some-paths-for-Nix-build.patch;
|
||||
libipasir = "${libipasir}/lib/${libipasir.libname}";
|
||||
openssl = openssl.out;
|
||||
})];
|
||||
|
||||
buildInputs = [
|
||||
# ACL2 itself only needs a Common Lisp compiler/interpreter:
|
||||
sbcl
|
||||
] ++ lib.optionals certifyBooks [
|
||||
# To build community books, we need Perl and a couple of utilities:
|
||||
which perl nettools
|
||||
which perl nettools makeWrapper
|
||||
# Some of the books require one or more of these external tools:
|
||||
openssl.out glucose minisat abc-verifier libipasirglucose4
|
||||
z3 (python2.withPackages (ps: [ ps.z3 ]))
|
||||
openssl.out glucose minisat abc-verifier libipasir
|
||||
z3 (python.withPackages (ps: [ ps.z3 ]))
|
||||
];
|
||||
|
||||
# NOTE: Parallel building can be memory-intensive depending on the number of
|
||||
@ -71,7 +74,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preBuild = "mkdir -p $HOME";
|
||||
makeFlags="LISP=${sbcl}/bin/sbcl";
|
||||
makeFlags = "LISP=${sbcl}/bin/sbcl ACL2_MAKE_LOG=NONE";
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "mini-proveall";
|
||||
@ -90,8 +93,13 @@ in stdenv.mkDerivation rec {
|
||||
# Certify the community books
|
||||
pushd $out/share/${pname}/books
|
||||
makeFlags="ACL2=$out/share/${pname}/saved_acl2"
|
||||
buildFlags="everything"
|
||||
buildFlags="all"
|
||||
buildPhase
|
||||
|
||||
# Clean up some stuff to save space
|
||||
find -name '*@useless-runes.lsp' -execdir rm {} + # saves ~1GB of space
|
||||
find -name '*.cert.out' -execdir gz {} + # saves ~400MB of space
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
|
||||
@ -1,17 +1,14 @@
|
||||
{ lib, stdenv, fetchurl, zlib, unzip }:
|
||||
|
||||
let
|
||||
|
||||
cxx = "${stdenv.cc.targetPrefix}c++";
|
||||
libName = "libipasirglucose4" + stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libipasirglucose4";
|
||||
# This library has no version number AFAICT (beyond generally being based on
|
||||
# Glucose 4.x), but it was submitted to the 2017 SAT competition so let's use
|
||||
# that as the version number, I guess.
|
||||
version = "2017";
|
||||
|
||||
libname = pname + stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip";
|
||||
sha256 = "0xchgady9vwdh8frmc8swz6va53igp2wj1y9sshd0g7549n87wdj";
|
||||
@ -23,16 +20,16 @@ in stdenv.mkDerivation rec {
|
||||
sourceRoot = "sat/glucose4";
|
||||
patches = [ ./0001-Support-shared-library-build.patch ];
|
||||
|
||||
makeFlags = [ "CXX=${cxx}" ];
|
||||
makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ];
|
||||
|
||||
postBuild = ''
|
||||
${cxx} -shared -o ${libName} \
|
||||
${if stdenv.cc.isClang then "" else "-Wl,-soname,${libName}"} \
|
||||
$CXX -shared -o ${libname} \
|
||||
${if stdenv.cc.isClang then "" else "-Wl,-soname,${libname}"} \
|
||||
ipasirglucoseglue.o libipasirglucose4.a
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -D ${libName} $out/lib/${libName}
|
||||
install -D ${libname} $out/lib/${libname}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxlsxwriter";
|
||||
version = "1.1.1";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmcnamara";
|
||||
repo = "libxlsxwriter";
|
||||
rev = "RELEASE_${version}";
|
||||
sha256 = "1bi8a1pj18836yfqsnmfp45nqhq2d9r2r7gzi2v1y0qyk9jh6xln";
|
||||
sha256 = "sha256-j+tplk8Fdx92YKj7PnchMZWctVmBmNirUmDw5ADmJy0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
|
||||
|
||||
let
|
||||
version = "4.1.0";
|
||||
version = "4.2.1";
|
||||
libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
@ -13,7 +13,7 @@ in stdenv.mkDerivation {
|
||||
owner = "oracle";
|
||||
repo = "odpi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zk08z74q7njbj329xfy8aszphj27rqlkhsyglai60wfzl6mcf4x";
|
||||
sha256 = "sha256-jdDMG6+bvsKQkHSpUrwtwU/ngq1iINcUhWu2b9lJgPY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gensim";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a9c9fed52e2901ad04f9caf73a5dd782e5ce8054f71b346d72f04ddff1b7b432";
|
||||
sha256 = "b4d0b9562796968684028e06635e0f7aff39ffb33719057fd1667754ea09a6e4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ smart-open numpy six scipy ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-D4lVTOiHdsMzqw/1kpNdvk3GX1y/stUaCCplXPu2/88=";
|
||||
sha256 = "53d02ba86d53613833ca54ddad097ae048b2aa4f6e7a435a4de979d89abb8be0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "numcodecs";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7c7d0ea56b5e2a267ae785bdce47abed62829ef000f03be8e32e30df62d3749c";
|
||||
sha256 = "63e75114131f704ff46ca2fe437fdae6429bfd9b4377e356253eb5dacc9e093a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyfaidx";
|
||||
version = "0.5.9.5";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9965644c5bd62bedc0ff7f336cbb2baef6406a36b4ec5c786b199872ce46192b";
|
||||
sha256 = "fae5d2264f62f40e6f37090422a764197de610df36afb5ae827b167d34b8621a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfpgaloader";
|
||||
version = "0.2.6";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trabucayre";
|
||||
repo = "openFPGALoader";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OWRMWNOPm6flgeTKYWYE+LcG3HW6i8s2NQ1dr/oeOEw=";
|
||||
sha256 = "sha256-g1mr7S9Z70A+dXWptZPLHt90JpuclJAEDwUTicpxtic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.280";
|
||||
version = "4.4.281";
|
||||
extraMeta.branch = "4.4";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1b9jx9zkycj0xjmy35890q5phiznayaz730dmsv3mdjg4qgfn18y";
|
||||
sha256 = "12grr2vc2mcvy7k8w1apqs9mhfg0lvz6mrpksym234m4n5yy48ng";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.279";
|
||||
version = "4.9.280";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "01rf3xh2jcz6l2h79g0m02i8f9q51j64wvgvzi8lmq0gx9yvbv91";
|
||||
sha256 = "0am9qg9j18j4fc5zi6bk1g0mi8dp31pl62wlihxhhkc5yspzrna3";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.13.10";
|
||||
version = "5.13.11";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "01fpj02q4vdn7i6f6710lly0w33cd5gfvn6avgrjglcbiwdzbjih";
|
||||
sha256 = "0za59652wrh4mlhd9w3dx4y1nnk8nrj9hb56pssgdckdvp7rp4l0";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vips";
|
||||
version = "8.10.6";
|
||||
version = "8.11.2";
|
||||
|
||||
outputs = [ "bin" "out" "man" "dev" ];
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "libvips";
|
||||
repo = "libvips";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hdpkBC76PnPTN+rnNchLVk1CrhcClTtbaWyUcyUtuAk=";
|
||||
sha256 = "sha256-Psb+LrpTWtZwO9ekOLJIXsy8W49jW4Jdi+EmiJ+1MsQ=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
extraPostFetch = ''
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osm2pgsql";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstreetmap";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PHr9wP+DgsiQAvrVNO8Aa/X/dkrAUnlPDwAzSISa0GM=";
|
||||
sha256 = "sha256-0mUGvu5o2MhlriNAUAUoyDrFgTw2weGGbQcBzaauKEQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nzbget";
|
||||
version = "21.0";
|
||||
version = "21.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz";
|
||||
sha256 = "0lwd0pfrs4a5ms193hgz2qiyf7grrc925dw6y0nfc0gkp27db9b5";
|
||||
sha256 = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lethe";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kostassoid";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "173ms4fd09iclm4v5zkmvc60l6iyyb5lzxc6dxd6q21zy0pvs35g";
|
||||
sha256 = "sha256-WYDO44S2cBPe14vv/4i51tgtnoR+6FN2GyAbjJ7AYy8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "11l7wxadinidf0bsxv14j1kv8gdhq1d6ffnb76n54igxid8gza14";
|
||||
cargoSha256 = "sha256-5fWclZgt5EuWrsYRheTX9otNiGbJ41Q/fTYdKMWRMHc=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
# Remove INSTALL file to avoid `make` misinterpreting it as an up-to-date
|
||||
# target on case-insensitive filesystems e.g. Darwin
|
||||
preInstall = ''
|
||||
rm -v INSTALL
|
||||
'';
|
||||
|
||||
configureFlags = [ "--disable-wordview" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user