mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 07:00:43 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
60b1048b91
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
description = "Library of low-level helper functions for nix expressions.";
|
||||
|
||||
outputs = { self }: { lib = import ./lib; };
|
||||
outputs = { self }: { lib = import ./.; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,9 +61,9 @@ let
|
|||
|
||||
missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers);
|
||||
|
||||
success = pkgs.runCommandNoCC "checked-maintainers-success" {} ">$out";
|
||||
success = pkgs.runCommand "checked-maintainers-success" {} ">$out";
|
||||
|
||||
failure = pkgs.runCommandNoCC "checked-maintainers-failure" {
|
||||
failure = pkgs.runCommand "checked-maintainers-failure" {
|
||||
nativeBuildInputs = [ pkgs.curl pkgs.jq ];
|
||||
outputHash = "sha256:${lib.fakeSha256}";
|
||||
outputHAlgo = "sha256";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }
|
||||
}:
|
||||
|
||||
pkgs.runCommandNoCC "nixpkgs-lib-tests" {
|
||||
pkgs.runCommand "nixpkgs-lib-tests" {
|
||||
buildInputs = [
|
||||
pkgs.nix
|
||||
(import ./check-eval.nix)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ pkgs: with pkgs.lib;
|
|||
rec {
|
||||
|
||||
# Copy configuration files to avoid having the entire sources in the system closure
|
||||
copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} ''
|
||||
copyFile = filePath: pkgs.runCommand (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} ''
|
||||
cp ${filePath} $out
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ let
|
|||
# nslcd normally reads configuration from /etc/nslcd.conf.
|
||||
# this file might contain secrets. We append those at runtime,
|
||||
# so redirect its location to something more temporary.
|
||||
nslcdWrapped = runCommandNoCC "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } ''
|
||||
nslcdWrapped = runCommand "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${nss_pam_ldapd}/sbin/nslcd $out/bin/nslcd \
|
||||
--set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ in
|
|||
protocols.source = pkgs.iana-etc + "/etc/protocols";
|
||||
|
||||
# /etc/hosts: Hostname-to-IP mappings.
|
||||
hosts.source = pkgs.runCommandNoCC "hosts" {} ''
|
||||
hosts.source = pkgs.runCommand "hosts" {} ''
|
||||
cat ${escapeShellArgs cfg.hostFiles} > $out
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ let
|
|||
mkWrapperDrv = {
|
||||
original, name, set ? {}
|
||||
}:
|
||||
pkgs.runCommandNoCC "${name}-wrapper" {
|
||||
pkgs.runCommand "${name}-wrapper" {
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
} (with lib; ''
|
||||
makeWrapper "${original}" "$out/bin/${name}" \
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
|
||||
jsonType = (pkgs.formats.json {}).type;
|
||||
|
||||
configFile = pkgs.runCommandNoCC "matrix-appservice-irc.yml" {
|
||||
configFile = pkgs.runCommand "matrix-appservice-irc.yml" {
|
||||
# Because this program will be run at build time, we need `nativeBuildInputs`
|
||||
nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ];
|
||||
preferLocalBuild = true;
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ in
|
|||
(rev: archs:
|
||||
lib.attrsets.mapAttrsToList
|
||||
(arch: image:
|
||||
pkgs.runCommandNoCC "buildsrht-images" { } ''
|
||||
pkgs.runCommand "buildsrht-images" { } ''
|
||||
mkdir -p $out/${distro}/${rev}/${arch}
|
||||
ln -s ${image}/*.qcow2 $out/${distro}/${rev}/${arch}/root.img.qcow2
|
||||
'')
|
||||
|
|
@ -97,7 +97,7 @@ in
|
|||
"${pkgs.sourcehut.buildsrht}/lib/images"
|
||||
];
|
||||
};
|
||||
image_dir = pkgs.runCommandNoCC "builds.sr.ht-worker-images" { } ''
|
||||
image_dir = pkgs.runCommand "builds.sr.ht-worker-images" { } ''
|
||||
mkdir -p $out/images
|
||||
cp -Lr ${image_dir_pre}/* $out/images
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
# a wrapper that verifies that the configuration is valid
|
||||
promtoolCheck = what: name: file:
|
||||
if cfg.checkConfig then
|
||||
pkgs.runCommandNoCCLocal
|
||||
pkgs.runCommandLocal
|
||||
"${name}-${replaceStrings [" "] [""] what}-checked"
|
||||
{ buildInputs = [ cfg.package ]; } ''
|
||||
ln -s ${file} $out
|
||||
|
|
@ -19,7 +19,7 @@ let
|
|||
|
||||
# Pretty-print JSON to a file
|
||||
writePrettyJSON = name: x:
|
||||
pkgs.runCommandNoCCLocal name {} ''
|
||||
pkgs.runCommandLocal name {} ''
|
||||
echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
toYAML = name: attrs: pkgs.runCommandNoCC name {
|
||||
toYAML = name: attrs: pkgs.runCommand name {
|
||||
preferLocalBuild = true;
|
||||
json = builtins.toFile "${name}.json" (builtins.toJSON attrs);
|
||||
nativeBuildInputs = [ pkgs.remarshal ];
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ let
|
|||
};
|
||||
|
||||
# Additional /etc/hosts entries for peers with an associated hostname
|
||||
cjdnsExtraHosts = pkgs.runCommandNoCC "cjdns-hosts" {} ''
|
||||
cjdnsExtraHosts = pkgs.runCommand "cjdns-hosts" {} ''
|
||||
exec >$out
|
||||
${concatStringsSep "\n" (mapAttrsToList (k: v:
|
||||
optionalString (v.hostname != "")
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ in
|
|||
createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.database.type == "postgresql";
|
||||
createLocalMySQL = databaseActuallyCreateLocally && cfg.database.type == "mysql";
|
||||
|
||||
mySqlCaKeystore = pkgs.runCommandNoCC "mysql-ca-keystore" {} ''
|
||||
mySqlCaKeystore = pkgs.runCommand "mysql-ca-keystore" {} ''
|
||||
${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.database.caCert} -keystore $out -storepass notsosecretpassword -noprompt
|
||||
'';
|
||||
|
||||
|
|
@ -553,7 +553,7 @@ in
|
|||
|
||||
jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig');
|
||||
|
||||
keycloakConfig = pkgs.runCommandNoCC "keycloak-config" {
|
||||
keycloakConfig = pkgs.runCommand "keycloak-config" {
|
||||
nativeBuildInputs = [ cfg.package ];
|
||||
} ''
|
||||
export JBOSS_BASE_DIR="$(pwd -P)";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
cfg = config.services.node-red;
|
||||
defaultUser = "node-red";
|
||||
finalPackage = if cfg.withNpmAndGcc then node-red_withNpmAndGcc else cfg.package;
|
||||
node-red_withNpmAndGcc = pkgs.runCommandNoCC "node-red" {
|
||||
node-red_withNpmAndGcc = pkgs.runCommand "node-red" {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
}
|
||||
''
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ let
|
|||
defaultListen =
|
||||
if vhost.listen != [] then vhost.listen
|
||||
else
|
||||
let addrs = if vhost.listenAddresses != [] then vhost.listenAddreses else (
|
||||
let addrs = if vhost.listenAddresses != [] then vhost.listenAddresses else (
|
||||
[ "0.0.0.0" ] ++ optional enableIPv6 "[::0]"
|
||||
);
|
||||
in
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
podmanPackage = (pkgs.podman.override { inherit (cfg) extraPackages; });
|
||||
|
||||
# Provides a fake "docker" binary mapping to podman
|
||||
dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" {
|
||||
dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" {
|
||||
outputs = [ "out" "man" ];
|
||||
inherit (podmanPackage) meta;
|
||||
} ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }:
|
||||
let
|
||||
gpgKeyring = (pkgs.runCommandNoCC "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } ''
|
||||
gpgKeyring = (pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } ''
|
||||
mkdir -p $out
|
||||
export GNUPGHOME=$out
|
||||
cat > foo <<EOF
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y
|
||||
'';
|
||||
|
||||
tls-cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||
tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' -days 36500
|
||||
mkdir -p $out
|
||||
cp key.pem cert.pem $out
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ let
|
|||
return EXIT_SUCCESS;
|
||||
}
|
||||
'';
|
||||
in pkgs.runCommandNoCC "mpitest" {} ''
|
||||
in pkgs.runCommand "mpitest" {} ''
|
||||
mkdir -p $out/bin
|
||||
${pkgs.openmpi}/bin/mpicc ${mpitestC} -o $out/bin/mpitest
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||
};
|
||||
};
|
||||
|
||||
cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||
cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=dns.example.local'
|
||||
mkdir -p $out
|
||||
cp key.pem cert.pem $out
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
cert = pkgs: pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||
cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500
|
||||
mkdir -p $out
|
||||
cp key.pem cert.pem $out
|
||||
|
|
|
|||
|
|
@ -116,5 +116,6 @@ rustPlatform.buildRustPackage rec {
|
|||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ck3d ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "neovide";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
with python3.pkgs; buildPythonApplication rec {
|
||||
pname = "khal";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-L92PwU/ll+Wn1unGPHho2WC07QIbVjxoSnHwcJDtpDI=";
|
||||
sha256 = "3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "klayout";
|
||||
version = "0.26.10";
|
||||
version = "0.27.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h2jCmLZ2pRlK8VblQosBX0ZcoHDnn4oYeSqzA3y1Tzg=";
|
||||
sha256 = "sha256-6g/QoR16rhUfxhH4JxL6EERcoPVG/6MOxUlo6K/WoE0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -17,10 +17,12 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
preInstall = ''
|
||||
substituteInPlace unipicker --replace "/etc/unipickerrc" "$out/etc/unipickerrc"
|
||||
substituteInPlace unipickerrc --replace "/usr/local" "$out"
|
||||
substituteInPlace unipicker --replace "fzf" "${fzf}/bin/fzf"
|
||||
substituteInPlace unipickerrc --replace "fzf" "${fzf}/bin/fzf"
|
||||
substituteInPlace unipicker \
|
||||
--replace "/etc/unipickerrc" "$out/etc/unipickerrc" \
|
||||
--replace "fzf" "${fzf}/bin/fzf"
|
||||
substituteInPlace unipickerrc \
|
||||
--replace "/usr/local" "$out" \
|
||||
--replace "fzf" "${fzf}/bin/fzf"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
|
|
@ -33,6 +35,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/jeremija/unipicker";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kiyengar ];
|
||||
platforms = with platforms; unix;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "writefreely";
|
||||
version = "0.12.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "writeas";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6LpRfDu3xvE1eIRLfZliKnzsrrG5pjjf2ydxn9HQJJU=";
|
||||
sha256 = "sha256-qYceijC/u8G9vr7uhApWWyWD9P65pLJCTjePEvh+oXA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-U17AkMJQr/OIMED0i2ThcNVw3+aOvRLbpLNP/wEv6k8=";
|
||||
vendorSha256 = "sha256-CBPvtc3K9hr1oEmC+yUe3kPSWx20k6eMRqoxsf3NfCE=";
|
||||
|
||||
nativeBuildInputs = [ go-bindata ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ in
|
|||
};
|
||||
edge = generic {
|
||||
channel = "edge";
|
||||
version = "21.7.4";
|
||||
sha256 = "sha256-yorxP4SQVV6MWlx8+8l0f7qOaF7aJ1XiPfnMqKC8m/o=";
|
||||
vendorSha256 = "sha256-2ZDsBiIV9ng8P0cDURbqDqMTxFKUFcBxHsPGWp5WjPo=";
|
||||
version = "21.8.2";
|
||||
sha256 = "sha256-jMYJ/mLWvuje4ZRuRbzMaqhz8kyn1bYGITJxkyw5Fyg=";
|
||||
vendorSha256 = "sha256-18QB2GOxHfnP4GQaF0aohY5kEOg0xN/c+Sp33Ww/1uQ=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "temporal";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DskJtZGp8zmSWC5GJijNbhwKQF0Y0FXXh7wCzlbAgy8=";
|
||||
sha256 = "sha256-SVcjKiIJqHYYO/zu0u/9GFR4Cg3jZvaVlZFfeCkXJoc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI=";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
wrapProgram $out/bin/listadmin \
|
||||
--prefix PERL5LIB : "${with perl.pkgs; makeFullPerlPath [
|
||||
TextReform NetINET6Glue LWPProtocolhttps
|
||||
TextReform NetINET6Glue LWPProtocolHttps
|
||||
]}"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nextdns";
|
||||
version = "1.11.0";
|
||||
version = "1.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextdns";
|
||||
repo = "nextdns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gnWFgzfMMnn8O7zDN5LW3cMIz5/wmgEW9fI9aJBEah8=";
|
||||
sha256 = "sha256-AWbUtzh1kJayhg/ssJUqUX4ywIV2Oy1BgTorhb+x3Vg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc=";
|
||||
vendorSha256 = "sha256-EEDRJj5Iaglk0Y86XL/U512OjipBNJzcAv8Tb09a0g0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "onedrive";
|
||||
version = "2.4.12";
|
||||
version = "2.4.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abraunegg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rG9W90+wGLnhnfhqJjUIFGP6ZcmaxGkrdhPxQVRyxoc=";
|
||||
sha256 = "sha256-v1GSHwcP9EQaADIEKO14yotJBEEatbKugVJOCsTLr2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "agenda";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dahenson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-K6ZtYllxBzLUPS2qeSxtplXqayB1m49sqmB28tHDS14=";
|
||||
sha256 = "sha256-tzGcqCxIkoBNskpadEqv289Sj5bij9u+LdYySiGdop8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
, libsoup, gnome }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "homebank-5.5.3";
|
||||
pname = "homebank";
|
||||
version = "5.5.3";
|
||||
src = fetchurl {
|
||||
url = "http://homebank.free.fr/public/${name}.tar.gz";
|
||||
url = "http://homebank.free.fr/public/homebank-${version}.tar.gz";
|
||||
sha256 = "sha256-BzYHkYqWEAh3kfNvWecNEmH+6OThFGpc/VhxodLZEJM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
buildInputs = [ gtk libofx intltool libsoup
|
||||
gnome.adwaita-icon-theme ];
|
||||
buildInputs = [ gtk libofx intltool libsoup gnome.adwaita-icon-theme ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free, easy, personal accounting for everyone";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ appimageTools, fetchurl, lib, runCommandNoCC, stdenv, gsettings-desktop-schemas, gtk3, zlib }:
|
||||
{ appimageTools, fetchurl, lib, runCommand, stdenv, gsettings-desktop-schemas, gtk3, zlib }:
|
||||
|
||||
let
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -12,7 +12,7 @@ let
|
|||
inherit name;
|
||||
src = appimage;
|
||||
};
|
||||
patched = runCommandNoCC "minetime-patchelf" {} ''
|
||||
patched = runCommand "minetime-patchelf" {} ''
|
||||
cp -av ${extracted} $out
|
||||
|
||||
x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "skrooge";
|
||||
version = "2.24.6";
|
||||
version = "2.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-DReIm9lcq0j761wWTpJu7HnfEWz9QsRGgUtyVaXFs6A=";
|
||||
url = "https://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-66hoA+FDTeMbNAInr9TlTSnwUywJQjTRz87MkdNYn5Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -30,6 +30,7 @@ mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DSKG_DESIGNER=OFF"
|
||||
"-DSKG_WEBENGINE=ON"
|
||||
"-DSKG_WEBKIT=OFF"
|
||||
"-DBUILD_TESTS=ON"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "urh";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jopohl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0s8zlq2bx6hp8c522rkxj9kbkf3a0qj6iyg7q9dcxmcl3q2sanq9";
|
||||
sha256 = "0ibcr2ypnyl2aq324sbmmr18ksxszg81yrhybawx46ba9vym6j99";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "glances";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicolargo";
|
||||
repo = "glances";
|
||||
rev = "v${version}";
|
||||
sha256 = "13w7bxfizsfi3xyhharnindyn3dv3p9p54a4xwyhnnhczs8kqa8s";
|
||||
sha256 = "1nc8bdzzrzaircq3myd32w6arpy2prn739886cq2h47cpinxmvpr";
|
||||
};
|
||||
|
||||
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitea
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, runCommandNoCC
|
||||
, runCommand
|
||||
, fcft
|
||||
, freetype
|
||||
, pixman
|
||||
|
|
@ -54,7 +54,7 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
stimuliFile = runCommandNoCC "pgo-stimulus-file" { } ''
|
||||
stimuliFile = runCommand "pgo-stimulus-file" { } ''
|
||||
${stimulusGenerator} \
|
||||
--rows=67 --cols=135 \
|
||||
--scroll --scroll-region \
|
||||
|
|
|
|||
|
|
@ -59,13 +59,13 @@ in
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "20210502-154244-3f7122cb";
|
||||
version = "20210814-124438-54e29167";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "9HPhb7Vyy5DwBW1xeA6sEIBmmOXlky9lPShu6ZoixPw=";
|
||||
sha256 = "sha256-6HXTftgAs6JMzOMCY+laN74in8xfjE8yJc5xSl9PQCE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec {
|
|||
echo ${version} > .tag
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-cbZg2wc3G2ffMQBB6gd0vBbow5GRbXaj8Xh5ga1cMxU=";
|
||||
cargoSha256 = "sha256-yjTrWoqIKoRV4oZQ0mfTGrIGmm89AaKJd16WL1Ozhnw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.7";
|
||||
version = "3.8";
|
||||
pname = "xtermcontrol";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz";
|
||||
sha256 = "04m12ddaps5sdbqvkwkp6lh81i8vh5ya5gzcxkrkilsga3m6qff2";
|
||||
sha256 = "sha256-Vh6GNiDkjNhaD9U/3fG2LpMLN39L3jRUgG/FQeG1z40=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcompare";
|
||||
version = "4.3.7.25118";
|
||||
version = "4.4.0.25886";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
|
||||
sha256 = "165d6d81vy29pr62y4rcvl4abqqhfwdzcsx77p0dqlzgqswj88v8";
|
||||
sha256 = "sha256-zQZrCjXzoOZ5o5M4t1n5/HhGoGTcZSj5rlf9Uz9UZko=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@ source 'https://rubygems.org'
|
|||
ruby '>= 2.4.0', '< 2.8.0'
|
||||
gem 'bundler', '>= 1.12.0'
|
||||
|
||||
gem 'rails', '5.2.5'
|
||||
gem 'rails', '5.2.6'
|
||||
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
|
||||
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
|
||||
gem 'rouge', '~> 3.26.0'
|
||||
gem 'request_store', '~> 1.5.0'
|
||||
gem "mini_mime", "~> 1.0.1"
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
actioncable (5.2.6)
|
||||
actionpack (= 5.2.6)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailer (5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
actionview (= 5.2.5)
|
||||
activejob (= 5.2.5)
|
||||
actionmailer (5.2.6)
|
||||
actionpack (= 5.2.6)
|
||||
actionview (= 5.2.6)
|
||||
activejob (= 5.2.6)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (5.2.5)
|
||||
actionview (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
actionpack (5.2.6)
|
||||
actionview (= 5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
rack (~> 2.0, >= 2.0.8)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
|
|
@ -21,31 +21,31 @@ GEM
|
|||
actionpack-xml_parser (2.0.1)
|
||||
actionpack (>= 5.0)
|
||||
railties (>= 5.0)
|
||||
actionview (5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
actionview (5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activejob (5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
activejob (5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
activerecord (5.2.5)
|
||||
activemodel (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
activemodel (5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
activerecord (5.2.6)
|
||||
activemodel (= 5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
arel (>= 9.0)
|
||||
activestorage (5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
activerecord (= 5.2.5)
|
||||
activestorage (5.2.6)
|
||||
actionpack (= 5.2.6)
|
||||
activerecord (= 5.2.6)
|
||||
marcel (~> 1.0.0)
|
||||
activesupport (5.2.5)
|
||||
activesupport (5.2.6)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.7.0)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
arel (9.0.0)
|
||||
ast (2.4.2)
|
||||
|
|
@ -60,19 +60,19 @@ GEM
|
|||
xpath (~> 3.2)
|
||||
childprocess (3.0.0)
|
||||
chunky_png (1.4.0)
|
||||
concurrent-ruby (1.1.8)
|
||||
concurrent-ruby (1.1.9)
|
||||
crass (1.0.6)
|
||||
css_parser (1.9.0)
|
||||
css_parser (1.10.0)
|
||||
addressable
|
||||
csv (3.1.9)
|
||||
docile (1.3.5)
|
||||
docile (1.4.0)
|
||||
erubi (1.10.0)
|
||||
globalid (0.4.2)
|
||||
activesupport (>= 4.2.0)
|
||||
globalid (0.5.2)
|
||||
activesupport (>= 5.0)
|
||||
htmlentities (4.3.4)
|
||||
i18n (1.8.10)
|
||||
concurrent-ruby (~> 1.0)
|
||||
loofah (2.9.1)
|
||||
loofah (2.12.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
|
|
@ -81,21 +81,21 @@ GEM
|
|||
method_source (1.0.0)
|
||||
mini_magick (4.11.0)
|
||||
mini_mime (1.0.3)
|
||||
mini_portile2 (2.5.1)
|
||||
mini_portile2 (2.5.3)
|
||||
minitest (5.14.4)
|
||||
mocha (1.12.0)
|
||||
mocha (1.13.0)
|
||||
mysql2 (0.5.3)
|
||||
net-ldap (0.17.0)
|
||||
nio4r (2.5.7)
|
||||
nokogiri (1.11.3)
|
||||
nio4r (2.5.8)
|
||||
nokogiri (1.11.7)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
parallel (1.20.1)
|
||||
parser (3.0.1.0)
|
||||
parser (3.0.2.0)
|
||||
ast (~> 2.4.1)
|
||||
pg (1.2.3)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.2.2)
|
||||
puma (5.4.0)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.5.2)
|
||||
rack (2.2.3)
|
||||
|
|
@ -104,32 +104,32 @@ GEM
|
|||
ruby-openid (>= 2.1.8)
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rails (5.2.5)
|
||||
actioncable (= 5.2.5)
|
||||
actionmailer (= 5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
actionview (= 5.2.5)
|
||||
activejob (= 5.2.5)
|
||||
activemodel (= 5.2.5)
|
||||
activerecord (= 5.2.5)
|
||||
activestorage (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
rails (5.2.6)
|
||||
actioncable (= 5.2.6)
|
||||
actionmailer (= 5.2.6)
|
||||
actionpack (= 5.2.6)
|
||||
actionview (= 5.2.6)
|
||||
activejob (= 5.2.6)
|
||||
activemodel (= 5.2.6)
|
||||
activerecord (= 5.2.6)
|
||||
activestorage (= 5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
bundler (>= 1.3.0)
|
||||
railties (= 5.2.5)
|
||||
railties (= 5.2.6)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.3.0)
|
||||
loofah (~> 2.3)
|
||||
railties (5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
railties (5.2.6)
|
||||
actionpack (= 5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
method_source
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.19.0, < 2.0)
|
||||
rainbow (3.0.0)
|
||||
rake (13.0.3)
|
||||
rake (13.0.6)
|
||||
rbpdf (1.20.1)
|
||||
htmlentities
|
||||
rbpdf-font (~> 1.19.0)
|
||||
|
|
@ -147,10 +147,10 @@ GEM
|
|||
roadie (>= 3.1, < 5.0)
|
||||
rotp (6.2.0)
|
||||
rouge (3.26.0)
|
||||
rqrcode (1.2.0)
|
||||
rqrcode (2.0.0)
|
||||
chunky_png (~> 1.0)
|
||||
rqrcode_core (~> 0.2)
|
||||
rqrcode_core (0.2.0)
|
||||
rqrcode_core (~> 1.0)
|
||||
rqrcode_core (1.1.0)
|
||||
rubocop (1.12.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.0.0.0)
|
||||
|
|
@ -160,8 +160,8 @@ GEM
|
|||
rubocop-ast (>= 1.2.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.4.1)
|
||||
parser (>= 2.7.1.5)
|
||||
rubocop-ast (1.10.0)
|
||||
parser (>= 3.0.1.1)
|
||||
rubocop-performance (1.10.2)
|
||||
rubocop (>= 0.90.0, < 2.0)
|
||||
rubocop-ast (>= 0.4.0)
|
||||
|
|
@ -171,7 +171,7 @@ GEM
|
|||
rubocop (>= 0.90.0, < 2.0)
|
||||
ruby-openid (2.9.2)
|
||||
ruby-progressbar (1.11.0)
|
||||
rubyzip (2.3.0)
|
||||
rubyzip (2.3.2)
|
||||
selenium-webdriver (3.142.7)
|
||||
childprocess (>= 0.5, < 4.0)
|
||||
rubyzip (>= 1.2.2)
|
||||
|
|
@ -195,7 +195,7 @@ GEM
|
|||
nokogiri (~> 1.6)
|
||||
rubyzip (>= 1.3.0)
|
||||
selenium-webdriver (>= 3.0, < 4.0)
|
||||
websocket-driver (0.7.3)
|
||||
websocket-driver (0.7.5)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.5)
|
||||
xpath (3.2.0)
|
||||
|
|
@ -224,7 +224,7 @@ DEPENDENCIES
|
|||
pg (~> 1.2.2)
|
||||
puma
|
||||
rack-openid
|
||||
rails (= 5.2.5)
|
||||
rails (= 5.2.6)
|
||||
rails-dom-testing
|
||||
rbpdf (~> 1.20.0)
|
||||
redcarpet (~> 3.5.1)
|
||||
|
|
@ -245,7 +245,7 @@ DEPENDENCIES
|
|||
yard
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.6.6p146
|
||||
ruby 2.7.3p183
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "redmine-env-${version}";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ in
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1d217fhyvncpwahwlinr3vc20vn7jijaxxk1i56gw72z8b1hjhdd";
|
||||
sha256 = "1xlqf7g5imjmc3as2aajvbrs217jh3qpdvvpsd9mka9rk4kykyz6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16g623zz4nnwj236xms4n85jbc2b1imddqsx3gd4x4b7xqlwlw9p";
|
||||
sha256 = "1s778lwghaf0zwfvbhzvjq691rl75d85raiqg1c7zly8p9afq8ym";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
actionmailer = {
|
||||
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
|
||||
|
|
@ -16,10 +16,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ifmlwlm4bs6gm3y4c701wkhyf4ym4kia44npz9fbc92ariawn2z";
|
||||
sha256 = "0gwvn4lrkhqmxp96npjp4sfaz78h9ab2lrl20sjph7xxakfwknld";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -27,10 +27,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m";
|
||||
sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
actionpack-xml_parser = {
|
||||
dependencies = ["actionpack" "railties"];
|
||||
|
|
@ -49,10 +49,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i";
|
||||
sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
activejob = {
|
||||
dependencies = ["activesupport" "globalid"];
|
||||
|
|
@ -60,10 +60,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00k5fl4bx9qmrkwn8mdfdh8h2did0bnr3nc3g0fdyvm7ql9981jc";
|
||||
sha256 = "1cdvxkbzbs4cdh4bgf2cg7i886a20gvr43hg76kx5rzd8xal7xnd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
activemodel = {
|
||||
dependencies = ["activesupport"];
|
||||
|
|
@ -71,10 +71,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b";
|
||||
sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport" "arel"];
|
||||
|
|
@ -82,10 +82,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj";
|
||||
sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
activestorage = {
|
||||
dependencies = ["actionpack" "activerecord" "marcel"];
|
||||
|
|
@ -93,10 +93,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1706qircxl9agrq5423zv0i9p7gvcxcligw8vvclk049hks87gqd";
|
||||
sha256 = "0wnzac1qs4y339p13xyr03rx4ql3i4ywzfhyzn118d2zz82xnpfl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
|
|
@ -104,10 +104,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj";
|
||||
sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
|
|
@ -115,10 +115,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
|
||||
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
};
|
||||
arel = {
|
||||
groups = ["default"];
|
||||
|
|
@ -186,10 +186,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.8";
|
||||
version = "1.1.9";
|
||||
};
|
||||
crass = {
|
||||
groups = ["default"];
|
||||
|
|
@ -207,10 +207,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751";
|
||||
sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
};
|
||||
csv = {
|
||||
groups = ["default"];
|
||||
|
|
@ -227,10 +227,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z";
|
||||
sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.5";
|
||||
version = "1.4.0";
|
||||
};
|
||||
erubi = {
|
||||
groups = ["default"];
|
||||
|
|
@ -248,10 +248,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
|
||||
sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.2";
|
||||
version = "0.5.2";
|
||||
};
|
||||
htmlentities = {
|
||||
groups = ["default"];
|
||||
|
|
@ -280,10 +280,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
|
||||
sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.9.1";
|
||||
version = "2.12.0";
|
||||
};
|
||||
mail = {
|
||||
dependencies = ["mini_mime"];
|
||||
|
|
@ -341,10 +341,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
|
||||
sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.1";
|
||||
version = "2.5.3";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -361,10 +361,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a";
|
||||
sha256 = "15s53ggsykk69kxqvs4416s8yxdhz6caggva55n8sjgy4ixzwp10";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
};
|
||||
mysql2 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -399,10 +399,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5";
|
||||
sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.7";
|
||||
version = "2.5.8";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
|
|
@ -410,10 +410,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
|
||||
sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.3";
|
||||
version = "1.11.7";
|
||||
};
|
||||
parallel = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -431,10 +431,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04ri489irbbx6sbkclpgri7j7p99v2qib5g2i70xx5fay12ilny8";
|
||||
sha256 = "06ma6w87ph8lnc9z4hi40ynmcdnjv0p8x53x0s3fjkz4q2p6sxh5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.1.0";
|
||||
version = "3.0.2.0";
|
||||
};
|
||||
pg = {
|
||||
groups = ["default"];
|
||||
|
|
@ -470,10 +470,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k";
|
||||
sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.2";
|
||||
version = "5.4.0";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -523,10 +523,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p0sa36sngmfkmykcv5qhpr7rzsrc42cd9flhnxjs3r5b0jsl52c";
|
||||
sha256 = "1p17dmifd0v3knh9wja4z4rv0qaybwansnwxmvx6f3rcgkszkpnc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
rails-dom-testing = {
|
||||
dependencies = ["activesupport" "nokogiri"];
|
||||
|
|
@ -556,10 +556,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9";
|
||||
sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -576,10 +576,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
|
||||
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "13.0.3";
|
||||
version = "13.0.6";
|
||||
};
|
||||
rbpdf = {
|
||||
dependencies = ["htmlentities" "rbpdf-font"];
|
||||
|
|
@ -691,20 +691,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0f1cv9a9sjqc898qm3h7zmkhwglrjw5blsskbg3gsaws01d4bc47";
|
||||
sha256 = "073w0qgjydkqpsqsb9yr8qg0mhvwlzx6z53hqr2b5zifvb9wzh02";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
version = "2.0.0";
|
||||
};
|
||||
rqrcode_core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00kqasqja8zyzqvlgiwd9r0wndqk01qk5j68a8lhlz4ayrd4qy0y";
|
||||
sha256 = "0d632w2pd34bw9l3bsfnyqaa8vgbz9pxpj29gpf8parqr7wq922k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
version = "1.1.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
|
|
@ -723,10 +723,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78";
|
||||
sha256 = "0x6za0j9wwxr14rkkkmpbnwj04lak4yjmkyrdl8c31m9acba80zw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.1";
|
||||
version = "1.10.0";
|
||||
};
|
||||
rubocop-performance = {
|
||||
dependencies = ["rubocop" "rubocop-ast"];
|
||||
|
|
@ -775,10 +775,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
|
||||
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.3.2";
|
||||
};
|
||||
selenium-webdriver = {
|
||||
dependencies = ["childprocess" "rubyzip"];
|
||||
|
|
@ -892,10 +892,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh";
|
||||
sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.3";
|
||||
version = "0.7.5";
|
||||
};
|
||||
websocket-extensions = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ runCommandNoCC, lib, makeWrapper, wayfirePlugins }:
|
||||
{ runCommand, lib, makeWrapper, wayfirePlugins }:
|
||||
|
||||
let
|
||||
inherit (lib) escapeShellArg makeBinPath;
|
||||
|
|
@ -17,7 +17,7 @@ let
|
|||
plugins = choosePlugins wayfirePlugins;
|
||||
in
|
||||
|
||||
runCommandNoCC "${application.name}-wrapped" {
|
||||
runCommand "${application.name}-wrapped" {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
passthru = application.passthru // {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Builder for Agda packages.
|
||||
|
||||
{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, ghcWithPackages, nixosTests }:
|
||||
{ stdenv, lib, self, Agda, runCommand, makeWrapper, writeText, ghcWithPackages, nixosTests }:
|
||||
|
||||
with lib.strings;
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ let
|
|||
'';
|
||||
pname = "agdaWithPackages";
|
||||
version = Agda.version;
|
||||
in runCommandNoCC "${pname}-${version}" {
|
||||
in runCommand "${pname}-${version}" {
|
||||
inherit pname version;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@ rec {
|
|||
layeredStoreSymlink =
|
||||
let
|
||||
target = pkgs.writeTextDir "dir/target" "Content doesn't matter.";
|
||||
symlink = pkgs.runCommandNoCC "symlink" {} "ln -s ${target} $out";
|
||||
symlink = pkgs.runCommand "symlink" {} "ln -s ${target} $out";
|
||||
in
|
||||
pkgs.dockerTools.buildLayeredImage {
|
||||
name = "layeredstoresymlink";
|
||||
|
|
|
|||
|
|
@ -13,10 +13,17 @@
|
|||
, urls ? []
|
||||
, extraPostFetch ? ""
|
||||
, name ? "source"
|
||||
, # Allows to set the extension for the intermediate downloaded
|
||||
# file. This can be used as a hint for the unpackCmdHooks to select
|
||||
# an appropriate unpacking tool.
|
||||
extension ? null
|
||||
, ... } @ args:
|
||||
|
||||
(fetchurl (let
|
||||
basename = baseNameOf (if url != "" then url else builtins.head urls);
|
||||
tmpFilename =
|
||||
if extension != null
|
||||
then "download.${extension}"
|
||||
else baseNameOf (if url != "" then url else builtins.head urls);
|
||||
in {
|
||||
inherit name;
|
||||
|
||||
|
|
@ -30,7 +37,7 @@ in {
|
|||
mkdir "$unpackDir"
|
||||
cd "$unpackDir"
|
||||
|
||||
renamed="$TMPDIR/${basename}"
|
||||
renamed="$TMPDIR/${tmpFilename}"
|
||||
mv "$downloadedFile" "$renamed"
|
||||
unpackFile "$renamed"
|
||||
''
|
||||
|
|
@ -56,7 +63,7 @@ in {
|
|||
+ ''
|
||||
chmod 755 "$out"
|
||||
'';
|
||||
} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: {
|
||||
} // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" ])).overrideAttrs (x: {
|
||||
# Hackety-hack: we actually need unzip hooks, too
|
||||
nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];
|
||||
})
|
||||
|
|
|
|||
5
pkgs/build-support/nuget-to-nix/default.nix
Normal file
5
pkgs/build-support/nuget-to-nix/default.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{ runCommand }:
|
||||
|
||||
runCommand "nuget-to-nix" { preferLocalBuild = true; } ''
|
||||
install -D -m755 ${./nuget-to-nix.sh} $out/bin/nuget-to-nix
|
||||
''
|
||||
23
pkgs/build-support/nuget-to-nix/nuget-to-nix.sh
Executable file
23
pkgs/build-support/nuget-to-nix/nuget-to-nix.sh
Executable file
|
|
@ -0,0 +1,23 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [ $# -eq 0 ]; then
|
||||
>&2 echo "Usage: $0 [packages directory] > deps.nix"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
pkgs=$1
|
||||
|
||||
echo "{ fetchNuGet }: ["
|
||||
|
||||
while read pkg_spec; do
|
||||
{ read pkg_name; read pkg_version; } < <(
|
||||
# Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3`
|
||||
sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkg_spec")
|
||||
pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"
|
||||
|
||||
echo " (fetchNuGet { name = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })"
|
||||
done < <(find $1 -name '*.nuspec' | sort)
|
||||
|
||||
echo "]"
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2,
|
||||
openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3,
|
||||
libsodium, postgresql, gmp, foundationdb, capnproto, nettle, clang,
|
||||
llvmPackages, ... }:
|
||||
llvmPackages, linux-pam, ... }:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
|
|
@ -104,6 +104,10 @@ in
|
|||
buildInputs = [ openssl ];
|
||||
};
|
||||
|
||||
pam-sys = attr: {
|
||||
buildInputs = [ linux-pam ];
|
||||
};
|
||||
|
||||
pq-sys = attr: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
, cargoSetupHook
|
||||
, fetchCargoTarball
|
||||
, importCargoLock
|
||||
, runCommandNoCC
|
||||
, rustPlatform
|
||||
, callPackage
|
||||
, remarshal
|
||||
|
|
|
|||
51
pkgs/build-support/skaware/build-skaware-man-pages.nix
Normal file
51
pkgs/build-support/skaware/build-skaware-man-pages.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
{
|
||||
# : string
|
||||
pname
|
||||
# : string
|
||||
, version
|
||||
# : string
|
||||
, sha256
|
||||
# : list (int | string)
|
||||
, sections
|
||||
# : string
|
||||
, description
|
||||
# : list Maintainer
|
||||
, maintainers
|
||||
# : license
|
||||
, license ? lib.licenses.isc
|
||||
# : string
|
||||
, owner ? "flexibeast"
|
||||
# : string
|
||||
, rev ? "v${version}"
|
||||
}:
|
||||
|
||||
let
|
||||
manDir = "${placeholder "out"}/share/man";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner rev sha256;
|
||||
repo = pname;
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
makeFlags = [
|
||||
"MANPATH=${manDir}"
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
preInstall = lib.concatMapStringsSep "\n"
|
||||
(section: "mkdir -p \"${manDir}/man${builtins.toString section}\"")
|
||||
sections;
|
||||
|
||||
meta = with lib; {
|
||||
inherit description license maintainers;
|
||||
inherit (src.meta) homepage;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -24,16 +24,13 @@ rec {
|
|||
* `allowSubstitutes = false;`
|
||||
* to a derivation’s attributes.
|
||||
*/
|
||||
runCommand = runCommandNoCC;
|
||||
runCommandLocal = runCommandNoCCLocal;
|
||||
|
||||
runCommandNoCC = name: env: runCommandWith {
|
||||
runCommand = name: env: runCommandWith {
|
||||
stdenv = stdenvNoCC;
|
||||
runLocal = false;
|
||||
inherit name;
|
||||
derivationArgs = env;
|
||||
};
|
||||
runCommandNoCCLocal = name: env: runCommandWith {
|
||||
runCommandLocal = name: env: runCommandWith {
|
||||
stdenv = stdenvNoCC;
|
||||
runLocal = true;
|
||||
inherit name;
|
||||
|
|
|
|||
10
pkgs/data/documentation/execline-man-pages/default.nix
Normal file
10
pkgs/data/documentation/execline-man-pages/default.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{ lib, buildManPages }:
|
||||
|
||||
buildManPages {
|
||||
pname = "execline-man-pages";
|
||||
version = "2.8.0.1.1";
|
||||
sha256 = "0xv9v39na1qnd8cm4v7xb8wa4ap3djq20iws0lrqz7vn1w40i8b4";
|
||||
description = "Port of the documentation for the execline suite to mdoc";
|
||||
sections = [ 1 7 ];
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
10
pkgs/data/documentation/s6-man-pages/default.nix
Normal file
10
pkgs/data/documentation/s6-man-pages/default.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{ lib, buildManPages }:
|
||||
|
||||
buildManPages {
|
||||
pname = "s6-man-pages";
|
||||
version = "2.10.0.3.1";
|
||||
sha256 = "0q9b6v7kbyjsh390s4bw80kjdp92kih609vlmnpl1qzyrr6kivsg";
|
||||
description = "Port of the documentation for the s6 supervision suite to mdoc";
|
||||
sections = [ 1 7 ];
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
10
pkgs/data/documentation/s6-networking-man-pages/default.nix
Normal file
10
pkgs/data/documentation/s6-networking-man-pages/default.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{ lib, buildManPages }:
|
||||
|
||||
buildManPages {
|
||||
pname = "s6-networking-man-pages";
|
||||
version = "2.4.1.1.1";
|
||||
sha256 = "1qrqzm2r4rxf8hglz8k4laknjqcx1y0z1kjf636z91w1077qg0pn";
|
||||
description = "Port of the documentation for the s6-networking suite to mdoc";
|
||||
sections = [ 1 7 ];
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, runCommandNoCC, powerline }:
|
||||
{ lib, runCommand, powerline }:
|
||||
|
||||
let
|
||||
inherit (powerline) version;
|
||||
in runCommandNoCC "powerline-symbols-${version}" {
|
||||
in runCommand "powerline-symbols-${version}" {
|
||||
meta = {
|
||||
inherit (powerline.meta) license;
|
||||
priority = (powerline.meta.priority or 0) + 1;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "spdx-license-list-data";
|
||||
version = "3.13";
|
||||
version = "3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spdx";
|
||||
repo = "license-list-data";
|
||||
rev = "v${version}";
|
||||
sha256 = "184qfz8jifkd4jvqkdfmcgplf12cdx83gynb7mxzmkfg2xymlr0g";
|
||||
sha256 = "07fl31732bvcmm93fqrpa7pfq5ynxc1fpd8n9w2iah39lyz49sjm";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfdashboard";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
rev-prefix = "";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-Q6r9FoPl+vvqZWP5paAjT3VX3M/6TvqzrrGKPCH8+xo=";
|
||||
sha256 = "sha256-xoeqVsfvBH2zzQqDUJGiA47hgVvEkvVf9bNYQmyiytk=";
|
||||
|
||||
buildInputs = [
|
||||
clutter
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, stdenv, lib }:
|
||||
let
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
owner = "erlang-ls";
|
||||
repo = "erlang_ls";
|
||||
deps = import ./rebar-deps.nix {
|
||||
|
|
@ -18,7 +18,7 @@ rebar3Relx {
|
|||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "0szg9hx436cvy80sh94dzmf2rainnw3fjc84bv3hlzjwwzmxj9aw";
|
||||
sha256 = "sha256-miCl04qqrirVPubOs558yWvXP3Sgs3bcDuGO9DZIsow=";
|
||||
rev = version;
|
||||
};
|
||||
releaseType = "escript";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextpnr";
|
||||
version = "2021.07.28";
|
||||
version = "2021.08.06";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr";
|
||||
rev = "39a7381928359934788aefd670c835dedbbf2cd7";
|
||||
sha256 = "1rs95vp5m3fdvhmjilj2r2g54xlabd3vy8wii1ammajqkyamy8x3";
|
||||
rev = "dd6376433154e008045695f5420469670b0c3a88";
|
||||
sha256 = "197k0a3cjnwinr4nnx7gqvpfi0wdhnmsmvcx12166jg7m1va5kw7";
|
||||
name = "nextpnr";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yosys";
|
||||
version = "0.9+4221";
|
||||
version = "0.9+4272";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "yosys";
|
||||
rev = "9600f20be887b707f6d5d3f74dec58b336e2464e";
|
||||
sha256 = "0xbvbnhc6qvcq1c8zxfyf4ws959c824z660nrghfxyzkrjl8wi1h";
|
||||
rev = "83c0f82dc842fc859dfb4b19e766b23f965cfbb3";
|
||||
sha256 = "08lyx2fp34fvnv0lj77r5v3s9a0zr32ywpcz0v8i6wwscjfbp8ba";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, fetchgit
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, runCommandNoCC
|
||||
, llvmPackages_5
|
||||
, glibc
|
||||
, ncurses
|
||||
|
|
@ -85,7 +84,7 @@ let
|
|||
# https://github.com/root-project/cling/blob/v0.7/lib/Interpreter/CIFactory.cpp#L107:L111
|
||||
# Note: it would be nice to just put the compiler in Cling's PATH and let it do this by itself, but
|
||||
# unfortunately passing -nostdinc/-nostdinc++ disables Cling's autodetection logic.
|
||||
compilerIncludeFlags = runCommandNoCC "compiler-include-flags.txt" {} ''
|
||||
compilerIncludeFlags = runCommand "compiler-include-flags.txt" {} ''
|
||||
export LC_ALL=C
|
||||
${stdenv.cc}/bin/c++ -xc++ -E -v /dev/null 2>&1 | sed -n -e '/^.include/,''${' -e '/^ \/.*++/p' -e '}' > tmp
|
||||
sed -e 's/^/-isystem /' -i tmp
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ interpreter, writeText, runCommandNoCC }:
|
||||
{ interpreter, writeText, runCommand }:
|
||||
|
||||
let
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ let
|
|||
print(s)
|
||||
'';
|
||||
|
||||
in runCommandNoCC "${interpreter.name}-site-prefix-mypy-test" {} ''
|
||||
in runCommand "${interpreter.name}-site-prefix-mypy-test" {} ''
|
||||
${pythonEnv}/bin/mypy ${pythonScript}
|
||||
touch $out
|
||||
''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-io";
|
||||
version = "0.9.1";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0lx72p9xmmnjkz4zkfb1lz0ibw0jsy52qpydhvn56bq85nv44rwx";
|
||||
sha256 = "sha256-+H6dUKgpgXG1fh8r6k7TpVFMBso4G762zRfLAZD+Nss=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "embree";
|
||||
version = "3.13.0";
|
||||
version = "3.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "embree";
|
||||
repo = "embree";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-w93GYslQRg0rvguMKv/CuT3+JzIis2CRbY9jYUFKWOM=";
|
||||
sha256 = "sha256-6BL/NnveIMg+xD8Zsc3sidL0iw0YbJITgd8Zf4Mh28I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcft";
|
||||
version = "2.4.4";
|
||||
version = "2.4.5";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fcft";
|
||||
rev = version;
|
||||
sha256 = "0ycc2xy9jhxcxwbfk9d4jdxgf2zsc664phbf859kshb822m3jf57";
|
||||
sha256 = "0z4bqap88pydkgcxrsvm3fmcyhi9x7z8knliarvdcvqlk7qnyzfh";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "erfa";
|
||||
version = "1.7.1";
|
||||
version = "2.0.0";
|
||||
|
||||
buildInputs = [ autoreconfHook ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "liberfa";
|
||||
repo = "erfa";
|
||||
rev = "v${version}";
|
||||
sha256 = "0j7v9y7jsw9vjmhdpksq44ah2af10b9gl1vfm8riw178lvf246wg";
|
||||
sha256 = "sha256-xBE8mWwmvlu0v3Up5y6J8jMhToMSACdKeQzPJoG8LWk=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-shared" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, lib, buildPackages, fetchurl, gettext
|
||||
, fetchpatch
|
||||
, genPosixLockObjOnly ? false
|
||||
}: let
|
||||
genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly {
|
||||
|
|
@ -24,6 +25,15 @@ in stdenv.mkDerivation (rec {
|
|||
sha256 = "sha256-/AfnD2xhX4xPWQqON6m43S4soelAj45gRZxnRSuSXiM=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (with stdenv; buildPlatform != hostPlatform) [
|
||||
# Fix cross-compilation, remove in next release
|
||||
# TODO apply unconditionally
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gpg/libgpg-error/commit/33593864cd54143db594c4237bba41e14179061c.patch";
|
||||
sha256 = "1jnd7flaj5nlc7spa6mwwygmh5fajw1n8js8f23jpw4pbgvgdv4r";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
|
||||
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpg_query";
|
||||
version = "13-2.0.5";
|
||||
version = "13-2.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pganalyze";
|
||||
repo = "libpg_query";
|
||||
rev = version;
|
||||
sha256 = "1jr95hrqmxdqvn1546x04hdhp1aq7dv7881rspar14ksz7f7382r";
|
||||
sha256 = "sha256-xplp7Z17NlYbXIbBdN7EWDN4numdZUBIIVg5EowFMPA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqalculate";
|
||||
version = "3.19.0";
|
||||
version = "3.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w44407wb552q21dz4m2nwwdi8b9hzjb2w1l3ffsikzqckc7wbyj";
|
||||
sha256 = "sha256-8SYI8CoeTfZXX0CgLnfl0rHwUZbYM7OGYzFQ41jm5Qs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -63,11 +63,6 @@ let
|
|||
};
|
||||
|
||||
in {
|
||||
libressl_3_1 = generic {
|
||||
version = "3.1.5";
|
||||
sha256 = "1504a1sf43frw43j14pij0q1f48rm5q86ggrlxxhw708qp7ds4rc";
|
||||
};
|
||||
|
||||
libressl_3_2 = generic {
|
||||
version = "3.2.5";
|
||||
sha256 = "1zkwrs3b19s1ybz4q9hrb7pqsbsi8vxcs44qanfy11fkc7ynb2kr";
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libyaml-cpp";
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbeder";
|
||||
repo = "yaml-cpp";
|
||||
rev = "yaml-cpp-${version}";
|
||||
sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s";
|
||||
sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk=";
|
||||
};
|
||||
|
||||
# implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oneDNN";
|
||||
version = "2.2.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-orsllgBt2EHuZOy9vkgDK3XT6BfbtyIPvO4REB9tAgs=";
|
||||
sha256 = "sha256-sfTcBthrnt7m9AnzdwWl9yLu1jRpwUp8i9s9DlA3IJo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, runCommandNoCC
|
||||
, runCommand
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, perl
|
||||
|
|
@ -172,7 +172,7 @@ stdenv.mkDerivation rec {
|
|||
# (We pick just that one because using the other headers from `sdk` is not
|
||||
# compatible with our C++ standard library. This header is already in
|
||||
# the standard library on aarch64)
|
||||
runCommandNoCC "${pname}_headers" {} ''
|
||||
runCommand "${pname}_headers" {} ''
|
||||
install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h
|
||||
''
|
||||
) ++ lib.optionals stdenv.isLinux [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }:
|
||||
let
|
||||
pname = "couchbase";
|
||||
version = "3.1.2";
|
||||
version = "3.2.0";
|
||||
in
|
||||
buildPecl {
|
||||
inherit pname version;
|
||||
|
|
@ -10,7 +10,7 @@ buildPecl {
|
|||
owner = "couchbase";
|
||||
repo = "php-couchbase";
|
||||
rev = "v${version}";
|
||||
sha256 = "0zm2jm5lzjjqlhkiivm4v5gr4286pwqaf5nar1ga816hhwnyhj42";
|
||||
sha256 = "sha256-rvlyH28xWLIVwK3yqqdhkoD1h6kl8FDq3Byo7mhV3jM=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-couchbase" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "icmplib";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValentinBELYN";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i5cmL8kOrehldOwX2RfVAfL4HdzJ+9S3BojJI2raUSA=";
|
||||
sha256 = "sha256-avCy/s54JOeHf6py4sPDV+QC2oq2AU6A6J2YOnrQsm0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.2.11";
|
||||
version = "2.2.13";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E95tUg1gglDXfeCTead2c1e0JOynKu+TBd4LKklrtAE=";
|
||||
sha256 = "sha256-lKdFHynKraN+eUeO1hFzoNsdMzRgmnBHQzPuKLH0Xvs=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pytest
|
||||
, pytest-runner
|
||||
, future
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -17,13 +16,24 @@ buildPythonPackage rec {
|
|||
sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest pytest-runner ];
|
||||
propagatedBuildInputs = [ future ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [ "tests/Test*.py" ];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/bear/parsedatetime/issues/263
|
||||
"testDate3ConfusedHourAndYear"
|
||||
# https://github.com/bear/parsedatetime/issues/215
|
||||
"testFloat"
|
||||
];
|
||||
|
||||
pythonImportChecks = [ "parsedatetime" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parse human-readable date/time text";
|
||||
homepage = "https://github.com/bear/parsedatetime";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue