cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'nixpkgs/staging-next' into staging

Browse source 
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
This commit is contained in:
Alyssa Ross 2021-11-14 14:17:46 +00:00
commit 4e1852096f
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
193 changed files with 1915 additions and 627 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View file

@ -26,7 +26,7 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-
- and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests)
- or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test)
- made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
- [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking

26
maintainers/maintainer-list.nix
View file

@ -2810,6 +2810,12 @@
githubId = 2439413;
name = "Derek Gonyeo";
};
dguenther = {
email = "dguenther9@gmail.com";
github = "dguenther";
githubId = 767083;
name = "Derek Guenther";
};
dhkl = {
email = "david@davidslab.com";
github = "dhl";
@ -6507,6 +6513,10 @@
github = "legendofmiracles";
githubId = 30902201;
name = "legendofmiracles";
keys = [{
longkeyid = "rsa4096/0x19B082B3DEFE5451";
fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451";
}];
};
lejonet = {
email = "daniel@kuehn.se";
@ -9644,6 +9654,16 @@
githubId = 500703;
name = "Tadas Barzdžius";
};
revol-xut = {
email = "revol-xut@protonmail.com";
name = "Tassilo Tanneberger";
github = "revol-xut";
githubId = 32239737;
keys = [{
longkeyid = "rsa4096/B966009D57E69CC6";
fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6";
}];
};
rexim = {
email = "reximkut@gmail.com";
github = "rexim";
@ -13146,4 +13166,10 @@
github = "zupo";
githubId = 311580;
};
sei40kr = {
name = "Seong Yong-ju";
email = "sei40kr@gmail.com";
github = "sei40kr";
githubId = 11665236;
};
}

2
nixos/modules/services/cluster/kubernetes/kubelet.nix
View file

@ -258,6 +258,8 @@ in
"net.bridge.bridge-nf-call-ip6tables" = 1;
};
systemd.enableUnifiedCgroupHierarchy = false; # true breaks node memory metrics
systemd.services.kubelet = {
description = "Kubernetes Kubelet Service";
wantedBy = [ "kubernetes.target" ];

1
nixos/tests/all-tests.nix
View file

@ -109,6 +109,7 @@ in
docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
documize = handleTest ./documize.nix {};
dokuwiki = handleTest ./dokuwiki.nix {};
domination = handleTest ./domination.nix {};
dovecot = handleTest ./dovecot.nix {};
ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};
ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};

26
nixos/tests/domination.nix Normal file
View file

@ -0,0 +1,26 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "domination";
meta = with pkgs.lib.maintainers; {
maintainers = [ fgaz ];
};
machine = { config, pkgs, ... }: {
imports = [
./common/x11.nix
];
services.xserver.enable = true;
environment.systemPackages = [ pkgs.domination ];
};
enableOCR = true;
testScript =
''
machine.wait_for_x()
machine.execute("domination >&2 &")
machine.wait_for_window("Menu")
machine.wait_for_text("New Game")
machine.screenshot("screen")
'';
})

8
pkgs/applications/audio/bespokesynth/default.nix
View file

@ -106,7 +106,13 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Software modular synth with controllers support, scripting and VST";
homepage = "https://github.com/awwbees/BespokeSynth";
license = licenses.gpl3Plus;
license = with licenses; [
gpl3Plus
# This package is unfree and not distributable due to the license of VST2.
# see #145607
unfree
];
maintainers = with maintainers; [ astro ];
platforms = platforms.all;
};

4
pkgs/applications/blockchains/lightwalletd/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lightwalletd";
version = "0.4.7";
version = "0.4.8";
src = fetchFromGitHub {
owner = "zcash";
repo = "lightwalletd";
rev = "v${version}";
sha256 = "0dwam3fhc4caga7kjg6cc06sz47g4ii7n3sa4j2ac4aiy21hsbjk";
sha256 = "sha256-3cjXQXJqdmAMc+APybAKbpBhTy8Pk/QyBygSa8pGGAs=";
};
vendorSha256 = null;

4
pkgs/applications/editors/leo-editor/default.nix
View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "leo-editor";
version = "6.2.1";
version = "6.5";
src = fetchFromGitHub {
owner = "leo-editor";
repo = "leo-editor";
rev = version;
sha256 = "1s9jvxwzsl32clp78g92nq9p2byf08libr5widl1jnkv1cpkbvh9";
sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU=";
};
dontBuild = true;

12
pkgs/applications/misc/lifelines/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libiconv, bison, ncurses, perl, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "lifelines";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y";
};
patches = [
# Fix pending upstream inclusion for ncurses-6.3 support:
# https://github.com/lifelines/lifelines/pull/437
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/lifelines/lifelines/commit/e04ce2794d458c440787c191877fbbc0784447bd.patch";
sha256 = "1smnz4z5hfjas79bfvlnpw9x8199a5g0p9cvhf17zpcnz1432kg7";
})
];
buildInputs = [
gettext
libiconv

4
pkgs/applications/misc/mkgmap/default.nix
View file

@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
version = "4810";
version = "4813";
src = fetchurl {
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
sha256 = "j21WTEu+MTmnFrRH5B8Eb1tS2elFR715R8jhgKZ5Gmw=";
sha256 = "Zx3j3ITsL3eOMVYxKLnfzwPMkr+BQ+soK+zhzYbnnak=";
};
patches = [

4
pkgs/applications/misc/mkgmap/splitter/default.nix
View file

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "splitter";
version = "642";
version = "643";
src = fetchurl {
url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";
sha256 = "zMuMutkk0RsbEH+5undcMmZRCGYJ7LRvdK1pxAgQRYk=";
sha256 = "gyMCQAKnP4FDcHEgJiiftKhBEG9N92etpwKBnmIbzhU=";
};
patches = [

4
pkgs/applications/misc/nwg-wrapper/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "nwg-wrapper";
version = "0.0.2";
version = "0.1.0";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LkAB0MrwQxP3X7glfSnI0GZMv8tjaeSOz7WSOW33wuo=";
sha256 = "0xkxyfbj8zljx7k5wbniz3x9jg0l4jnbbjv8hy5y5p4l10m0vpjs";
};
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];

11
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -110,7 +110,10 @@ let
# When LTO for Darwin is fixed, the following will need updating as lld
# doesn't work on it. For now it is fine since ltoSupport implies no Darwin.
buildStdenv = if ltoSupport
then overrideCC stdenv llvmPackages.clangUseLLVM
# LTO requires LLVM bintools including ld.lld and llvm-ar.
then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
inherit (llvmPackages) bintools;
})
else stdenv;
# --enable-release adds -ffunction-sections & LTO that require a big amount of
@ -131,6 +134,12 @@ buildStdenv.mkDerivation ({
] ++
lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++
lib.optional (lib.versionAtLeast version "90") ./no-buildconfig-ffx90.patch ++
# This fixes a race condition causing deadlock.
# https://phabricator.services.mozilla.com/D128657
lib.optional (lib.versionAtLeast version "94") (fetchpatch {
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/9c7f25d45bb1dd6b1a865780bc249cdaa619aa83/trunk/0002-Bug-1735905-Upgrade-cubeb-pulse-to-fix-a-race-condit.patch";
sha256 = "l4bMK/YDXcDpIjPy9DPuUSFyDpzVQca201A4h9eav5g=";
}) ++
patches;
# Ignore trivial whitespace changes in patches, this fixes compatibility of

8
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.21.1";
sha256 = "1sb3912h28z097n7mn3hlh33hnxr9978h04py2m7gh27hmygscj3";
manifestsSha256 = "1rrnz50jfn3zgaz5hn7ghmgc31ahm4q49f0rxfagfygvks1h4910";
version = "0.23.0";
sha256 = "15j4r43hy3slyahx4am7lj7jns4x3axrcbr9qwiznmk8qbvrzrdy";
manifestsSha256 = "10rh0q1la5dq6n9y1yvw9ilj5lhzx8vh1zi2lznfjsvc5niwx7wf";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
@ -23,7 +23,7 @@ buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-m0uVatnV4GIyllZTOkLxXGEiAWXGloFfxSJn51y0AQo=";
vendorSha256 = "sha256-vFm9ai+VWOPLRckKJ7gfD/0iQ8b4o5HNQE4cekb0vA0=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

4
pkgs/applications/networking/cluster/kn/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kn";
version = "0.26.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "knative";
repo = "client";
rev = "v${version}";
sha256 = "sha256-hquxv1BluR535WvMtJlVyP7JuARDNGDjPAbdSSj2juo=";
sha256 = "sha256-nuSx+JKXBgkVwuy6RMZc8pxDv5WjXN3+5pIudazTttc=";
};
vendorSha256 = null;

4
pkgs/applications/networking/cluster/kubecfg/default.nix
View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "kubecfg";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "bitnami";
repo = "kubecfg";
rev = "v${version}";
sha256 = "sha256-Wu7+Xmb7ha3OG37DzLg2+/Sr9hB5oD3OIkC9h9Fa4QA=";
sha256 = "sha256-8U/A4F4DboS46ftpuk5fQGT2Y0V+X0y0L3/o4x8qpnY=";
};
goPackagePath = "github.com/bitnami/kubecfg";

4
pkgs/applications/networking/cluster/kubedb-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubedb-cli";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "kubedb";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-7e1VQ9uXNj6Lmnl1IXHLcADSLuK7Jgiww8acxtD4xFM=";
sha256 = "sha256-pAvaScbwGJMW3iFS26D71nImWsXcEVx7ONUP82f6QDQ=";
};
vendorSha256 = null;

9
pkgs/applications/networking/cluster/popeye/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "popeye";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
rev = "v${version}";
owner = "derailed";
repo = "popeye";
sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c=";
sha256 = "sha256-uGy2BbZS4SGT0w9ICYPUIfFawSvIVMsEezPfPAPQU/Q=";
};
ldflags = [
@ -21,6 +21,11 @@ buildGoModule rec {
doCheck = true;
doInstallCheck = true;
installCheckPhase = ''
$out/bin/popeye version | grep ${version} > /dev/null
'';
meta = with lib; {
description = "A Kubernetes cluster resource sanitizer";
homepage = "https://github.com/derailed/popeye";

36
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
View file

@ -40,43 +40,15 @@ assert builtins.elem (lib.toLower chatType) [
assert enablePsiMedia -> enablePlugins;
mkDerivation {
mkDerivation rec {
pname = "psi-plus";
# Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi
# and “-R” ending is optional revision number.
#
# The “psi-plus-snapshots” generally provides snapshots of these separate
# repositories glued together (there are also dependencies/libraries):
#
# 1. Psi
# 2. Plugins pack for Psi
# 3. “psimedia” plugin
# 4. Resources for Psi (icons, skins, sounds)
#
# “X.X.XXXX” is literally a version of Psi.
# So often when for instance plugins are updated separately a new snapshot is
# created. And that snapshot would also be linked to “X.X.XXXX” version.
# So many commits may have the same associated version of the snapshot.
# But mind that only one Git tag is created for “X.X.XXXX” version.
#
# It’s not yet defined in the Psi+ project what value to use as a version for
# any further releases that don’t change Psi version.
#
# Let’s do what Debian does for instance (appends “-R” where “R” is a revision
# number).
# E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/
#
# This has been communicated with the Psi+ main devs in this XMPP MUC chat:
# psi-dev@conference.jabber.ru
#
version = "1.5.1556-2";
version = "1.5.1576";
src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = "635879010b6697f7041a7bbea1853a1f4673c7f7";
sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a";
rev = version;
sha256 = "15iqa8hd4p968sp79zsi32g7bhamgg267pk2bxspl646viv91f6g";
};
cmakeFlags = [

2
pkgs/applications/office/libreoffice/default.nix
View file

@ -78,6 +78,8 @@ in (mkDrv rec {
tar -xf ${srcs.translations}
'';
patches = [ ./skip-failed-test-with-icu70.patch ];
### QT/KDE
#
# We have to resort to the ugly patching of configure.ac as it assumes that

29
pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch Normal file
View file

@ -0,0 +1,29 @@
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -35,7 +35,7 @@ public:
void testWeak();
void testAsian();
void testThai();
-#if (U_ICU_VERSION_MAJOR_NUM > 51)
+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)
void testLao();
#ifdef TODO
void testNorthernThai();
@@ -52,7 +52,7 @@ public:
CPPUNIT_TEST(testWeak);
CPPUNIT_TEST(testAsian);
CPPUNIT_TEST(testThai);
-#if (U_ICU_VERSION_MAJOR_NUM > 51)
+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)
CPPUNIT_TEST(testLao);
#ifdef TODO
CPPUNIT_TEST(testKhmer);
@@ -843,7 +843,7 @@ void TestBreakIterator::testAsian()
}
}
-#if (U_ICU_VERSION_MAJOR_NUM > 51)
+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)
//A test to ensure that our Lao word boundary detection is useful
void TestBreakIterator::testLao()
{

2
pkgs/applications/office/libreoffice/src-still/override.nix
View file

@ -9,5 +9,5 @@ attrs:
"--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
"--without-system-qrcodegen"
];
patches = [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2
patches = attrs.patches or [] ++ [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2
}

8
pkgs/applications/office/libreoffice/src-still/primary.nix
View file

@ -8,7 +8,7 @@ rec {
major = "7";
minor = "1";
patch = "6";
patch = "7";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1g1nlnmgxka1xj3800ra7j28y08k1irz7a24awx1gyjs9fci58qq";
sha256 = "T98ICdiAM4i9E6zis0V/Cmq5+e98mNb0bMZA//xelLo=";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "0kblfwcnsc0pz96wxmkghmchjd31h0w1wjxlqxqbqqpz3vbr61k3";
sha256 = "g8skm02R5nRyF09ZbL9kJqMxRqaQ0AfpletDK3AAggk=";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
sha256 = "1b28xqgvfnx62zgnxfisi58r7nhixvz35pmq8cb20ayxhdfg6v31";
sha256 = "jAFrO4RyONhPH3H5QW0SL8Id53bBvJ7AYxSNtLhG4rQ=";
};
}

11
pkgs/applications/science/logic/boolector/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, lib, python3
{ stdenv, fetchFromGitHub, lib, python3, fetchpatch
, cmake, lingeling, btor2tools, gtest, gmp
}:
@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z";
};
patches = [
# present in master - remove after 3.2.2
(fetchpatch {
name = "fix-parser-getc-char-casts.patch";
url = "https://github.com/Boolector/boolector/commit/cc3a70918538c1e71ea5e7273fa1ac098da37c1b.patch";
sha256 = "0pjvagcy74vxa2q75zbshcz8j7rvhl98549xfcf5y8yyxf5h8hyq";
})
];
postPatch = ''
sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1
'';

9
pkgs/applications/science/logic/lingeling/default.nix
View file

@ -4,15 +4,14 @@
stdenv.mkDerivation {
pname = "lingeling";
# This is the version used in satcomp2018, which was
# relicensed, and also known as version 'bcj'
version = "pre1_03b4860d";
# This is the version used in satcomp2020
version = "pre1_708beb26";
src = fetchFromGitHub {
owner = "arminbiere";
repo = "lingeling";
rev = "03b4860d14016f42213ea271014f2f13d181f504";
sha256 = "1lw1yfy219p7rrk88sbq4zl24b70040zapbjdrpv5a6i0jsblksx";
rev = "708beb26a7d5b5d5e7abd88d6f552fb1946b07c1";
sha256 = "1lb2g37nd8qq5hw5g6l691nx5095336yb2zlbaw43mg56hkj8357";
};
configurePhase = ''

4
pkgs/applications/version-management/git-and-tools/git-machete/default.nix
View file

@ -11,13 +11,13 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.4.1";
version = "3.5.0";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
sha256 = "sha256-drfMD9tQe1dc61MH3Cxu9oin137f4FsZJY3X2kDHdh4=";
sha256 = "sha256-kR37TClFMkoe4e46g/omfwZCrQFr7gukW7I70WI9+dw=";
};
nativeBuildInputs = [ installShellFiles ];

6
pkgs/applications/version-management/git-and-tools/glitter/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "glitter";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "milo123459";
repo = pname;
rev = "v${version}";
sha256 = "sha256-esrN6VH+ayc9DIhOLGR5oOaMjSBAc7u7fr8L1kSh4Gk=";
sha256 = "sha256-SJp/iRF5os0f+WsHnLtcqmj0uD7fe8iODJ4F+gpWtJo=";
};
cargoSha256 = "sha256-0ugr9HcJLsV34kKJs1E+n10tdOv09wkaYmkIodLhyLk=";
cargoSha256 = "sha256-CVqLwXgoHQjJ6NMyiZkxVaTO6qgzBQz8mH/6dsyhhYY=";
# tests require it to be in a git repository
preCheck = ''

4
pkgs/applications/video/dvd-slideshow/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg_3, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }:
{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }:
let
binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg_3 imagemagick lame mjpegtools sox transcode vorbis-tools ];
binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];
wrapper = writeScript "dvd-slideshow.sh" ''
#!${runtimeShell}

16
pkgs/applications/video/obs-studio/default.nix
View file

@ -21,16 +21,14 @@
, curl
, wayland
, xorg
, makeWrapper
, pkg-config
, libvlc
, mbedtls
, wrapGAppsHook
, scriptingSupport ? true
, luajit
, swig
, python3
, alsaSupport ? stdenv.isLinux
, alsa-lib
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
@ -68,7 +66,7 @@ mkDerivation rec {
addOpenGLRunpath
cmake
pkg-config
makeWrapper
wrapGAppsHook
]
++ optional scriptingSupport swig;
@ -121,9 +119,13 @@ mkDerivation rec {
"-DCEF_ROOT_DIR=../../cef"
];
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
];
dontWrapGApps = true;
preFixup = ''
qtWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
''${gappsWrapperArgs[@]}
)
'';
postFixup = lib.optionalString stdenv.isLinux ''
addOpenGLRunpath $out/lib/lib*.so

4
pkgs/applications/video/vdr/plugins.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg
, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
, callPackage
}: let
@ -52,7 +52,7 @@ in {
version = "20190525";
buildInputs = [
vdr libxcb xcbutilwm ffmpeg_3
vdr libxcb xcbutilwm ffmpeg
alsa-lib
libvdpau # vdpau
libva # va-api

4
pkgs/desktops/enlightenment/terminology/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "terminology";
version = "1.10.0";
version = "1.11.0";
src = fetchurl {
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
sha256 = "0imk7cjkcjss3zf4hjwmy54pbizm6l6pq553jcx7bpsnhs56bbsz";
sha256 = "0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome/apps/gnome-calendar/default.nix
View file

@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "gnome-calendar";
version = "41.0";
version = "41.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "0gqrxcn7fcvlh5c9691lx5zgdgs71ah15h5psrbhkg8qcqy95b3k";
sha256 = "m1EmsjPhuPic9MIyYIlXHYKakwPsieplz2IWTmp0IuE=";
};
patches = [

10
pkgs/development/compilers/dev86/default.nix
View file

@ -13,9 +13,17 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
# Parallel builds are not supported due to build process structure:
# tools are built sequentially in submakefiles and are reusing the
# same targets as dependencies. Building dependencies in parallel
# from different submakes is not synchronized and fails:
# make[3]: Entering directory '/build/dev86-0.16.21/libc'
# Unable to execute as86.
enableParallelBuilding = false;
meta = {
description = "Linux 8086 development environment";
homepage = "http://v3.sk/~lkundrak/dev86/";
homepage = "https://github.com/lkundrak/dev86";
platforms = lib.platforms.linux;
};
}

41
pkgs/development/compilers/lingua-franca/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ lib, pkgs, stdenv, fetchFromGitHub, jdk11_headless }:
stdenv.mkDerivation {
pname = "lfc";
version = "0.1.0";
src = fetchFromGitHub {
owner = "revol-xut";
repo = "lingua-franca-nix-releases";
rev = "11c6d5297cd63bf0b365a68c5ca31ec80083bd05";
sha256 = "DgxunzC8Ep0WdwChDHWgG5QJbJZ8UgQRXtP1HZqL9Jg=";
};
buildInputs = [ jdk11_headless ];
_JAVA_HOME = "${jdk11_headless}/";
postPatch = ''
substituteInPlace bin/lfc \
--replace 'base=`dirname $(dirname ''${abs_path})`' "base='$out'" \
--replace "run_lfc_with_args" "${jdk11_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-0.1.0-SNAPSHOT-all.jar"
'';
installPhase = ''
cp -r ./ $out/
chmod +x $out/bin/lfc
'';
meta = with lib; {
description = "Polyglot coordination language";
longDescription = ''
Lingua Franca (LF) is a polyglot coordination language for concurrent
and possibly time-sensitive applications ranging from low-level
embedded code to distributed cloud and edge applications.
'';
homepage = "https://github.com/lf-lang/lingua-franca";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ revol-xut ];
};
}

6
pkgs/development/embedded/fpga/trellis/default.nix
View file

@ -41,6 +41,12 @@ in stdenv.mkDerivation rec {
cd libtrellis
'';
postInstall = lib.optionalString stdenv.isDarwin ''
for f in $out/bin/* ; do
install_name_tool -change "$out/lib/libtrellis.dylib" "$out/lib/trellis/libtrellis.dylib" "$f"
done
'';
doInstallCheck = true;
installCheckPhase = ''

4
pkgs/development/interpreters/octave/default.nix
View file

@ -114,12 +114,12 @@ let
};
self = mkDerivation rec {
version = "6.3.0";
version = "6.4.0";
pname = "octave";
src = fetchurl {
url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
sha256 = "sha256-IyBl86cvwwE/6fF/Qpo99p1nLB9rYHcCmjHI881Ypm4=";
sha256 = "sha256-tI8z1Pzq85TPvqc6jIUAAJNtg6QXOaJPdWi1sKezms0=";
};
buildInputs = [

2
pkgs/development/libraries/boxfort/default.nix
View file

@ -29,5 +29,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ thesola10 Yumasi ];
platforms = platforms.unix;
# Upstream currently broken for macOS https://cirrus-ci.com/build/5624937369042944
broken = stdenv.targetPlatform.isDarwin;
};
}

3
pkgs/development/libraries/freeimage/default.nix
View file

@ -24,6 +24,9 @@ stdenv.mkDerivation {
--replace "pkg-config" "$PKG_CONFIG"
substituteInPlace Makefile.gnu \
--replace "pkg-config" "$PKG_CONFIG"
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
# Upstream Makefile hardcodes i386 and x86_64 architectures only
substituteInPlace Makefile.osx --replace "x86_64" "arm64"
'';
nativeBuildInputs = [

4
pkgs/development/libraries/hiredis/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hiredis";
version = "1.0.0";
version = "1.0.2";
src = fetchFromGitHub {
owner = "redis";
repo = "hiredis";
rev = "v${version}";
sha256 = "01xnynm9d56a0alb5wxbfayakybm5pnr12icj9mqkn4xxihbnbgr";
sha256 = "0a55zk3qrw9yl27i87h3brg2hskmmzbfda77dhq9a4if7y70xnfb";
};
PREFIX = "\${out}";

5
pkgs/development/libraries/isl/0.14.1.nix
View file

@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
name = "isl-0.14.1";
src = fetchurl {
url = "http://isl.gforge.inria.fr/${name}.tar.xz";
urls = [
"mirror://sourceforge/libisl/${name}.tar.xz"
"https://libisl.sourceforge.io/${name}.tar.xz"
];
sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8";
};

5
pkgs/development/libraries/isl/0.17.1.nix
View file

@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
name = "isl-0.17.1";
src = fetchurl {
url = "http://isl.gforge.inria.fr/${name}.tar.xz";
urls = [
"mirror://sourceforge/libisl/${name}.tar.xz"
"https://libisl.sourceforge.io/${name}.tar.xz"
];
sha256 = "be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647";
};

6
pkgs/development/libraries/isl/0.20.0.nix
View file

@ -4,7 +4,11 @@ stdenv.mkDerivation rec {
name = "isl-0.20";
src = fetchurl {
url = "http://isl.gforge.inria.fr/${name}.tar.xz";
urls = [
"mirror://sourceforge/libisl/${name}.tar.xz"
"https://libisl.sourceforge.io/${name}.tar.xz"
];
sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5";
};

36
pkgs/development/libraries/libsbsms/common.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchurl
, substituteAll
, pname
, version
, url
, sha256
, homepage
}:
stdenv.mkDerivation rec {
inherit pname version;
src = fetchurl {
inherit url sha256;
};
patches = [
# Fix buidling on platforms other than x86
(substituteAll {
src = ./configure.patch;
msse = lib.optionalString stdenv.isx86_64 "-msse";
})
];
doCheck = true;
meta = {
inherit homepage;
description = "Subband sinusoidal modeling library for time stretching and pitch scaling audio";
maintainers = with lib.maintainers; [ yuu ];
license = lib.licenses.gpl2;
platforms = lib.platforms.all;
};
}

22
pkgs/development/libraries/libsbsms/configure.patch Normal file
View file

@ -0,0 +1,22 @@
diff --git a/configure b/configure
index 3d40335..faa3ac6 100755
--- a/configure
+++ b/configure
@@ -14722,7 +14722,7 @@ if ${ax_cv_cxx_flags__msse+:} false; then :
else
ax_save_FLAGS=$CXXFLAGS
- CXXFLAGS="-msse"
+ CXXFLAGS="@msse@"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14747,7 +14747,7 @@ eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5
$as_echo "$ax_check_compiler_flags" >&6; }
if test "x$ax_check_compiler_flags" = xyes; then
- SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"
+ SBSMS_CFLAGS="$SBSMS_CFLAGS @msse@"
else
as_fn_error $? "Need a version of gcc with -msse" "$LINENO" 5
fi

22
pkgs/development/libraries/libsbsms/default.nix Normal file
View file

@ -0,0 +1,22 @@
let
pname = "libsbsms";
in
pkgs: rec {
libsbsms_2_0_2 = pkgs.callPackage ./common.nix rec {
inherit pname;
version = "2.0.2";
url = "mirror://sourceforge/sbsms/${pname}-${version}.tar.gz";
sha256 = "sha256-zqs9lwZkszcFe0a89VKD1Q0ynaY2v4PQ7nw24iNBru4=";
homepage = "https://sourceforge.net/projects/sbsms/files/sbsms";
};
libsbsms_2_3_0 = pkgs.callPackage ./common.nix rec {
inherit pname;
version = "2.3.0";
url = "https://github.com/claytonotey/${pname}/archive/refs/tags/${version}.tar.gz";
sha256 = "sha256-T4jRUrwG/tvanV1lUX1AJUpzEMkFBgGpMSIwnUWv0sk=";
homepage = "https://github.com/claytonotey/libsbsms";
};
libsbsms = libsbsms_2_0_2;
}

15
pkgs/development/libraries/luabind/default.nix
View file

@ -1,11 +1,14 @@
{lib, stdenv, fetchurl, boost-build, lua, boost}:
{ lib, stdenv, fetchFromGitHub, boost-build, lua, boost }:
stdenv.mkDerivation {
name = "luabind-0.9.1";
stdenv.mkDerivation rec {
pname = "luabind";
version = "0.9.1";
src = fetchurl {
url = "https://github.com/luabind/luabind/archive/v0.9.1.tar.gz";
sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d";
src = fetchFromGitHub {
owner = "luabind";
repo = "luabind";
rev = version;
sha256 = "sha256-sK1ca2Oj9yXdmxyXeDO3k8YZ1g+HxIXLhvdTWdPDdag=";
};
patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ];

8
pkgs/development/libraries/nco/default.nix
View file

@ -1,11 +1,13 @@
{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:
{ lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:
stdenv.mkDerivation rec {
pname = "nco";
version = "5.0.3";
src = fetchzip {
url = "https://github.com/nco/nco/archive/${version}.tar.gz";
src = fetchFromGitHub {
owner = "nco";
repo = "nco";
rev = version;
sha256 = "sha256-KrFRBlD3z/sjKIvxmE0s/xCILQmESecilnlUGzDDICw=";
};

10
pkgs/development/libraries/netcdf-cxx4/default.nix
View file

@ -1,11 +1,13 @@
{ lib, stdenv, fetchzip, netcdf, hdf5, curl, cmake, ninja }:
{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, cmake, ninja }:
stdenv.mkDerivation rec {
pname = "netcdf-cxx4";
version = "4.3.1";
src = fetchzip {
url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz";
sha256 = "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr";
src = fetchFromGitHub {
owner = "Unidata";
repo = "netcdf-cxx4";
rev = "v${version}";
sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY=";
};
preConfigure = ''

10
pkgs/development/libraries/netcdf-fortran/default.nix
View file

@ -1,11 +1,13 @@
{ lib, stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran }:
stdenv.mkDerivation rec {
pname = "netcdf-fortran";
version = "4.4.5";
src = fetchurl {
url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz";
sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01";
src = fetchFromGitHub {
owner = "Unidata";
repo = "netcdf-fortran";
rev = "v${version}";
sha256 = "sha256-nC93NcA4VJbrqaLwyhjP10j/t6rQSYcAzKBxclpZVe0=";
};
nativeBuildInputs = [ gfortran ];

8
pkgs/development/libraries/ogre/1.10.x.nix
View file

@ -16,6 +16,14 @@ stdenv.mkDerivation {
sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";
};
# fix for ARM. sys/sysctl.h has moved in later glibcs, and
# https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't
# needed anyway.
postPatch = ''
substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \
--replace '#include <sys/sysctl.h>' ""
'';
cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")

8
pkgs/development/libraries/ogre/1.9.x.nix
View file

@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
sha256 = "11lfgzqaps3728dswrq3cbwk7aicigyz08q4hfyy6ikc6m35r4wg";
};
# fix for ARM. sys/sysctl.h has moved in later glibcs, and
# https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't
# needed anyway.
postPatch = ''
substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \
--replace '#include <sys/sysctl.h>' ""
'';
cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")

84
pkgs/development/libraries/ogre/default.nix
View file

@ -1,40 +1,84 @@
{ fetchurl, stdenv, lib
, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkg-config
, libXxf86vm, libICE
{ fetchFromGitHub
, stdenv
, lib
, cmake
, libGLU
, libGL
, freetype
, freeimage
, zziplib
, xorgproto
, libXrandr
, libXaw
, freeglut
, libXt
, libpng
, boost
, ois
, libX11
, libXmu
, libSM
, pkg-config
, libXxf86vm
, libICE
, unzip
, libXrender
, SDL2
, withNvidiaCg ? false, nvidia_cg_toolkit
, withSamples ? false }:
, withNvidiaCg ? false
, nvidia_cg_toolkit
, withSamples ? false
}:
stdenv.mkDerivation rec {
pname = "ogre";
version = "1.12.1";
src = fetchurl {
url = "https://github.com/OGRECave/ogre/archive/v${version}.zip";
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
src = fetchFromGitHub {
owner = "OGRECave";
repo = "ogre";
rev = "v${version}";
sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM=";
};
# fix for ARM. sys/sysctl.h has moved in later glibcs, and
# https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't
# needed anyway.
postPatch = ''
substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \
--replace '#include <sys/sysctl.h>' ""
'';
cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
nativeBuildInputs = [ cmake unzip pkg-config ];
buildInputs =
[ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM
libXxf86vm libICE
libXrender
SDL2
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
[
cmake
libGLU
libGL
freetype
freeimage
zziplib
xorgproto
libXrandr
libXaw
freeglut
libXt
libpng
boost
ois
libX11
libXmu
libSM
libXxf86vm
libICE
libXrender
SDL2
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
meta = {
description = "A 3D engine";

10
pkgs/development/libraries/ogrepaged/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
stdenv.mkDerivation rec {
pname = "ogre-paged";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/RigsOfRods/ogre-pagedgeometry/archive/v${version}.tar.gz";
sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82";
src = fetchFromGitHub {
owner = "RigsOfRods";
repo = "ogre-pagedgeometry";
rev = "v${version}";
sha256 = "sha256-EwtTV8cbhDv0Bgj7i3qgq4hLETwd5B2GFEegwozlY9U=";
};
patches = [

14
pkgs/development/libraries/openbabel/default.nix
View file

@ -1,15 +1,16 @@
{stdenv, lib, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:
{ stdenv, lib, fetchFromGitHub, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:
stdenv.mkDerivation rec {
pname = "openbabel";
version = "3.1.1";
src = fetchurl {
url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";
sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02";
src = fetchFromGitHub {
owner = "openbabel";
repo = "openbabel";
rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}";
sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY=";
};
buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ];
nativeBuildInputs = [ cmake pkg-config ];
@ -21,7 +22,6 @@ stdenv.mkDerivation rec {
"-DPYTHON_BINDINGS=ON"
];
postFixup = ''
cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py
from distutils.core import setup
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
package_data = {'openbabel' : ['_openbabel.so']}
)
EOF
'';
'';
meta = with lib; {
description = "A toolbox designed to speak the many languages of chemical data";

4
pkgs/development/libraries/physics/rivet/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rivet";
version = "3.1.4";
version = "3.1.5";
src = fetchurl {
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
sha256 = "sha256-N+3ICilozhAxWJ5DumtJKHfKeQG+o4+Lt1NqXIz4EA0=";
hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo=";
};
latex = texlive.combine { inherit (texlive)

28
pkgs/development/libraries/physics/yoda/default.nix
View file

@ -1,14 +1,23 @@
{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:
{ lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }:
stdenv.mkDerivation rec {
pname = "yoda";
version = "1.9.1";
version = "1.9.2";
src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
sha256 = "sha256-xhagWmVlvlsayL0oWTihoxhq0ejejEACCsdQqFN1HUw=";
hash = "sha256-zb7j7fBMv2brJ+gUMMDTKFEJDC2embENe3wXdx0VTOA=";
};
patches = [
# Prevent ROOT from initializing X11 or Cocoa (helps with sandboxing)
(fetchpatch {
url = "https://gitlab.com/hepcedar/yoda/-/commit/36c035f4f0385dec58702f09564ca66a14ca2c3e.diff";
sha256 = "sha256-afB+y33TVNJtxY5As18EcutJEGDE4g0UzMxzA+YgICk=";
excludes = [ "ChangeLog" ];
})
];
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
buildInputs = [ python ]
++ (with python.pkgs; [ numpy matplotlib ])
@ -32,18 +41,13 @@ stdenv.mkDerivation rec {
doInstallCheck = true;
installCheckTarget = "check";
# Workaround for https://gitlab.com/hepcedar/yoda/-/merge_requests/49
preInstallCheck = ''
cp tests/test{1,}.yoda
gzip -c tests/test.yoda > tests/test.yoda.gz
'';
enableParallelChecking = false; # testreader consumes output of testwriter
meta = {
description = "Provides small set of data analysis (specifically histogramming) classes";
license = lib.licenses.gpl3;
homepage = "https://yoda.hepforge.org";
platforms = lib.platforms.unix;
license = lib.licenses.gpl3;
homepage = "https://yoda.hepforge.org";
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ veprbl ];
};
}

1
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View file

@ -239,5 +239,6 @@ qtModule {
platforms = platforms.unix;
# This build takes a long time; particularly on slow architectures
timeout = 24 * 3600;
broken = stdenv.isDarwin && (lib.versionAtLeast qtCompatVersion "5.14"); # requires a newer SDK
};
}

11
pkgs/development/libraries/science/math/openlibm/default.nix
View file

@ -1,11 +1,14 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "openlibm";
version = "0.8.0";
src = fetchurl {
url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
sha256 = "sha256-A2IHaN9MpSamPdZ1xt6VpcnRZ/9ZVVzlemHGv0nkAO4=";
src = fetchFromGitHub {
owner = "JuliaLang";
repo = "openlibm";
rev = "v${version}";
sha256 = "sha256-dEM10picZXiPokzSHCfxhS7fwZ0sMjil4bni+PHBCeI=";
};
makeFlags = [ "prefix=$(out)" ];

12
pkgs/development/libraries/science/math/primesieve/default.nix
View file

@ -1,14 +1,16 @@
{ lib, stdenv, fetchurl, cmake }:
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "primesieve";
version = "7.6";
nativeBuildInputs = [cmake];
nativeBuildInputs = [ cmake ];
src = fetchurl {
url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz";
sha256 = "sha256-SFZp6Pmmx05SiUfSdN9wXxPKrydtRg0PA3uNvAycCpk=";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primesieve";
rev = "v${version}";
sha256 = "sha256-rSNYoWBy80BgPi1c+BSKbWTyGGb7/fxmu+mq1DXakHY=";
};
meta = with lib; {

40
pkgs/development/libraries/sfml/default.nix
View file

@ -1,15 +1,33 @@
{ lib, stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
, glew, libXrandr, libXrender, udev, xcbutilimage
, IOKit, Foundation, AppKit, OpenAL
{ lib
, stdenv
, fetchFromGitHub
, cmake
, libX11
, freetype
, libjpeg
, openal
, flac
, libvorbis
, glew
, libXrandr
, libXrender
, udev
, xcbutilimage
, IOKit
, Foundation
, AppKit
, OpenAL
}:
stdenv.mkDerivation rec {
pname = "sfml";
version = "2.5.1";
src = fetchzip {
url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay";
src = fetchFromGitHub {
owner = "SFML";
repo = "SFML";
rev = version;
sha256 = "sha256-Xt2Ct4vV459AsSvJxQfwMsNs6iA5y3epT95pLWJGeSk=";
};
nativeBuildInputs = [ cmake ];
@ -18,10 +36,12 @@ stdenv.mkDerivation rec {
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
"-DSFML_MISC_INSTALL_PREFIX=share/SFML"
"-DSFML_BUILD_FRAMEWORKS=no"
"-DSFML_USE_SYSTEM_DEPS=yes" ];
cmakeFlags = [
"-DSFML_INSTALL_PKGCONFIG_FILES=yes"
"-DSFML_MISC_INSTALL_PREFIX=share/SFML"
"-DSFML_BUILD_FRAMEWORKS=no"
"-DSFML_USE_SYSTEM_DEPS=yes"
];
meta = with lib; {
homepage = "https://www.sfml-dev.org/";

6
pkgs/development/libraries/stb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "stb";
version = "20180211";
version = "unstable-2021-09-10";
src = fetchFromGitHub {
owner = "nothings";
repo = "stb";
rev = "e6afb9cbae4064da8c3e69af3ff5c4629579c1d2";
sha256 = "079nsn9bnb8c0vfq26g5l53q6gzx19a5x9q2nb55mpcljxsgxnmf";
rev = "af1a5bc352164740c1cc1354942b1c6b72eacb8a";
sha256 = "0qq35cd747lll4s7bmnxb3pqvyp2hgcr9kyf758fax9lx76iwjhr";
};
dontBuild = true;

13
pkgs/development/libraries/stxxl/default.nix
View file

@ -1,4 +1,7 @@
{ lib, stdenv, fetchurl, cmake
{ lib
, stdenv
, fetchFromGitHub
, cmake
, parallel ? true
}:
@ -10,9 +13,11 @@ stdenv.mkDerivation rec {
pname = "stxxl";
version = "1.4.1";
src = fetchurl {
url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz";
sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c";
src = fetchFromGitHub {
owner = "stxxl";
repo = "stxxl";
rev = version;
sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I=";
};
nativeBuildInputs = [ cmake ];

10
pkgs/development/libraries/vaapi-intel-hybrid/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:
{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:
stdenv.mkDerivation rec {
pname = "intel-hybrid-driver";
version = "1.0.2";
src = fetchurl {
url = "https://github.com/01org/intel-hybrid-driver/archive/${version}.tar.gz";
sha256 = "0ywdhbvzwzzrq4qhylnw1wc8l3j67h26l0cs1rncwhw05s3ndk8n";
src = fetchFromGitHub {
owner = "01org";
repo = "intel-hybrid-driver";
rev = version;
sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8=";
};
patches = [

54
pkgs/development/libraries/vigra/default.nix
View file

@ -1,35 +1,65 @@
{ lib, stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase
, libjpeg, libpng, libtiff, openexr, python2Packages }:
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, boost
, cmake
, fftw
, fftwSinglePrec
, hdf5
, ilmbase
, libjpeg
, libpng
, libtiff
, openexr
, python2Packages
}:
let
inherit (python2Packages) python numpy;
# Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "vigra";
version = "1.11.1";
src = fetchurl {
url = "https://github.com/ukoethe/vigra/archive/Version-${lib.replaceChars ["."] ["-"] version}.tar.gz";
sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj";
src = fetchFromGitHub {
owner = "ukoethe";
repo = "vigra";
rev = "Version-${lib.replaceChars ["."] ["-"] version}";
sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk=";
};
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
# Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414
patches =
let clangPatch = fetchurl { url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";
sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; };
let clangPatch = fetchurl {
url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";
sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi";
};
in [ clangPatch ];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
libtiff numpy openexr python ];
buildInputs = [
boost
fftw
fftwSinglePrec
hdf5
ilmbase
libjpeg
libpng
libtiff
numpy
openexr
python
];
preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";
cmakeFlags = [ "-DWITH_OPENEXR=1" ]
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
# fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory"
doCheck = false;

21
pkgs/development/libraries/vo-amrwbenc/default.nix
View file

@ -1,17 +1,18 @@
{ lib, stdenv, fetchurl, autoreconfHook }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
let
version = "0.1.3";
in
stdenv.mkDerivation {
name = "vo-amrwbenc-${version}";
stdenv.mkDerivation rec{
pname = "vo-amrwbenc";
version = "0.1.3";
buildInputs = [ autoreconfHook ];
src = fetchurl {
url = "https://github.com/mstorsjo/vo-amrwbenc/archive/v${version}.tar.gz";
sha256 = "85c79997ba7ddb9c95b5ddbe9ea032e27595390f3cbd686ed46a69e485cc053c";
src = fetchFromGitHub {
owner = "mstorsjo";
repo = "vo-amrwbenc";
rev = "v${version}";
sha256 = "sha256-oHhoJAI47VqBGk9cO3G5oqnHpWxA2jnJs103MwcYj+w=";
};
nativeBuildInputs = [ autoreconfHook ];
meta = {
homepage = "https://sourceforge.net/projects/opencore-amr/";
description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder";

10
pkgs/development/mobile/imgpatchtools/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchzip, bzip2, openssl, zlib }:
{ lib, stdenv, fetchFromGitHub, bzip2, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "imgpatchtools";
version = "0.3";
src = fetchzip {
url = "https://github.com/erfanoabdi/imgpatchtools/archive/${version}.tar.gz";
sha256 = "1cwp1hfhip252dz0mbkhrsrkws6m15k359n4amw2vfnglnls8czd";
src = fetchFromGitHub {
owner = "erfanoabdi";
repo = "imgpatchtools";
rev = version;
sha256 = "sha256-7TOkqaXPui14VcSmMmYJ1Wg+s85wrgp+E0XcCB0Ml7M=";
};
buildInputs = [ bzip2 openssl zlib ];

4
pkgs/development/python-modules/aiohttp-remotes/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "aiohttp_remotes";
version = "1.0.0";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1vv2ancxsaxlls9sinigjnrqyx95n7cphq37m8nwifkhvs0idv6a";
sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174";
};
propagatedBuildInputs = [ aiohttp ];

4
pkgs/development/python-modules/aws-lambda-builders/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.8.1";
version = "1.9.0";
# No tests available in PyPI tarball
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "v${version}";
sha256 = "1avq04hmps2cd33dd5n4bc3lclqg0hv6khn804fbv0hmy7lywp8b";
sha256 = "1ff1hr282snpjs5ggf7agxk5y6nr4xjdahmzq6hv56gj4lcfsq7c";
};
# Package is not compatible with Python 3.5

4
pkgs/development/python-modules/awscrt/default.nix
View file

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.12.5";
version = "0.12.6";
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "8bb80b37ebfd01f6078c60bb3231118380ac06842de692f6e37b6f8643e15a1d";
sha256 = "65d71b4cd78165bea962dfbda361b47b9b5a6198d8074046b8667da9653d0752";
};
meta = with lib; {

4
pkgs/development/python-modules/azure-appconfiguration/default.nix
View file

@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "azure-appconfiguration";
version = "1.2.0";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "85c9c25612f160897ae212532ec7c19c94b0f4463f4830d0ee08cb2d296df407";
sha256 = "9372467c74930d20827135d468b7fcaa1ad42e4673a4591ceadbb6ad8e1b7e07";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-identity/default.nix
View file

@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "azure-identity";
version = "1.7.0";
version = "1.7.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "3faaecb645e3b2300648a4a452458ec0e31e13d9dc928e710992e43ef4694205";
sha256 = "7f22cd0c7a9b92ed297dd67ae79d9bb9a866e404061c02cec709ad10c4c88e19";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-loganalytics/default.nix
View file

@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "0.1.0";
version = "0.1.1";
pname = "azure-loganalytics";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e";
sha256 = "68ffb9a2206e06b9672100a8e6351cc04f75bb81867f30d416c68b55d624d793";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-eventgrid";
version = "9.0.0";
version = "10.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510";
sha256 = "582e314ca05a9be0cd391c64689e6a5332d5bbad76c2ea751b727cfe99a2a3d2";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/build/default.nix
View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, filelock
@ -56,6 +57,9 @@ buildPythonPackage rec {
"test_default_pip_is_never_too_old"
"test_build"
"test_init"
] ++ lib.optionals stdenv.isDarwin [
# expects Apple's python and its quirks
"test_can_get_venv_paths_with_conflicting_default_scheme"
];
pythonImportsCheck = [ "build" ];

1
pkgs/development/python-modules/cirq-core/default.nix
View file

@ -1,5 +1,4 @@
{ lib
, stdenv
, buildPythonPackage
, pythonOlder
, fetchFromGitHub

37
pkgs/development/python-modules/docstring-to-markdown/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "docstring-to-markdown";
version = "0.9";
src = fetchFromGitHub {
owner = "python-lsp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XVTlSqqWmvnB5nvjvgGDJmg71KKTq2hHB4//QW7ugvA=";
};
patches = [
# So pytest-flake8 and pytest-cov won't be needed
./remove-coverage-tests.patch
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"docstring_to_markdown"
];
meta = with lib; {
homepage = "https://github.com/python-lsp/docstring-to-markdown";
description = "On the fly conversion of Python docstrings to markdown";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ doronbehar ];
};
}

16
pkgs/development/python-modules/docstring-to-markdown/remove-coverage-tests.patch Normal file
View file

@ -0,0 +1,16 @@
diff --git i/setup.cfg w/setup.cfg
index e880e74..e77133e 100644
--- i/setup.cfg
+++ w/setup.cfg
@@ -34,11 +34,7 @@ docstring-to-markdown = py.typed
[tool:pytest]
addopts =
--pyargs tests
- --cov docstring_to_markdown
- --cov-fail-under=98
- --cov-report term-missing:skip-covered
-p no:warnings
- --flake8
-vv
[flake8]

4
pkgs/development/python-modules/h5py/default.nix
View file

@ -1,5 +1,5 @@
{ lib, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder
, numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch
{ lib, fetchPypi, isPy27, buildPythonPackage, pythonOlder
, numpy, hdf5, cython, six, pkgconfig, unittest2
, mpi4py ? null, openssh, pytestCheckHook, cached-property }:
assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;

2
pkgs/development/python-modules/jaxlib/default.nix
View file

@ -13,7 +13,7 @@
# * https://github.com/google/jax/issues/971#issuecomment-508216439
# * https://github.com/google/jax/issues/5723#issuecomment-913038780
{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config, fetchPypi
{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config
, fetchurl, isPy39, lib, stdenv
# propagatedBuildInputs
, absl-py, flatbuffers, scipy, cudatoolkit_11

56
pkgs/development/python-modules/jedi-language-server/default.nix Normal file
View file

@ -0,0 +1,56 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, poetry
, docstring-to-markdown
, jedi
, pygls
, pytestCheckHook
, pyhamcrest
, python-jsonrpc-server
}:
buildPythonPackage rec {
pname = "jedi-language-server";
version = "0.34.8";
format = "pyproject";
src = fetchFromGitHub {
owner = "pappasam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mJGgDDjPZXde4M4OHwj81KYoaFXFAwOZ+v18YE+arFE=";
};
nativeBuildInputs = [
poetry
];
propagatedBuildInputs = [
docstring-to-markdown
jedi
pygls
];
checkInputs = [
pytestCheckHook
pyhamcrest
python-jsonrpc-server
];
preCheck = ''
HOME="$(mktemp -d)"
'';
pythonImportsCheck = [
"jedi_language_server"
];
meta = with lib; {
homepage = "https://github.com/pappasam/jedi-language-server";
description = "A Language Server for the latest version(s) of Jedi";
license = licenses.mit;
maintainers = with maintainers; [ doronbehar ];
};
}

2
pkgs/development/python-modules/jupyter-repo2docker/default.nix
View file

@ -1,7 +1,5 @@
{ lib
, bash
, buildPythonPackage
, chardet
, docker
, entrypoints
, escapism

2
pkgs/development/python-modules/lexid/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }:
{ lib, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }:
buildPythonPackage rec {
pname = "lexid";

4
pkgs/development/python-modules/pg8000/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pg8000";
version = "1.22.1";
version = "1.23.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-/WmtWvJ4HllgjLP02WayNNlhxi8JPt0xlKxF32W40dQ=";
sha256 = "sha256-pBPgAUE0KBOiykfot7BUn/M4zKAryBkHa21w8S11XHk=";
};
propagatedBuildInputs = [

13
pkgs/development/python-modules/phonenumbers/default.nix
View file

@ -6,20 +6,25 @@
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.12.36";
version = "8.12.37";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "e29717fcf86d68082fc6e42ca07e52bff863b6e0b354edd1644ba15c35ef213d";
sha256 = "sha256-28VgmShEoFn1bHwMalh5BOZdlWdAu/t+OViZgLyQVbg=";
};
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "tests/*.py" ];
pytestFlagsArray = [
"tests/*.py"
];
pythonImportsCheck = [ "phonenumbers" ];
pythonImportsCheck = [
"phonenumbers"
];
meta = with lib; {
description = "Python module for handling international phone numbers";

2
pkgs/development/python-modules/pynest2d/default.nix
View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake
, pythonOlder, libnest2d, sip_4, clipper }:
, libnest2d, sip_4, clipper }:
buildPythonPackage rec {
version = "4.10.0";

2
pkgs/development/python-modules/pytest-trio/default.nix
View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, trio, python, async_generator, hypothesis, outcome, pytest }:
, trio, async_generator, hypothesis, outcome, pytest }:
buildPythonPackage rec {
pname = "pytest-trio";

3
pkgs/development/python-modules/pytest/5.nix
View file

@ -1,16 +1,13 @@
{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
, atomicwrites
, attrs
, funcsigs
, hypothesis
, mock
, more-itertools
, packaging
, pathlib2
, pluggy
, py
, pygments
, python
, setuptools
, setuptools-scm
, six

8
pkgs/development/python-modules/python-jenkins/default.nix
View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, mock
@ -22,6 +23,13 @@ buildPythonPackage rec {
sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy";
};
# test uses timeout mechanism unsafe for use with the "spawn"
# multiprocessing backend used on macos
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace tests/test_jenkins_sockets.py \
--replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout
'';
buildInputs = [ mock ];
propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ];

2
pkgs/development/python-modules/python-nest/default.nix
View file

@ -1,4 +1,4 @@
{ buildPythonPackage, fetchPypi, lib, python, python-dateutil, requests
{ buildPythonPackage, fetchPypi, lib, python-dateutil, requests
, six, sseclient-py }:
buildPythonPackage rec {

37
pkgs/development/python-modules/qiskit-aer/default.nix
View file

@ -8,6 +8,7 @@
, catch2
, cmake
, cython
, fmt
, muparserx
, ninja
, nlohmann_json
@ -23,11 +24,13 @@
, fixtures
, pytest-timeout
, qiskit-terra
, setuptools
, testtools
}:
buildPythonPackage rec {
pname = "qiskit-aer";
version = "0.8.2";
version = "0.9.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -36,23 +39,16 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aer";
rev = version;
hash = "sha256-7NWM7qpMQ3vA6p0dhEPnkBjsPMdhceYTYcAD4tsClf0=";
sha256 = "sha256-SAJjU2zYz6UabOPV1KI2JB7CbJfUJcjbPKbo6iiCk/g=";
};
patches = [
(fetchpatch {
# https://github.com/Qiskit/qiskit-aer/pull/1250
name = "qiskit-aer-pr-1250-native-cmake_dl_libs.patch";
url = "https://github.com/Qiskit/qiskit-aer/commit/2bf04ade3e5411776817706cf82cc67a3b3866f6.patch";
sha256 = "0ldwzxxfgaad7ifpci03zfdaj0kqj0p3h94qgshrd2953mf27p6z";
})
];
# Remove need for cmake python package
# pybind11 shouldn't be an install requirement, just build requirement.
postPatch = ''
substituteInPlace setup.py \
--replace "'cmake!=3.17,!=3.17.0'," "" \
--replace "'pybind11>=2.6'" ""
--replace "'pybind11', min_version='2.6'" "'pybind11'" \
--replace "pybind11>=2.6" "pybind11" \
--replace "scikit-build>=0.11.0" "scikit-build" \
--replace "min_version='0.11.0'" ""
'';
nativeBuildInputs = [
@ -65,6 +61,7 @@ buildPythonPackage rec {
buildInputs = [
blas
catch2
fmt
muparserx
nlohmann_json
spdlog
@ -76,7 +73,6 @@ buildPythonPackage rec {
numpy
];
# Disable using conan for build
preBuild = ''
export DISABLE_CONAN=1
'';
@ -92,6 +88,16 @@ buildPythonPackage rec {
];
# Slow tests
disabledTests = [
"test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues?
"test_initialize_2" # TODO: simulations appear incorrect, off by >10%.
# these fail for some builds. Haven't been able to reproduce error locally.
"test_kraus_gate_noise"
"test_backend_method_clifford_circuits_and_kraus_noise"
"test_backend_method_nonclifford_circuit_and_kraus_noise"
"test_kraus_noise_fusion"
# Slow tests
"test_paulis_1_and_2_qubits"
"test_3d_oscillator"
"_057"
@ -105,6 +111,7 @@ buildPythonPackage rec {
"_144"
"test_sparse_output_probabilities"
"test_reset_2_qubit"
# "test_clifford"
];
checkInputs = [
pytestCheckHook
@ -112,6 +119,8 @@ buildPythonPackage rec {
fixtures
pytest-timeout
qiskit-terra
setuptools # temporary workaround for pbr missing setuptools, see https://github.com/NixOS/nixpkgs/pull/132614
testtools
];
pytestFlagsArray = [
"--timeout=30"

28
pkgs/development/python-modules/qiskit-aqua/default.nix
View file

@ -19,7 +19,7 @@
, withTorch ? false
, pytorch
, withPyscf ? false
, pyscf ? null
, pyscf
, withScikitQuant ? false
, scikit-quant ? null
, withCplex ? false
@ -33,7 +33,7 @@
buildPythonPackage rec {
pname = "qiskit-aqua";
version = "0.9.1";
version = "0.9.5";
disabled = pythonOlder "3.6";
@ -42,7 +42,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aqua";
rev = version;
hash = "sha256-fptyqPrkUgl3UjtlEmDYORdX/SsONxWozQGEs/EahmU=";
sha256 = "sha256-7QmRwlbAVAR5KfM7tuObkb6+UgiuIm82iGWBuqfve08=";
};
# Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed.
@ -113,13 +113,25 @@ buildPythonPackage rec {
pytestFlagsArray = [
"--timeout=30"
"--durations=10"
] ++ lib.optionals (!withPyscf) [
"--ignore=test/chemistry/test_qeom_ee.py"
"--ignore=test/chemistry/test_qeom_vqe.py"
"--ignore=test/chemistry/test_vqe_uccsd_adapt.py"
"--ignore=test/chemistry/test_bopes_sampler.py"
];
disabledTestPaths = lib.optionals (!withPyscf) [
"test/chemistry/test_qeom_ee.py"
"test/chemistry/test_qeom_vqe.py"
"test/chemistry/test_vqe_uccsd_adapt.py"
"test/chemistry/test_bopes_sampler.py"
];
disabledTests = [
# TODO: figure out why failing, only fail with upgrade to qiskit-terra > 0.16.1 & qiskit-aer > 0.7.2
# In test.aqua.test_amplitude_estimation.TestSineIntegral
"test_confidence_intervals_1"
"test_statevector_1"
# fails due to approximation error with latest qiskit-aer?
"test_application"
# Fail on CI for some reason, not locally
"test_binary"
# Online tests
"test_exchangedata"
"test_yahoo"

78
pkgs/development/python-modules/qiskit-finance/default.nix Normal file
View file

@ -0,0 +1,78 @@
{ lib
, pythonOlder
, buildPythonPackage
, fetchFromGitHub
# Python Inputs
, fastdtw
, numpy
, pandas
, psutil
, qiskit-terra
, qiskit-optimization
, scikit-learn
, scipy
, quandl
, yfinance
# Check Inputs
, pytestCheckHook
, ddt
, pytest-timeout
, qiskit-aer
}:
buildPythonPackage rec {
pname = "qiskit-finance";
version = "0.2.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "qiskit";
repo = pname;
rev = version;
sha256 = "sha256-fEhc/01j6iYYwS6mLle+TpX9j0DVn12oPUFamEecoAY=";
};
propagatedBuildInputs = [
fastdtw
numpy
pandas
psutil
qiskit-terra
qiskit-optimization
quandl
scikit-learn
scipy
yfinance
];
checkInputs = [
pytestCheckHook
pytest-timeout
ddt
qiskit-aer
];
pythonImportsCheck = [ "qiskit_finance" ];
disabledTests = [
# Fail due to approximation error, ~1-2%
"test_application"
# Tests fail b/c require internet connection. Stalls tests if enabled.
"test_exchangedata"
"test_yahoo"
"test_wikipedia"
];
pytestFlagsArray = [
"--durations=10"
];
meta = with lib; {
description = "Software for developing quantum computing programs";
homepage = "https://qiskit.org";
downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";
changelog = "https://qiskit.org/documentation/release_notes.html";
license = licenses.asl20;
maintainers = with maintainers; [ drewrisinger ];
};
}

17
pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
View file

@ -7,9 +7,9 @@
, qiskit-terra
, requests
, requests_ntlm
, websockets
, websocket-client
# Visualization inputs
, withVisualization ? false
, withVisualization ? true
, ipython
, ipyvuetify
, ipywidgets
@ -23,6 +23,7 @@
, nbformat
, pproxy
, qiskit-aer
, websockets
, vcrpy
}:
@ -39,7 +40,7 @@ let
in
buildPythonPackage rec {
pname = "qiskit-ibmq-provider";
version = "0.13.1";
version = "0.18.0";
disabled = pythonOlder "3.6";
@ -47,7 +48,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
hash = "sha256-DlHlXncttzGo4uVoh2aQ7urW6krN3ej2sJ/EwuxeF2I=";
sha256 = "sha256-mVgR9vq9UpM/3VED4hpEev8YAoZY1URAxu7pVv+cjU8=";
};
propagatedBuildInputs = [
@ -56,9 +57,13 @@ buildPythonPackage rec {
qiskit-terra
requests
requests_ntlm
websockets
websocket-client
] ++ lib.optionals withVisualization visualizationPackages;
postPatch = ''
substituteInPlace setup.py --replace "websocket-client>=1.0.1" "websocket-client"
'';
# Most tests require credentials to run on IBMQ
checkInputs = [
pytestCheckHook
@ -67,6 +72,7 @@ buildPythonPackage rec {
pproxy
qiskit-aer
vcrpy
websockets
] ++ lib.optionals (!withVisualization) visualizationPackages;
pythonImportsCheck = [ "qiskit.providers.ibmq" ];
@ -75,6 +81,7 @@ buildPythonPackage rec {
"test_old_api_url"
"test_non_auth_url"
"test_non_auth_url_with_hub"
"test_coder_optimizers" # TODO: reenable when package scikit-quant is packaged, either in NUR or nixpkgs
# slow tests
"test_websocket_retry_failure"

87
pkgs/development/python-modules/qiskit-machine-learning/default.nix Normal file
View file

@ -0,0 +1,87 @@
{ lib
, pythonOlder
, pythonAtLeast
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
# Python Inputs
, fastdtw
, numpy
, psutil
, qiskit-terra
, scikit-learn
, sparse
# Optional inputs
, withTorch ? true
, pytorch
# Check Inputs
, pytestCheckHook
, ddt
, pytest-timeout
, qiskit-aer
}:
buildPythonPackage rec {
pname = "qiskit-machine-learning";
version = "0.2.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "qiskit";
repo = pname;
rev = version;
sha256 = "sha256-2dfrkNZYSaXwiOCaRrPckq4BllANgc6BogyBcP0vosY=";
};
propagatedBuildInputs = [
fastdtw
numpy
psutil
qiskit-terra
scikit-learn
sparse
] ++ lib.optional withTorch pytorch;
doCheck = false; # TODO: enable. Tests fail on unstable due to some multithreading issue?
checkInputs = [
pytestCheckHook
pytest-timeout
ddt
qiskit-aer
];
pythonImportsCheck = [ "qiskit_machine_learning" ];
pytestFlagsArray = [
"--durations=10"
"--showlocals"
"-vv"
"--ignore=test/connectors/test_torch_connector.py" # TODO: fix, get multithreading errors with python3.9, segfaults
];
disabledTests = [
# Slow tests >10 s
"test_readme_sample"
"test_vqr_8"
"test_vqr_7"
"test_qgan_training_cg"
"test_vqc_4"
"test_classifier_with_circuit_qnn_and_cross_entropy_4"
"test_vqr_4"
"test_regressor_with_opflow_qnn_4"
"test_qgan_save_model"
"test_qgan_training_analytic_gradients"
"test_qgan_training_run_algo_numpy"
"test_ad_hoc_data"
"test_qgan_training"
];
meta = with lib; {
description = "Software for developing quantum computing programs";
homepage = "https://qiskit.org";
downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";
changelog = "https://qiskit.org/documentation/release_notes.html";
license = licenses.asl20;
maintainers = with maintainers; [ drewrisinger ];
};
}

80
pkgs/development/python-modules/qiskit-nature/default.nix Normal file
View file

@ -0,0 +1,80 @@
{ lib
, pythonOlder
, buildPythonPackage
, fetchFromGitHub
# Python Inputs
, h5py
, numpy
, psutil
, qiskit-terra
, retworkx
, scikit-learn
, scipy
, withPyscf ? false
, pyscf
# Check Inputs
, pytestCheckHook
, ddt
, pylatexenc
}:
buildPythonPackage rec {
pname = "qiskit-nature";
version = "0.2.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "qiskit";
repo = pname;
rev = version;
sha256 = "sha256-nQbvH911Gt4KddG23qwmiXfRJTWwVEsrzPvuTQfy4FY=";
};
postPatch = ''
substituteInPlace requirements.txt --replace "h5py<3.3" "h5py"
'';
propagatedBuildInputs = [
h5py
numpy
psutil
qiskit-terra
retworkx
scikit-learn
scipy
] ++ lib.optional withPyscf pyscf;
checkInputs = [
pytestCheckHook
ddt
pylatexenc
];
pythonImportsCheck = [ "qiskit_nature" ];
pytestFlagsArray = [
"--durations=10"
] ++ lib.optionals (!withPyscf) [
"--ignore=test/algorithms/excited_state_solvers/test_excited_states_eigensolver.py"
];
disabledTests = [
# small math error < 0.05 (< 9e-6 %)
"test_vqe_uvccsd_factory"
# unsure of failure reason. Might be related to recent cvxpy update?
"test_two_qubit_reduction"
] ++ lib.optionals (!withPyscf) [
"test_h2_bopes_sampler"
"test_potential_interface"
];
meta = with lib; {
description = "Software for developing quantum computing programs";
homepage = "https://qiskit.org";
downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";
changelog = "https://qiskit.org/documentation/release_notes.html";
license = licenses.asl20;
maintainers = with maintainers; [ drewrisinger ];
};
}

63
pkgs/development/python-modules/qiskit-optimization/default.nix Normal file
View file

@ -0,0 +1,63 @@
{ lib
, pythonOlder
, buildPythonPackage
, fetchFromGitHub
# Python Inputs
, decorator
, docplex
, networkx
, numpy
, qiskit-terra
, scipy
# Check Inputs
, pytestCheckHook
, ddt
, pylatexenc
, qiskit-aer
}:
buildPythonPackage rec {
pname = "qiskit-optimization";
version = "0.2.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "qiskit";
repo = pname;
rev = version;
sha256 = "sha256-y/j/cerzMAKVjehh1LUqYe1Juoa4lIxH2qS165S9img=";
};
postPatch = ''
substituteInPlace requirements.txt --replace "networkx>=2.2,<2.6" "networkx"
'';
propagatedBuildInputs = [
docplex
decorator
networkx
numpy
qiskit-terra
scipy
];
checkInputs = [
pytestCheckHook
ddt
pylatexenc
qiskit-aer
];
pythonImportsCheck = [ "qiskit_optimization" ];
pytestFlagsArray = [ "--durations=10" ];
meta = with lib; {
description = "Software for developing quantum computing programs";
homepage = "https://qiskit.org";
downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";
changelog = "https://qiskit.org/documentation/release_notes.html";
license = licenses.asl20;
maintainers = with maintainers; [ drewrisinger ];
};
}

47
pkgs/development/python-modules/qiskit-terra/default.nix
View file

@ -16,7 +16,10 @@
, python-dateutil
, retworkx
, scipy
, scikit-quant ? null
, symengine
, sympy
, tweedledum
, withVisualization ? false
# Python visualization requirements, optional
, ipywidgets
@ -29,9 +32,6 @@
# Crosstalk-adaptive layout pass
, withCrosstalkPass ? false
, z3
# Classical function -> Quantum Circuit compiler
, withClassicalFunctionCompiler ? true
, tweedledum
# test requirements
, ddt
, hypothesis
@ -52,12 +52,11 @@ let
seaborn
];
crosstalkPackages = [ z3 ];
classicalCompilerPackages = [ tweedledum ];
in
buildPythonPackage rec {
pname = "qiskit-terra";
version = "0.17.4";
version = "0.18.3";
disabled = pythonOlder "3.6";
@ -65,7 +64,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
hash = "sha256-JyNuke+XPqjLVZbvPud9Y7k0+EmvETVKcOYcDldBiVo=";
sha256 = "sha256-w/EnkdlC1hvmLqm4I8ajEYADxqMYGdHKrySLcb/yWGs=";
};
nativeBuildInputs = [ cython ];
@ -82,10 +81,12 @@ buildPythonPackage rec {
python-dateutil
retworkx
scipy
scikit-quant
symengine
sympy
tweedledum
] ++ lib.optionals withVisualization visualizationPackages
++ lib.optionals withCrosstalkPass crosstalkPackages
++ lib.optionals withClassicalFunctionCompiler classicalCompilerPackages;
++ lib.optionals withCrosstalkPass crosstalkPackages;
# *** Tests ***
checkInputs = [
@ -103,21 +104,21 @@ buildPythonPackage rec {
disabledTestPaths = [
"test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency
] ++ lib.optionals (!withClassicalFunctionCompiler) [
"test/python/classical_function_compiler/"
# These tests are nondeterministic and can randomly fail.
# We ignore them here for deterministic building.
"test/randomized/"
# These tests consistently fail on GitHub Actions build
"test/python/quantum_info/operators/test_random.py"
];
pytestFlagsArray = [ "--durations=10" ];
disabledTests = [
# Not working on matplotlib >= 3.4.0, checks images match.
"test_plot_circuit_layout"
# Flaky tests
"test_cx_equivalence"
"test_pulse_limits"
"test_1q_random"
] ++ lib.optionals (!withClassicalFunctionCompiler) [
"TestPhaseOracle"
] ++ lib.optionals stdenv.isAarch64 [
"test_circuit_init" # failed on aarch64, https://gist.github.com/r-rmcgibbo/c2e173d43ced4f6954811004f6b5b842
"test_pulse_limits" # Fails on GitHub Actions, probably due to minor floating point arithmetic error.
"test_cx_equivalence" # Fails due to flaky test
"test_two_qubit_synthesis_not_pulse_optimal" # test of random circuit, seems to randomly fail depending on seed
"test_qv_natural" # fails due to sign error. Not sure why
] ++ lib.optionals (lib.versionAtLeast matplotlib.version "3.4.0") [
"test_plot_circuit_layout"
]
# Disabling slow tests for build constraints
++ [
@ -147,6 +148,12 @@ buildPythonPackage rec {
"test_qaoa_qc_mixer_4"
"test_abelian_grouper_random_2"
"test_pauli_two_design"
"test_shor_factoring"
"test_sample_counts_memory_ghz"
"test_two_qubit_weyl_decomposition_ab0"
"test_sample_counts_memory_superposition"
"test_piecewise_polynomial_function"
"test_vqe_qasm"
];
# Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding

20
pkgs/development/python-modules/qiskit/default.nix
View file

@ -8,14 +8,28 @@
, qiskit-ibmq-provider
, qiskit-ignis
, qiskit-terra
# Optional inputs
, withOptionalPackages ? true
, qiskit-finance
, qiskit-machine-learning
, qiskit-nature
, qiskit-optimization
# Check Inputs
, pytestCheckHook
}:
let
optionalQiskitPackages = [
qiskit-finance
qiskit-machine-learning
qiskit-nature
qiskit-optimization
];
in
buildPythonPackage rec {
pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
version = "0.26.2";
version = "0.32.0";
disabled = pythonOlder "3.6";
@ -23,7 +37,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = "qiskit";
rev = version;
hash = "sha256-QYWKKS7e/uCt5puWV4jA9Emp7M4Cyv2RUCxilbChWhw=";
sha256 = "sha256-fKR072hOD0a9TtWulqyKUT3Riwq+NHTtciR+NN5JC1Y=";
};
propagatedBuildInputs = [
@ -32,7 +46,7 @@ buildPythonPackage rec {
qiskit-ibmq-provider
qiskit-ignis
qiskit-terra
];
] ++ lib.optionals withOptionalPackages optionalQiskitPackages;
checkInputs = [ pytestCheckHook ];

2
pkgs/development/python-modules/sh/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales, coreutils }:
{ lib, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales, coreutils }:
buildPythonPackage rec {
pname = "sh";

1
pkgs/development/python-modules/spacy/default.nix
View file

@ -11,7 +11,6 @@
, jsonschema
, murmurhash
, numpy
, pathlib
, preshed
, requests
, setuptools

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