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

Conflicts:
pkgs/development/tools/parsing/flex/2.6.1.nix

Changed files
+1915 -627
.github
maintainers
nixos
modules
services
cluster
kubernetes
tests
pkgs
applications
audio
bespokesynth
blockchains
lightwalletd
editors
leo-editor
misc
lifelines
mkgmap
nwg-wrapper
networking
browsers
firefox
cluster
fluxcd
kn
kubecfg
kubedb-cli
popeye
instant-messengers
psi-plus
office
science
logic
boolector
lingeling
version-management
git-and-tools
git-machete
glitter
video
dvd-slideshow
obs-studio
vdr
desktops
enlightenment
terminology
gnome
apps
gnome-calendar
development
compilers
dev86
lingua-franca
embedded
fpga
trellis
interpreters
octave
libraries
boxfort
freeimage
hiredis
isl
libsbsms
luabind
nco
netcdf-cxx4
netcdf-fortran
ogre
ogrepaged
openbabel
physics
qt-5
modules
science
math
openlibm
primesieve
sfml
stb
stxxl
vaapi-intel-hybrid
vigra
vo-amrwbenc
mobile
imgpatchtools
python-modules
aiohttp-remotes
aws-lambda-builders
awscrt
azure-appconfiguration
azure-identity
azure-loganalytics
azure-mgmt-eventgrid
build
cirq-core
docstring-to-markdown
h5py
jaxlib
jedi-language-server
jupyter-repo2docker
lexid
pg8000
phonenumbers
pynest2d
pytest
pytest-trio
python-jenkins
python-nest
qiskit
qiskit-aer
qiskit-aqua
qiskit-finance
qiskit-ibmq-provider
qiskit-machine-learning
qiskit-nature
qiskit-optimization
qiskit-terra
sh
spacy
stestr
tweedledum
wavefile
tools
ammonite
build-managers
bazel
bazel_3
bazel_4
cargo-flamegraph
parsing
flex
pipenv
pypi-mirror
games
domination
openrw
misc
arm-trusted-firmware
drivers
gutenprint
hplip
utsushi
emulators
commanderx16
dgen-sdl
mgba
retroarch
ghostscript
scrcpy
vscode-extensions
cpptools
wakatime
os-specific
darwin
DarwinTools
insert_dylib
maloader
linux
eudev
fbterm
kernel
mwprocapture
rtl88xxau-aircrack
seturgent
udisks
udisks-glue
windows
jom
mingwrt
w32api
wxMSW-2.8
servers
home-assistant
http
nginx
klipper
openvscode-server
prowlarr
web-apps
wordpress
shells
zsh
oh-my-zsh
zinit
tools
X11
primus
xdotool
audio
abcmidi
filesystems
graphics
wallutils
inputmethods
misc
chezmoi
cht.sh
ckb-next
flameshot
tty-clock
ytree
networking
nix
info
package-management
nix-update
security
gnupg
gopass
system
text
gnused
highlight
mark
proselint
typesetting
top-level
+1 -1
.github/PULL_REQUEST_TEMPLATE.md
···
- 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
···
githubId = 2439413;
name = "Derek Gonyeo";
};
+
dguenther = {
+
email = "dguenther9@gmail.com";
+
github = "dguenther";
+
githubId = 767083;
+
name = "Derek Guenther";
+
};
dhkl = {
email = "david@davidslab.com";
github = "dhl";
···
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";
···
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";
···
email = "nejczupan+nix@gmail.com";
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
···
"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
···
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
···
+
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")
+
'';
+
})
+7 -1
pkgs/applications/audio/bespokesynth/default.nix
···
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;
};
+2 -2
pkgs/applications/blockchains/lightwalletd/default.nix
···
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;
+2 -2
pkgs/applications/editors/leo-editor/default.nix
···
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;
+11 -1
pkgs/applications/misc/lifelines/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }:
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libiconv, bison, ncurses, perl, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "lifelines";
···
rev = "43f29285ed46fba322b6a14322771626e6b02c59";
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
+2 -2
pkgs/applications/misc/mkgmap/default.nix
···
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 = [
+2 -2
pkgs/applications/misc/mkgmap/splitter/default.nix
···
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 = [
+2 -2
pkgs/applications/misc/nwg-wrapper/default.nix
···
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 ];
+10 -1
pkgs/applications/networking/browsers/firefox/common.nix
···
# 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
···
] ++
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
+4 -4
pkgs/applications/networking/cluster/fluxcd/default.nix
···
{ 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";
···
inherit sha256;
};
-
vendorSha256 = "sha256-m0uVatnV4GIyllZTOkLxXGEiAWXGloFfxSJn51y0AQo=";
+
vendorSha256 = "sha256-vFm9ai+VWOPLRckKJ7gfD/0iQ8b4o5HNQE4cekb0vA0=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
+2 -2
pkgs/applications/networking/cluster/kn/default.nix
···
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;
+2 -2
pkgs/applications/networking/cluster/kubecfg/default.nix
···
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";
+2 -2
pkgs/applications/networking/cluster/kubedb-cli/default.nix
···
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;
+7 -2
pkgs/applications/networking/cluster/popeye/default.nix
···
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 = [
···
vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8=";
doCheck = true;
+
+
doInstallCheck = true;
+
installCheckPhase = ''
+
$out/bin/popeye version | grep ${version} > /dev/null
+
'';
meta = with lib; {
description = "A Kubernetes cluster resource sanitizer";
+4 -32
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
···
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
···
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
···
+
--- 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()
+
{
+1 -1
pkgs/applications/office/libreoffice/src-still/override.nix
···
"--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
}
+4 -4
pkgs/applications/office/libreoffice/src-still/primary.nix
···
major = "7";
minor = "1";
-
patch = "6";
+
patch = "7";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
···
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
···
help = fetchSrc {
name = "help";
-
sha256 = "1b28xqgvfnx62zgnxfisi58r7nhixvz35pmq8cb20ayxhdfg6v31";
+
sha256 = "jAFrO4RyONhPH3H5QW0SL8Id53bBvJ7AYxSNtLhG4rQ=";
};
}
+10 -1
pkgs/applications/science/logic/boolector/default.nix
···
-
{ stdenv, fetchFromGitHub, lib, python3
+
{ stdenv, fetchFromGitHub, lib, python3, fetchpatch
, cmake, lingeling, btor2tools, gtest, gmp
}:
···
rev = version;
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
+4 -5
pkgs/applications/science/logic/lingeling/default.nix
···
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 = ''
+2 -2
pkgs/applications/version-management/git-and-tools/git-machete/default.nix
···
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 ];
+3 -3
pkgs/applications/version-management/git-and-tools/glitter/default.nix
···
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 = ''
+2 -2
pkgs/applications/video/dvd-slideshow/default.nix
···
-
{ 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}
+9 -7
pkgs/applications/video/obs-studio/default.nix
···
, 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
···
addOpenGLRunpath
cmake
pkg-config
-
makeWrapper
+
wrapGAppsHook
]
++ optional scriptingSupport swig;
···
"-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
+2 -2
pkgs/applications/video/vdr/plugins.nix
···
{ 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
···
version = "20190525";
buildInputs = [
-
vdr libxcb xcbutilwm ffmpeg_3
+
vdr libxcb xcbutilwm ffmpeg
alsa-lib
libvdpau # vdpau
libva # va-api
+2 -2
pkgs/desktops/enlightenment/terminology/default.nix
···
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 = [
+2 -2
pkgs/desktops/gnome/apps/gnome-calendar/default.nix
···
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 = [
+9 -1
pkgs/development/compilers/dev86/default.nix
···
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
···
+
{ 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
···
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 = ''
+2 -2
pkgs/development/interpreters/octave/default.nix
···
};
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
···
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
···
--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 = [
+2 -2
pkgs/development/libraries/hiredis/default.nix
···
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}";
+4 -1
pkgs/development/libraries/isl/0.14.1.nix
···
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";
};
+4 -1
pkgs/development/libraries/isl/0.17.1.nix
···
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";
};
+5 -1
pkgs/development/libraries/isl/0.20.0.nix
···
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
···
+
{ 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
···
+
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
···
+
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;
+
}
+9 -6
pkgs/development/libraries/luabind/default.nix
···
-
{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 ];
+5 -3
pkgs/development/libraries/nco/default.nix
···
-
{ 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=";
};
+6 -4
pkgs/development/libraries/netcdf-cxx4/default.nix
···
-
{ 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 = ''
+6 -4
pkgs/development/libraries/netcdf-fortran/default.nix
···
-
{ 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
···
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
···
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")
+64 -20
pkgs/development/libraries/ogre/default.nix
···
-
{ 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";
+6 -4
pkgs/development/libraries/ogrepaged/default.nix
···
-
{ 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 = [
+7 -7
pkgs/development/libraries/openbabel/default.nix
···
-
{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 ];
···
"-DPYTHON_BINDINGS=ON"
];
-
postFixup = ''
cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py
from distutils.core import setup
···
package_data = {'openbabel' : ['_openbabel.so']}
)
EOF
-
'';
+
'';
meta = with lib; {
description = "A toolbox designed to speak the many languages of chemical data";
+2 -2
pkgs/development/libraries/physics/rivet/default.nix
···
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)
+16 -12
pkgs/development/libraries/physics/yoda/default.nix
···
-
{ 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 ])
···
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
···
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
};
}
+7 -4
pkgs/development/libraries/science/math/openlibm/default.nix
···
-
{ 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)" ];
+7 -5
pkgs/development/libraries/science/math/primesieve/default.nix
···
-
{ 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; {
+30 -10
pkgs/development/libraries/sfml/default.nix
···
-
{ 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 ];
···
++ 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/";
+3 -3
pkgs/development/libraries/stb/default.nix
···
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;
+9 -4
pkgs/development/libraries/stxxl/default.nix
···
-
{ lib, stdenv, fetchurl, cmake
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, cmake
, parallel ? true
}:
···
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 ];
+6 -4
pkgs/development/libraries/vaapi-intel-hybrid/default.nix
···
-
{ 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 = [
+42 -12
pkgs/development/libraries/vigra/default.nix
···
-
{ 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;
+11 -10
pkgs/development/libraries/vo-amrwbenc/default.nix
···
-
{ 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/";
+6 -4
pkgs/development/mobile/imgpatchtools/default.nix
···
-
{ 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 ];
+2 -2
pkgs/development/python-modules/aiohttp-remotes/default.nix
···
buildPythonPackage rec {
pname = "aiohttp_remotes";
-
version = "1.0.0";
+
version = "1.1.0";
src = fetchPypi {
inherit pname version;
-
sha256 = "1vv2ancxsaxlls9sinigjnrqyx95n7cphq37m8nwifkhvs0idv6a";
+
sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174";
};
propagatedBuildInputs = [ aiohttp ];
+2 -2
pkgs/development/python-modules/aws-lambda-builders/default.nix
···
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
+2 -2
pkgs/development/python-modules/awscrt/default.nix
···
buildPythonPackage rec {
pname = "awscrt";
-
version = "0.12.5";
+
version = "0.12.6";
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
···
src = fetchPypi {
inherit pname version;
-
sha256 = "8bb80b37ebfd01f6078c60bb3231118380ac06842de692f6e37b6f8643e15a1d";
+
sha256 = "65d71b4cd78165bea962dfbda361b47b9b5a6198d8074046b8667da9653d0752";
};
meta = with lib; {
+2 -2
pkgs/development/python-modules/azure-appconfiguration/default.nix
···
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 = [
+2 -2
pkgs/development/python-modules/azure-identity/default.nix
···
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 = [
+2 -2
pkgs/development/python-modules/azure-loganalytics/default.nix
···
}:
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 = [
+2 -2
pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
···
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
···
{ lib
+
, stdenv
, buildPythonPackage
, fetchFromGitHub
, filelock
···
"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
···
{ lib
-
, stdenv
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
+37
pkgs/development/python-modules/docstring-to-markdown/default.nix
···
+
{ 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
···
+
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]
+2 -2
pkgs/development/python-modules/h5py/default.nix
···
-
{ 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;
+1 -1
pkgs/development/python-modules/jaxlib/default.nix
···
# * 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
···
+
{ 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
···
{ lib
-
, bash
, buildPythonPackage
-
, chardet
, docker
, entrypoints
, escapism
+1 -1
pkgs/development/python-modules/lexid/default.nix
···
-
{ lib, python, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }:
+
{ lib, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }:
buildPythonPackage rec {
pname = "lexid";
+2 -2
pkgs/development/python-modules/pg8000/default.nix
···
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 = [
+9 -4
pkgs/development/python-modules/phonenumbers/default.nix
···
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";
+1 -1
pkgs/development/python-modules/pynest2d/default.nix
···
{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake
-
, pythonOlder, libnest2d, sip_4, clipper }:
+
, libnest2d, sip_4, clipper }:
buildPythonPackage rec {
version = "4.10.0";
+1 -1
pkgs/development/python-modules/pytest-trio/default.nix
···
{ 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
···
{ 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
···
{ lib
+
, stdenv
, buildPythonPackage
, fetchPypi
, mock
···
inherit pname version;
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 ];
+1 -1
pkgs/development/python-modules/python-nest/default.nix
···
-
{ buildPythonPackage, fetchPypi, lib, python, python-dateutil, requests
+
{ buildPythonPackage, fetchPypi, lib, python-dateutil, requests
, six, sseclient-py }:
buildPythonPackage rec {
+23 -14
pkgs/development/python-modules/qiskit-aer/default.nix
···
, catch2
, cmake
, cython
+
, fmt
, muparserx
, ninja
, nlohmann_json
···
, 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";
···
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 = [
···
buildInputs = [
blas
catch2
+
fmt
muparserx
nlohmann_json
spdlog
···
numpy
];
-
# Disable using conan for build
preBuild = ''
export DISABLE_CONAN=1
'';
···
];
# 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"
···
"_144"
"test_sparse_output_probabilities"
"test_reset_2_qubit"
+
# "test_clifford"
];
checkInputs = [
pytestCheckHook
···
fixtures
pytest-timeout
qiskit-terra
+
setuptools # temporary workaround for pbr missing setuptools, see https://github.com/NixOS/nixpkgs/pull/132614
+
testtools
];
pytestFlagsArray = [
"--timeout=30"
+20 -8
pkgs/development/python-modules/qiskit-aqua/default.nix
···
, withTorch ? false
, pytorch
, withPyscf ? false
-
, pyscf ? null
+
, pyscf
, withScikitQuant ? false
, scikit-quant ? null
, withCplex ? false
···
buildPythonPackage rec {
pname = "qiskit-aqua";
-
version = "0.9.1";
+
version = "0.9.5";
disabled = pythonOlder "3.6";
···
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.
···
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
···
+
{ 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 ];
+
};
+
}
+12 -5
pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
···
, qiskit-terra
, requests
, requests_ntlm
-
, websockets
+
, websocket-client
# Visualization inputs
-
, withVisualization ? false
+
, withVisualization ? true
, ipython
, ipyvuetify
, ipywidgets
···
, nbformat
, pproxy
, qiskit-aer
+
, websockets
, vcrpy
}:
···
in
buildPythonPackage rec {
pname = "qiskit-ibmq-provider";
-
version = "0.13.1";
+
version = "0.18.0";
disabled = pythonOlder "3.6";
···
owner = "Qiskit";
repo = pname;
rev = version;
-
hash = "sha256-DlHlXncttzGo4uVoh2aQ7urW6krN3ej2sJ/EwuxeF2I=";
+
sha256 = "sha256-mVgR9vq9UpM/3VED4hpEev8YAoZY1URAxu7pVv+cjU8=";
};
propagatedBuildInputs = [
···
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
···
pproxy
qiskit-aer
vcrpy
+
websockets
] ++ lib.optionals (!withVisualization) visualizationPackages;
pythonImportsCheck = [ "qiskit.providers.ibmq" ];
···
"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
···
+
{ 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
···
+
{ 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
···
+
{ 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 ];
+
};
+
}
+27 -20
pkgs/development/python-modules/qiskit-terra/default.nix
···
, python-dateutil
, retworkx
, scipy
+
, scikit-quant ? null
+
, symengine
, sympy
+
, tweedledum
, withVisualization ? false
# Python visualization requirements, optional
, ipywidgets
···
# Crosstalk-adaptive layout pass
, withCrosstalkPass ? false
, z3
-
# Classical function -> Quantum Circuit compiler
-
, withClassicalFunctionCompiler ? true
-
, tweedledum
# test requirements
, ddt
, hypothesis
···
seaborn
];
crosstalkPackages = [ z3 ];
-
classicalCompilerPackages = [ tweedledum ];
in
buildPythonPackage rec {
pname = "qiskit-terra";
-
version = "0.17.4";
+
version = "0.18.3";
disabled = pythonOlder "3.6";
···
owner = "Qiskit";
repo = pname;
rev = version;
-
hash = "sha256-JyNuke+XPqjLVZbvPud9Y7k0+EmvETVKcOYcDldBiVo=";
+
sha256 = "sha256-w/EnkdlC1hvmLqm4I8ajEYADxqMYGdHKrySLcb/yWGs=";
};
nativeBuildInputs = [ cython ];
···
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 = [
···
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.
+
# Flaky tests
+
"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"
-
-
# 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
]
# Disabling slow tests for build constraints
++ [
···
"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
+17 -3
pkgs/development/python-modules/qiskit/default.nix
···
, 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";
···
owner = "qiskit";
repo = "qiskit";
rev = version;
-
hash = "sha256-QYWKKS7e/uCt5puWV4jA9Emp7M4Cyv2RUCxilbChWhw=";
+
sha256 = "sha256-fKR072hOD0a9TtWulqyKUT3Riwq+NHTtciR+NN5JC1Y=";
};
propagatedBuildInputs = [
···
qiskit-ibmq-provider
qiskit-ignis
qiskit-terra
-
];
+
] ++ lib.optionals withOptionalPackages optionalQiskitPackages;
checkInputs = [ pytestCheckHook ];
+1 -1
pkgs/development/python-modules/sh/default.nix
···
-
{ 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
···
, jsonschema
, murmurhash
, numpy
-
, pathlib
, preshed
, requests
, setuptools
+1 -5
pkgs/development/python-modules/stestr/tests.nix
···
-
{ stdenv
-
, buildPythonPackage
-
, ddt
-
, sqlalchemy
+
{ buildPythonPackage
, stestr
-
, subunit2sql
}:
buildPythonPackage rec {
+6 -6
pkgs/development/python-modules/tweedledum/default.nix
···
, cmake
, ninja
, scikit-build
+
# Check Inputs
+
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "tweedledum";
-
version = "1.0.0";
+
version = "1.1.1";
format = "pyproject";
src = fetchFromGitHub{
owner = "boschmitt";
repo = "tweedledum";
rev = "v${version}";
-
hash = "sha256-59lJzdw9HLJ9ADxp/a3KW4v5aU/dYm27NSYoz9D49i4=";
+
sha256 = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM=";
};
nativeBuildInputs = [ cmake ninja scikit-build ];
···
pythonImportsCheck = [ "tweedledum" ];
-
# TODO: use pytest, but had issues with finding the correct directories
-
checkPhase = ''
-
python -m unittest discover -s ./python/test -t .
-
'';
+
checkInputs = [ pytestCheckHook ];
+
pytestFlagsArray = [ "python/test" ];
meta = with lib; {
description = "A library for synthesizing and manipulating quantum circuits";
+64
pkgs/development/python-modules/wavefile/default.nix
···
+
{ lib
+
, stdenv
+
, buildPythonPackage
+
, fetchFromGitHub
+
, setuptools
+
, pyaudio
+
, numpy
+
, libsndfile
+
, substituteAll
+
}:
+
+
buildPythonPackage rec {
+
pname = "wavefile";
+
version = "1.5";
+
+
src = fetchFromGitHub {
+
owner = "vokimon";
+
repo = "python-wavefile";
+
rev = "python-wavefile-${version}";
+
sha256 = "9sHj1gb93mCVpejRGSdLJzeFDCeTflZctE7kMWfqFrE=";
+
};
+
+
nativeBuildInputs = [
+
setuptools
+
];
+
+
buildInputs = [
+
pyaudio
+
libsndfile
+
];
+
+
propagatedBuildInputs = [
+
numpy
+
];
+
+
checkInputs = [
+
pyaudio
+
numpy
+
libsndfile
+
];
+
+
patches = [
+
# Fix check error
+
# OSError: libsndfile.so.1: cannot open shared object file: No such file or directory
+
(substituteAll {
+
src = ./libsndfile.py.patch;
+
libsndfile = "${lib.getLib libsndfile}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}";
+
})
+
];
+
+
doCheck = false; # all test files (test/wavefileTest.py) are failing
+
+
pythonImportsCheck = [
+
"wavefile"
+
];
+
+
meta = with lib; {
+
description = "Pythonic libsndfile wrapper to read and write audio files";
+
homepage = "https://github.com/vokimon/python-wavefile";
+
changelog = "https://github.com/vokimon/python-wavefile#version-history";
+
maintainers = with maintainers; [ yuu ];
+
license = licenses.gpl3Plus;
+
};
+
}
+18
pkgs/development/python-modules/wavefile/libsndfile.py.patch
···
+
diff --git a/wavefile/libsndfile.py b/wavefile/libsndfile.py
+
index 67f0a46..ce066ee 100644
+
--- a/wavefile/libsndfile.py
+
+++ b/wavefile/libsndfile.py
+
@@ -19,11 +19,11 @@ import numpy as np
+
if sys.platform == "win32":
+
dllName = 'libsndfile-1'
+
elif "linux" in sys.platform:
+
- dllName = 'libsndfile.so.1'
+
+ dllName = '@libsndfile@'
+
elif "cygwin" in sys.platform:
+
dllName = 'libsndfile-1.dll'
+
elif "darwin" in sys.platform:
+
- dllName = 'libsndfile.dylib'
+
+ dllName = '@libsndfile@'
+
else:
+
dllName = 'libsndfile'
+
+6 -18
pkgs/development/tools/ammonite/default.nix
···
-
{ lib
-
, stdenv
-
, fetchurl
-
, jre
-
, writeScript
-
, common-updater-scripts
-
, git
-
, nixfmt
-
, nix
-
, coreutils
-
, gnused
-
, disableRemoteLogging ? true
-
}:
+
{ lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts, git, nixfmt
+
, nix, coreutils, gnused, disableRemoteLogging ? true }:
with lib;
···
common = { scalaVersion, sha256 }:
stdenv.mkDerivation rec {
pname = "ammonite";
-
version = "2.4.0";
+
version = "2.4.1";
src = fetchurl {
url =
···
maintainers = [ maintainers.nequissimus ];
};
};
-
in
-
{
+
in {
ammonite_2_12 = common {
scalaVersion = "2.12";
-
sha256 = "K8JII6SAmnBjMWQ9a3NqSLLuP1OLcbwobj3G+OCiLdA=";
+
sha256 = "5n9q/7d/PwDJfBPITYyDua24+fci6bi1oG5dSw8A244=";
};
ammonite_2_13 = common {
scalaVersion = "2.13";
-
sha256 = "2F35qhWI6hNb+Eh9ZTDznqo116yN7MZIGVchaAIM36A=";
+
sha256 = "RIuNyWvwNM39/rczUH328K5ky5hePflokW/VP603j+I=";
};
}
+2 -2
pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
···
substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
# md5sum is part of coreutils
-
sed -i 's|/sbin/md5|md5sum|' \
-
src/BUILD
+
sed -i 's|/sbin/md5|md5sum|g' \
+
src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh
# replace initial value of pythonShebang variable in BazelPythonSemantics.java
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \
+2 -2
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
···
substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
# md5sum is part of coreutils
-
sed -i 's|/sbin/md5|md5sum|' \
-
src/BUILD
+
sed -i 's|/sbin/md5|md5sum|g' \
+
src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh
# replace initial value of pythonShebang variable in BazelPythonSemantics.java
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \
+3 -3
pkgs/development/tools/cargo-flamegraph/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "cargo-flamegraph";
-
version = "0.4.0";
+
version = "0.5.0";
src = fetchFromGitHub {
owner = "flamegraph-rs";
repo = "flamegraph";
rev = "v${version}";
-
sha256 = "sha256-IpmvFUWNaFQ1ls7u625vvj1TnRYXR+X1mAGdBcwRFLk=";
+
sha256 = "sha256-qxUYqqz6dlpkw6MGHH8iPfZcbc3/ZF1E+C8arISSTdY=";
};
-
cargoSha256 = "sha256-ccy5ZFS2Gp4Dwo8gsS6vzHHO1siicOp7uZTsCh6SKsM=";
+
cargoSha256 = "sha256-qJEhcqa78QW9X5ZD3Jy2BfRh/SkOhqBLzTT00u4DM0Q=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
buildInputs = lib.optionals stdenv.isDarwin [
-37
pkgs/development/tools/parsing/flex/2.6.1.nix
···
-
{ lib, stdenv, fetchurl, bison, m4 }:
-
-
stdenv.mkDerivation rec {
-
pname = "flex";
-
version = "2.6.1";
-
-
src = fetchurl {
-
url = "https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz";
-
sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw";
-
};
-
-
postPatch = ''
-
patchShebangs tests
-
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-
substituteInPlace Makefile.in --replace "tests" " ";
-
'';
-
-
buildInputs = [ bison ];
-
-
propagatedBuildInputs = [ m4 ];
-
-
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-
ac_cv_func_malloc_0_nonnull=yes
-
ac_cv_func_realloc_0_nonnull=yes
-
'';
-
-
postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
-
sed -i Makefile -e 's/-no-undefined//;'
-
'';
-
-
meta = with lib; {
-
homepage = "https://github.com/westes/flex";
-
description = "A fast lexical analyser generator";
-
license = licenses.bsd2;
-
platforms = platforms.unix;
-
};
-
}
+2 -2
pkgs/development/tools/pipenv/default.nix
···
in buildPythonApplication rec {
pname = "pipenv";
-
version = "2021.5.29";
+
version = "2021.11.9";
src = fetchPypi {
inherit pname version;
-
sha256 = "05958fadcd70b2de6a27542fcd2bd72dd5c59c6d35307fdac3e06361fb06e30e";
+
sha256 = "7662399162bc887ee86e96d0baa6984236228af9c1fd6594be0b18910225579d";
};
LC_ALL = "en_US.UTF-8";
+2 -2
pkgs/development/tools/pypi-mirror/default.nix
···
}:
python3.pkgs.buildPythonApplication rec {
pname = "pypi-mirror";
-
version = "4.0.7";
+
version = "4.1.0";
src = fetchFromGitHub {
owner = "montag451";
repo = pname;
rev = "v${version}";
-
sha256 = "0sjzjvq2jnsr5mfyvkww3rfk3k5xcl8wa07q614850m0sn907laz";
+
sha256 = "077f3asi5fdbb2j2ll4xdwv7ndfbfr81bpn3zi55h6idfdc7zzc0";
};
pythonImportsCheck = [ "pypi_mirror" ];
+12 -4
pkgs/games/domination/default.nix
···
, ant
, makeWrapper
, makeDesktopItem
+
, nixosTests
}:
let
···
in stdenv.mkDerivation {
pname = "domination";
-
version = "1.2.3";
+
version = "1.2.4";
# The .zip releases do not contain the build.xml file
src = fetchsvn {
···
# There are no tags in the repository.
# Look for commits like "new version x.y.z info on website"
# or "website update for x.y.z".
-
rev = "1964";
-
sha256 = "0718gns8d69a1dfq3ywc9kddl1khnrmxqyal7brckbjgay8dq42f";
+
rev = "2109";
+
sha256 = "sha256-awTaEkv0zUXgrKVKuFzi5sgHgrfiNmAFMODO5U0DL6I=";
};
nativeBuildInputs = [
···
makeWrapper
];
-
buildPhase = "ant";
+
buildPhase = ''
+
cd swingUI
+
ant
+
'';
installPhase = ''
# Remove unnecessary files and launchers (they'd need to be wrapped anyway)
···
"$out/share/applications/Domination Map Editor.desktop"
install -Dm644 build/game/resources/icon.png $out/share/pixmaps/domination.png
'';
+
+
passthru.tests = {
+
domination-starts = nixosTests.domination;
+
};
meta = with lib; {
homepage = "http://domination.sourceforge.net/";
+24 -8
pkgs/games/openrw/default.nix
···
-
{ lib, stdenv, fetchgit, cmake, sfml, libGLU, libGL, bullet, glm, libmad, xlibsWrapper, openal
-
, SDL2, boost, ffmpeg_3, Cocoa, OpenAL }:
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, cmake
+
, sfml
+
, libGLU
+
, libGL
+
, bullet
+
, glm
+
, libmad
+
, xlibsWrapper
+
, openal
+
, SDL2
+
, boost
+
, ffmpeg
+
, Cocoa
+
, OpenAL }:
stdenv.mkDerivation {
-
version = "2019-10-26";
+
version = "unstable-2021-10-14";
pname = "openrw";
-
src = fetchgit {
-
url = "https://github.com/rwengine/openrw";
-
rev = "51b7264744d1aaa20de3b86a7a4e92a9930881ba";
-
sha256 = "04s088wfxkfmb4dxdvad611yxj8smxlnxdm5xy81zldfzybvx8dg";
+
src = fetchFromGitHub {
+
owner = "rwengine";
+
repo = "openrw";
+
rev = "0f83c16f6518c427a4f156497c3edc843610c402";
+
sha256 = "0i6nx9g0xb8sziak5swi8636fszcjjx8n2jwgz570izw2fl698ff";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
buildInputs = [
-
sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg_3
+
sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg
] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ];
meta = with lib; {
+1 -1
pkgs/misc/arm-trusted-firmware/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, pkgsCross, buildPackages }:
+
{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages }:
let
buildArmTrustedFirmware = { filesToInstall
+2 -1
pkgs/misc/drivers/gutenprint/bin.nix
···
*/
stdenv.mkDerivation {
-
name = "cups-gutenprint-binary-5.0.1";
+
pname = "cups-gutenprint-binary";
+
version = "5.0.1";
src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
url = "https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb";
+1 -1
pkgs/misc/drivers/hplip/3.16.11.nix
···
, pkg-config
, cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils
, net-snmp, openssl, nettools
-
, bash, coreutils, util-linux
+
, bash, util-linux
, qtSupport ? true
, withPlugin ? false
}:
+1 -1
pkgs/misc/drivers/hplip/default.nix
···
, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends
, dbus, file, ghostscript, usbutils
, net-snmp, openssl, perl, nettools, avahi
-
, bash, coreutils, util-linux
+
, bash, util-linux
# To remove references to gcc-unwrapped
, removeReferencesTo, qt5
, withQt5 ? true
+1 -1
pkgs/misc/drivers/utsushi/default.nix
···
{ lib, stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config
, autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends
-
, tesseract4, udev, libusb1, gnum4 }:
+
, tesseract4, udev, libusb1 }:
let
+1 -3
pkgs/misc/emulators/commanderx16/run.nix
···
-
{ lib
-
, stdenv
-
, runtimeShell
+
{ runtimeShell
, symlinkJoin
, writeTextFile
}:
-1
pkgs/misc/emulators/dgen-sdl/default.nix
···
{ lib, stdenv
, fetchurl
, libarchive
-
, doxygen
, SDL
}:
-1
pkgs/misc/emulators/mgba/default.nix
···
, libedit
, libelf
, libzip
-
, copyDesktopItems
, makeDesktopItem
, minizip
, pkg-config
+8 -7
pkgs/misc/emulators/retroarch/cores.nix
···
-
{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch
-
, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
+
{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch
+
, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, portaudio, SDL, SDL2, libGL
, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
-
, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
+
, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
, buildPackages }:
let
d2u = lib.replaceChars ["-"] ["_"];
-
mkLibRetroCore = { core, src, description, license, broken ? false, ... }@a:
+
mkLibRetroCore = { core, src, description, license, broken ? false, version ? "2020-03-06", ... }@a:
lib.makeOverridable stdenv.mkDerivation ((rec {
name = "libretro-${a.core}-${version}";
-
version = "2020-03-06";
+
inherit version;
inherit (a) src;
buildInputs = [ zlib ] ++ a.extraBuildInputs or [];
···
dolphin = mkLibRetroCore {
core = "dolphin";
+
version = "2021-11-01";
src = fetchRetro {
repo = "dolphin";
-
rev = "1fbd59911d1b718c142d6448dee3ede98152e395";
-
sha256 = "1rymsvs034l1hbxc3w8zi9lhmgka2qaj3jynjy152dccd480nnd4";
+
rev = "3370f7693be95c23ac779e5172ff52b7eb2861a7";
+
sha256 = "0ylxi25kbv0h2p24aid7z4i0w6drf7h92q02hjdl3h3gni98lk9i";
};
description = "Port of Dolphin to libretro";
license = gpl2Plus;
-1
pkgs/misc/emulators/retroarch/default.nix
···
, udev ? null
, enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
, withVulkan ? stdenv.isLinux, vulkan-loader ? null
-
, fetchurl
, wayland
, libxkbcommon
}:
+1 -2
pkgs/misc/ghostscript/test-corpus-render.nix
···
-
{ lib
-
, stdenv
+
{ stdenv
, fetchgit
, ghostscript
}:
-1
pkgs/misc/scrcpy/default.nix
···
, meson
, ninja
, pkg-config
-
, fetchpatch
, platform-tools
, ffmpeg
+1 -2
pkgs/misc/vscode-extensions/cpptools/default.nix
···
{ lib, vscode-utils
-
, fetchurl, unzip
-
, mono, writeScript, runtimeShell
+
, fetchurl, mono, writeScript, runtimeShell
, jq, clang-tools
, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.
}:
-1
pkgs/misc/vscode-extensions/default.nix
···
{ config
, lib
-
, buildEnv
, fetchurl
, callPackage
, vscode-utils
+1 -1
pkgs/misc/vscode-extensions/wakatime/default.nix
···
{ lib
-
, wakatime, vscode-utils }:
+
, vscode-utils }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
+3 -2
pkgs/os-specific/darwin/DarwinTools/default.nix
···
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
-
name = "DarwinTools-1";
+
pname = "DarwinTools";
+
version = "1";
src = fetchurl {
-
url = "https://opensource.apple.com/tarballs/DarwinTools/${name}.tar.gz";
+
url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz";
sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp";
};
+20 -16
pkgs/os-specific/darwin/insert_dylib/default.nix
···
{ lib, stdenv, fetchFromGitHub, xcbuildHook }:
-
stdenv.mkDerivation
-
{ name = "insert_dylib-2016.08.28";
-
src = fetchFromGitHub
-
{ owner = "Tyilo";
-
repo = "insert_dylib";
-
rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9";
-
sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya";
-
};
-
nativeBuildInputs = [ xcbuildHook ];
-
installPhase =
-
''
-
mkdir -p $out/bin
-
install -m755 Products/Release/insert_dylib $out/bin
-
'';
-
meta.platforms = lib.platforms.darwin;
-
}
+
stdenv.mkDerivation {
+
pname = "insert_dylib";
+
version = "unstable-2016-08-28";
+
+
src = fetchFromGitHub {
+
owner = "Tyilo";
+
repo = "insert_dylib";
+
rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9";
+
sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya";
+
};
+
+
nativeBuildInputs = [ xcbuildHook ];
+
+
installPhase = ''
+
mkdir -p $out/bin
+
install -m755 Products/Release/insert_dylib $out/bin
+
'';
+
+
meta.platforms = lib.platforms.darwin;
+
}
+2 -1
pkgs/os-specific/darwin/maloader/default.nix
···
{ lib, stdenv, fetchgit, opencflite, clang, libcxx }:
stdenv.mkDerivation {
-
name = "maloader-0git";
+
pname = "maloader";
+
version = "unstable-2014-02-25";
src = fetchgit {
url = "git://github.com/shinh/maloader.git";
+2 -2
pkgs/os-specific/linux/eudev/default.nix
···
sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ=";
};
-
nativeBuildInputs = [ pkg-config ];
+
nativeBuildInputs = [ pkg-config gperf ];
buildInputs = [
-
glib gperf util-linux kmod
+
glib util-linux kmod
];
in
stdenv.mkDerivation {
+10 -11
pkgs/os-specific/linux/fbterm/default.nix
···
-
{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}:
+
{ stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86 }:
let
s = # Generated upstream information
-
{
-
baseName="fbterm";
-
version="1.7.0";
-
name="fbterm-1.7.0";
-
hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
-
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz";
-
sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
-
};
-
buildInputs = [gpm freetype fontconfig ncurses]
+
{
+
version = "1.7.0";
+
pname = "fbterm";
+
hash = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
+
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz";
+
sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
+
};
+
buildInputs = [ gpm freetype fontconfig ncurses ]
++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86;
in
stdenv.mkDerivation {
-
inherit (s) name version;
+
inherit (s) pname version;
src = fetchurl {
inherit (s) url sha256;
};
+3
pkgs/os-specific/linux/kernel/common-config.nix
···
BSD_PROCESS_ACCT_V3 = yes;
+
BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support
BT_HCIUART_BCSP = option yes;
BT_HCIUART_H4 = option yes; # UART (H4) protocol support
BT_HCIUART_LL = option yes;
···
X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes;
LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ];
+
+
SCHED_CORE = whenAtLeast "5.14" yes;
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enable CPU/memory hotplug support
+2 -2
pkgs/os-specific/linux/kernel/linux-zen.nix
···
let
# having the full version string here makes it easier to update
-
modDirVersion = "5.15.1-zen1";
+
modDirVersion = "5.15.2-zen1";
parts = lib.splitString "-" modDirVersion;
version = lib.elemAt parts 0;
suffix = lib.elemAt parts 1;
···
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${modDirVersion}";
-
sha256 = "sha256-mDAwsqLR55WFaPKO1SXZuxeuaFzprMY4ryeEUdCqKGU=";
+
sha256 = "sha256-6cYKlRAd8kbphIThmTdWieH322Rj1KSmCJCmYRt8o2w=";
};
structuredExtraConfig = with lib.kernel; {
+7 -7
pkgs/os-specific/linux/mwprocapture/default.nix
···
let
bits =
-
if stdenv.is64bit then "64"
-
else "32";
+
if stdenv.is64bit then "64"
+
else "32";
libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ];
in
stdenv.mkDerivation rec {
-
name = "mwprocapture-1.3.0.${version}-${kernel.version}";
-
version = "4236";
+
pname = "mwprocapture";
+
subVersion = "4236";
+
version = "1.3.0.${subVersion}-${kernel.version}";
src = fetchurl {
-
url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz";
+
url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz";
sha256 = "1mfgj84km276sq5i8dny1vqp2ycqpvgplrmpbqwnk230d0w3qs74";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
-
preConfigure =
-
''
+
preConfigure = ''
cd ./src
export INSTALL_MOD_PATH="$out"
'';
+1 -1
pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:
+
{ lib, stdenv, fetchFromGitHub, kernel }:
let
rev = "307d694076b056588c652c2bdaa543a89eb255d9";
+9 -7
pkgs/os-specific/linux/seturgent/default.nix
···
{ lib, stdenv, fetchurl, libX11, xorgproto, unzip }:
stdenv.mkDerivation {
-
name = "seturgent-2012-08-17";
+
pname = "seturgent";
+
version = "unstable-2012-08-17";
src = fetchurl {
url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip";
···
nativeBuildInputs = [ unzip ];
buildInputs = [
-
libX11 xorgproto
+
libX11
+
xorgproto
];
installPhase = ''
···
'';
meta = {
-
platforms = lib.platforms.linux;
-
description = "Set an application's urgency hint (or not)";
-
maintainers = [ lib.maintainers.yarr ];
-
homepage = "https://github.com/hiltjo/seturgent";
-
license = lib.licenses.mit;
+
platforms = lib.platforms.linux;
+
description = "Set an application's urgency hint (or not)";
+
maintainers = [ lib.maintainers.yarr ];
+
homepage = "https://github.com/hiltjo/seturgent";
+
license = lib.licenses.mit;
};
}
+6 -5
pkgs/os-specific/linux/udisks-glue/default.nix
···
{ lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }:
-
stdenv.mkDerivation {
-
name = "udisks-glue-1.3.5";
+
stdenv.mkDerivation rec {
+
pname = "udisks-glue";
+
version = "1.3.5";
src = fetchurl {
-
url = "https://github.com/fernandotcl/udisks-glue/archive/release-1.3.5.tar.gz";
+
url = "https://github.com/fernandotcl/udisks-glue/archive/release-${version}.tar.gz";
sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176";
};
···
homepage = "https://github.com/fernandotcl/udisks-glue";
description = "A tool to associate udisks events to user-defined actions";
platforms = lib.platforms.linux;
-
maintainers = with lib.maintainers; [pSub];
+
maintainers = with lib.maintainers; [ pSub ];
license = lib.licenses.bsd2;
broken = true;
-
hydraPlatforms = [];
+
hydraPlatforms = [ ];
};
}
+40 -8
pkgs/os-specific/linux/udisks/1-default.nix
···
-
{ lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib
-
, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
-
, libxslt, docbook_xsl, util-linux, libgudev }:
+
{ lib
+
, stdenv
+
, fetchurl
+
, pkg-config
+
, sg3_utils
+
, udev
+
, glib
+
, dbus
+
, dbus-glib
+
, polkit
+
, parted
+
, lvm2
+
, libatasmart
+
, intltool
+
, libuuid
+
, mdadm
+
, libxslt
+
, docbook_xsl
+
, util-linux
+
, libgudev
+
}:
stdenv.mkDerivation rec {
-
name = "udisks-1.0.5";
+
pname = "udisks";
+
version = "1.0.5";
src = fetchurl {
-
url = "https://hal.freedesktop.org/releases/${name}.tar.gz";
+
url = "https://hal.freedesktop.org/releases/udisks-${version}.tar.gz";
sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";
};
···
'';
buildInputs =
-
[ sg3_utils udev glib dbus dbus-glib polkit parted libgudev
-
lvm2 libatasmart intltool libuuid libxslt docbook_xsl
+
[
+
sg3_utils
+
udev
+
glib
+
dbus
+
dbus-glib
+
polkit
+
parted
+
libgudev
+
lvm2
+
libatasmart
+
intltool
+
libuuid
+
libxslt
+
docbook_xsl
];
nativeBuildInputs = [ pkg-config ];
···
platforms = platforms.linux;
license = with licenses; [ gpl2 lgpl2Plus ];
broken = true;
-
hydraPlatforms = [];
+
hydraPlatforms = [ ];
};
}
+2 -1
pkgs/os-specific/windows/jom/default.nix
···
# both mingw32 and mingw64.
stdenv.mkDerivation {
-
name = "jom-1.0.11";
+
pname = "jom";
+
version = "1.0.11";
src = fetchgit {
url = "git://gitorious.org/qt-labs/jom.git";
+3 -2
pkgs/os-specific/windows/mingwrt/default.nix
···
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
-
name = "mingwrt-5.0.2";
+
pname = "mingwrt";
+
version = "5.0.2";
src = fetchurl {
-
url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/${name}/${name}-mingw32-src.tar.xz";
+
url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/mingwrt-${version}/mingwrt-${version}-mingw32-src.tar.xz";
sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp";
};
+3 -2
pkgs/os-specific/windows/w32api/default.nix
···
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
-
name = "w32api-3.17-2";
+
pname = "w32api";
+
version = "3.17-2";
src = fetchurl {
-
url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";
+
url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-${lib.versions.majorMinor version}/w32api-${version}-mingw32-src.tar.lzma";
sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
};
+5 -4
pkgs/os-specific/windows/wxMSW-2.8/default.nix
···
{ lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:
-
stdenv.mkDerivation {
-
name = "wxMSW-2.8.11";
+
stdenv.mkDerivation rec {
+
pname = "wxMSW";
+
version = "2.8.11";
src = fetchurl {
-
url = "mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz";
+
url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.gz";
sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj";
};
···
(cd $out/include && ln -s wx-*/* .)
";
-
passthru = {inherit compat24 compat26 unicode;};
+
passthru = { inherit compat24 compat26 unicode; };
meta = {
platforms = lib.platforms.windows;
+14 -1
pkgs/servers/home-assistant/default.nix
···
});
})
+
(self: super: {
+
nettigo-air-monitor = super.nettigo-air-monitor.overridePythonAttrs (oldAttrs: rec {
+
version = "1.1.1";
+
src = fetchFromGitHub {
+
owner = "bieniu";
+
repo = "nettigo-air-monitor";
+
rev = version;
+
sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE=";
+
};
+
});
+
})
+
# Pinned due to API changes in pyruckus>0.12
(self: super: {
pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {
···
"tests/auth/mfa_modules/test_notify.py"
# emulated_hue/test_upnp.py: Tries to establish the public ipv4 address
"tests/components/emulated_hue/test_upnp.py"
-
# tado/test_climate.py: Tries to connect to my.tado.com
+
# tado/test_{climate,water_heater}.py: Tries to connect to my.tado.com
"tests/components/tado/test_climate.py"
+
"tests/components/tado/test_water_heater.py"
];
disabledTests = [
+3 -3
pkgs/servers/http/nginx/modules.nix
···
name = "video-thumbextractor";
owner = "wandenberg";
repo = "nginx-video-thumbextractor-module";
-
rev = "0.9.0";
-
sha256 = "1b0v471mzbcys73pzr7gpvzzhff0cva0l5ff32cv7z1v9c0ypji7";
+
rev = "92b80642538eec4cfc98114dec5917b8d820e912";
+
sha256 = "0a8d9ifryhhnll7k7jcsf9frshk5yhpsgz7zgxdmw81wbz5hxklc";
};
-
inputs = [ pkgs.ffmpeg_3 ];
+
inputs = [ pkgs.ffmpeg ];
};
vod = {
+3 -3
pkgs/servers/klipper/default.nix
···
}:
stdenv.mkDerivation rec {
pname = "klipper";
-
version = "unstable-2021-09-21";
+
version = "unstable-2021-11-10";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
-
rev = "0b918b357cb0c282d53cbdf59e1931a2054cd60a";
-
sha256 = "sha256-vUhP71vZ5XFG7MDkPFpAcCUL4kIdzHJ1hAkwqIi6ksQ=";
+
rev = "c179db3d4331db9d85c7acfdaa1e96e295d277ba";
+
sha256 = "sha256-/fFbhKiSQq9E9iucinTgUTyOtfDKCMgvzebHjfOaJ+M=";
};
sourceRoot = "source/klippy";
+173
pkgs/servers/openvscode-server/default.nix
···
+
{ lib, stdenv, fetchFromGitHub, makeWrapper, runCommand
+
, cacert, moreutils, jq, git, pkg-config, yarn, python3
+
, esbuild, nodejs-14_x, libsecret, xorg, ripgrep
+
, AppKit, Cocoa, Security, cctools }:
+
+
let
+
system = stdenv.hostPlatform.system;
+
+
nodejs = nodejs-14_x;
+
yarn' = yarn.override { inherit nodejs; };
+
defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"];
+
+
vsBuildTarget = {
+
x86_64-linux = "linux-x64";
+
aarch64-linux = "linux-arm64";
+
x86_64-darwin = "darwin";
+
}.${system} or (throw "Unsupported system ${system}");
+
+
# replaces esbuild's download script with a binary from nixpkgs
+
patchEsbuild = path : version : ''
+
mkdir -p ${path}/node_modules/esbuild/bin
+
jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json
+
sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js
+
ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild
+
'';
+
+
in stdenv.mkDerivation rec {
+
pname = "openvscode-server";
+
version = "1.62.0";
+
+
src = fetchFromGitHub {
+
owner = "gitpod-io";
+
repo = "openvscode-server";
+
rev = "openvscode-server-v${version}";
+
sha256 = "0lmka1hgf1703h70s7i2lx07535n2l867kmnc5h89c4vaswy6649";
+
};
+
+
yarnCache = stdenv.mkDerivation {
+
name = "${pname}-${version}-${system}-yarn-cache";
+
inherit src;
+
nativeBuildInputs = [ cacert yarn git ];
+
buildPhase = ''
+
export HOME=$PWD
+
+
yarn config set yarn-offline-mirror $out
+
find "$PWD" -name "yarn.lock" -printf "%h\n" | \
+
xargs -I {} yarn --cwd {} \
+
--frozen-lockfile --ignore-scripts --ignore-platform \
+
--ignore-engines --no-progress --non-interactive
+
'';
+
+
installPhase = ''
+
echo yarnCache
+
'';
+
+
outputHashMode = "recursive";
+
outputHashAlgo = "sha256";
+
outputHash = "142m0vkddzv09rbbqw7y7x19q7akkn00dn6az5ppr86k6bmhyk6p";
+
};
+
+
# Extract the Node.js source code which is used to compile packages with
+
# native bindings
+
nodeSources = runCommand "node-sources" {} ''
+
tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
+
mv node-* $out
+
'';
+
+
nativeBuildInputs = [
+
nodejs yarn' python3 pkg-config makeWrapper git jq moreutils
+
];
+
buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
+
++ (with xorg; [ libX11 libxkbfile ])
+
++ lib.optionals stdenv.isDarwin [
+
AppKit Cocoa Security cctools
+
];
+
+
patches = [
+
# Patch out remote download of nodejs from build script
+
./remove-node-download.patch
+
];
+
+
postPatch = ''
+
export HOME=$PWD
+
+
# remove all built-in extensions, as these are 3rd party extensions that
+
# get downloaded from vscode marketplace
+
jq --slurp '.[0] * .[1]' "product.json" <(
+
cat << EOF
+
{
+
"builtInExtensions": []
+
}
+
EOF
+
) | sponge product.json
+
'';
+
+
configurePhase = ''
+
# set default yarn opts
+
${lib.concatMapStrings (option: ''
+
yarn --offline config set ${option}
+
'') defaultYarnOpts}
+
+
# set offline mirror to yarn cache we created in previous steps
+
yarn --offline config set yarn-offline-mirror "${yarnCache}"
+
'' + lib.optionalString stdenv.isLinux ''
+
# set nodedir, so we can build binaries later
+
npm config set nodedir "${nodeSources}"
+
'';
+
+
buildPhase = ''
+
# install dependencies
+
yarn --offline --ignore-scripts
+
+
# run yarn install everywhere, skipping postinstall so we can patch esbuild
+
find . -path "*node_modules" -prune -o \
+
-path "./*/*" -name "yarn.lock" -printf "%h\n" | \
+
xargs -I {} yarn --cwd {} \
+
--frozen-lockfile --offline --ignore-scripts --ignore-engines
+
+
${patchEsbuild "./build" "0.12.6"}
+
${patchEsbuild "./extensions" "0.11.23"}
+
+
# patch shebangs of node_modules to allow binary packages to build
+
patchShebangs ./remote/node_modules
+
+
# put ripgrep binary into bin so postinstall does not try to download it
+
find -name vscode-ripgrep -type d \
+
-execdir mkdir -p {}/bin \; \
+
-execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;
+
'' + lib.optionalString stdenv.isDarwin ''
+
# use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+
+
# (see issue #101229)
+
pushd ./remote/node_modules/@parcel/watcher
+
mkdir -p ./build/Release
+
mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node
+
jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json
+
popd
+
'' + ''
+
# rebuild binaries, we use npm here, as yarn does not provide an alternative
+
# that would not attempt to try to reinstall everything and break our
+
# patching attempts
+
npm --prefix ./remote rebuild --build-from-source
+
+
# run postinstall scripts after patching
+
find . -path "*node_modules" -prune -o \
+
-path "./*/*" -name "yarn.lock" -printf "%h\n" | \
+
xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true'
+
+
# build and minify
+
yarn --offline gulp vscode-reh-web-${vsBuildTarget}-min
+
'';
+
+
installPhase = ''
+
mkdir -p $out/libexec
+
+
cp -R -T ../vscode-reh-web-${vsBuildTarget} "$out/libexec"
+
+
ln -s ${nodejs}/bin/node $out/libexec
+
+
makeWrapper "$out/libexec/server.sh" "$out/bin/openvscode-server"
+
'';
+
+
meta = with lib; {
+
description = "Run VS Code on a remote machine";
+
longDescription = ''
+
Run upstream VS Code on a remote machine with access through a modern web
+
browser from any device, anywhere.
+
'';
+
homepage = "https://github.com/gitpod-io/openvscode-server";
+
license = licenses.mit;
+
maintainers = with maintainers; [ dguenther ghuntley ];
+
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+
};
+
}
+27
pkgs/servers/openvscode-server/remove-node-download.patch
···
+
--- ./build/gulpfile.reh.js
+
+++ ./build/gulpfile.reh.js
+
@@ -277,8 +277,6 @@
+
.pipe(util.stripSourceMappingURL())
+
.pipe(jsFilter.restore);
+
+
- const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`;
+
- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });
+
+
let web = [];
+
if (type === 'reh-web') {
+
@@ -296,7 +294,6 @@
+
license,
+
sources,
+
deps,
+
- node,
+
...web
+
);
+
+
@@ -376,7 +373,6 @@
+
const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
+
+
const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
+
- gulp.task(`node-${platform}-${platform === 'darwin' ? 'x64' : arch}`),
+
util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
+
packageTask(type, platform, arch, sourceFolderName, destinationFolderName)
+
));
+4 -4
pkgs/servers/prowlarr/default.nix
···
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
-
x64-linux_hash = "sha256-wrBfgwzb+HI6cu9EyC70xZ5WsfkW+o+Q69jeCjoZRtI=";
-
arm64-linux_hash = "sha256-wnuLqd1T/21QyqjHbpK2w+WRyW1rd4pHqcRLFrIKHW8=";
-
x64-osx_hash = "sha256-gu+eByulCs9zLe3AXfVfcOXB49q6V7MWQ2DN2O/enfk=";
+
x64-linux_hash = "sha256-S3ktqBapIi6YIjDOIMziCzecS86hR2LIUey3SLNuWgg=";
+
arm64-linux_hash = "sha256-lxPglw3whyMQ+v7GpKMygxqINDoczKmh7KpGAuzuQwM=";
+
x64-osx_hash = "sha256-EUg3eC5QwGgCSi9qAPs6s8wenSXEmLvLHUTlvoLWAtc=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "prowlarr";
-
version = "0.1.1.1030";
+
version = "0.1.2.1060";
src = fetchurl {
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
+2 -2
pkgs/servers/web-apps/wordpress/default.nix
···
stdenv.mkDerivation rec {
pname = "wordpress";
-
version = "5.8.1";
+
version = "5.8.2";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
-
sha256 = "sha256-kMqQxK+jfa3IpHQ7XLERsgzaX5g84HPCwL69zmT6gio=";
+
sha256 = "sha256-o9KeTmZXTHtqa/Z2KOo1n6gVCFuna42dFrvf9OBC8v8=";
};
installPhase = ''
+3 -3
pkgs/shells/zsh/oh-my-zsh/default.nix
···
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
-
version = "2021-10-27";
+
version = "2021-11-11";
pname = "oh-my-zsh";
-
rev = "2e46b2a2dcb96cadd94283bdce95eca75bef1433";
+
rev = "b3ba9978cc42a5031c7b68e3cf917ec2e64643bc";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
-
sha256 = "ZZs7SBfRX1JUmjukvnOqMx77vXgoxqHEatGfRvfToK8=";
+
sha256 = "9a5eVMphQ0jay9ogc/9ZFS+vvHlXhPYCCo8kMdgVsnA=";
};
installPhase = ''
+2 -2
pkgs/shells/zsh/zinit/default.nix
···
pname = "zinit";
version = "3.7";
src = fetchFromGitHub {
-
owner = "zdharma";
+
owner = "zdharma-continuum";
repo = pname;
rev = "v${version}";
hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE=";
···
homepage = "https://github.com/zdharma/zinit";
description = "Flexible zsh plugin manager";
license = licenses.mit;
-
maintainers = with maintainers; [ pasqui23 ];
+
maintainers = with maintainers; [ pasqui23 sei40kr ];
};
}
+17 -9
pkgs/tools/X11/primus/lib.nix
···
-
{ lib, stdenv, fetchFromGitHub, fetchpatch
-
, libX11, libGL, mesa
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, fetchpatch
+
, libX11
+
, libGL
+
, mesa
, nvidia_x11 ? null
, libglvnd
}:
···
else if nvidia_x11.useGLVND then libglvnd
else nvidia_x11;
-
in stdenv.mkDerivation {
-
name = "primus-lib-2015-04-28";
+
in
+
stdenv.mkDerivation {
+
pname = "primus-lib";
+
version = "unstable-2015-04-28";
src = fetchFromGitHub {
owner = "amonakov";
···
buildInputs = [ libX11 libGL ];
-
makeFlags = [ "LIBDIR=$(out)/lib"
-
"PRIMUS_libGLa=${aPackage}/lib/libGL.so"
-
"PRIMUS_libGLd=${libGL}/lib/libGL.so"
-
"PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so"
-
];
+
makeFlags = [
+
"LIBDIR=$(out)/lib"
+
"PRIMUS_libGLa=${aPackage}/lib/libGL.so"
+
"PRIMUS_libGLd=${libGL}/lib/libGL.so"
+
"PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so"
+
];
installPhase = ''
ln -s $out/lib/libGL.so.1 $out/lib/libGL.so
+2 -2
pkgs/tools/X11/xdotool/default.nix
···
stdenv.mkDerivation rec {
pname = "xdotool";
-
version = "3.20210903.1";
+
version = "3.20211022.1";
src = fetchFromGitHub {
owner = "jordansissel";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-fmz/CJm1GgNOYjOfC6uNwDa8jV+GczPw8m6Qb2jw3rE=";
+
sha256 = "sha256-XFiaiHHtUSNFw+xhUR29+2RUHOa+Eyj1HHfjCUjwd9k=";
};
nativeBuildInputs = [ pkg-config perl ];
+2 -2
pkgs/tools/audio/abcmidi/default.nix
···
stdenv.mkDerivation rec {
pname = "abcMIDI";
-
version = "2021.10.11";
+
version = "2021.10.15";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
-
sha256 = "sha256-2M6nCJD1ovW8Wzw+ucii5PjeNTOiTletor7MPCMPl38=";
+
sha256 = "sha256-OEkSgT3Rg0ZcTCTeOd2+GlopzhI19spOLkH3nDDCWo8=";
};
meta = with lib; {
+3 -3
pkgs/tools/filesystems/lfs/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "lfs";
-
version = "1.1.0";
+
version = "1.2.1";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
-
sha256 = "gez5q1niIhzWJpsEkbVRuQFILo3tTO8aJq7ewZArJ5M=";
+
sha256 = "sha256-Cf9W0LnlvMm0XZe6lvx8hQejcwyfxBC6VKltAAfRD5I=";
};
-
cargoSha256 = "2U1xDG4bTimtmjwZ1z9ErlaOcBNJdRcHlEWVaiGg01M=";
+
cargoSha256 = "sha256-skP9VJuRMCyA06YjGbyNIt/DljP3fQQOIQDy6k10zGI=";
meta = with lib; {
description = "Get information on your mounted disks";
+16 -6
pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
···
-
{ lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkg-config, popt
-
, enablePython ? true, python ? null
+
{ lib
+
, stdenv
+
, fetchurl
+
, fetchpatch
+
, lvm2
+
, libgcrypt
+
, libuuid
+
, pkg-config
+
, popt
+
, enablePython ? true
+
, python ? null
}:
assert enablePython -> python != null;
stdenv.mkDerivation rec {
-
name = "cryptsetup-1.6.3";
+
pname = "cryptsetup";
+
version = "1.6.3";
src = fetchurl {
-
url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2";
+
url = "http://cryptsetup.googlecode.com/files/cryptsetup-${version}.tar.bz2";
sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2";
};
···
];
configureFlags = [ "--enable-cryptsetup-reencrypt" ]
-
++ lib.optional enablePython "--enable-python";
+
++ lib.optional enablePython "--enable-python";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lvm2 libgcrypt libuuid popt ]
-
++ lib.optional enablePython python;
+
++ lib.optional enablePython python;
meta = with lib; {
homepage = "http://code.google.com/p/cryptsetup/";
+3 -2
pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
···
{ lib, stdenv, fetchurl, lvm2 }:
stdenv.mkDerivation rec {
-
name = "dmraid-1.0.0.rc15";
+
pname = "dmraid";
+
version = "1.0.0.rc15";
src = fetchurl {
-
url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2";
+
url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2";
sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";
};
+3 -2
pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
···
{ lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }:
stdenv.mkDerivation rec {
-
name = "multipath-tools-0.4.9";
+
pname = "multipath-tools";
+
version = "0.4.9";
src = fetchurl {
-
url = "http://christophe.varoqui.free.fr/multipath-tools/${name}.tar.bz2";
+
url = "http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-${version}.tar.bz2";
sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d";
};
+16 -7
pkgs/tools/filesystems/nixpart/0.4/parted.nix
···
-
{ lib,stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
-
, util-linux, check
+
{ lib
+
, stdenv
+
, fetchurl
+
, fetchpatch
+
, lvm2
+
, libuuid
+
, gettext
+
, readline
+
, util-linux
+
, check
, enableStatic ? stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {
-
name = "parted-3.1";
+
pname = "parted";
+
version = "3.1";
src = fetchurl {
-
url = "mirror://gnu/parted/${name}.tar.xz";
+
url = "mirror://gnu/parted/parted-${version}.tar.xz";
sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y";
};
···
++ lib.optional (lvm2 != null) lvm2;
configureFlags =
-
(if (readline != null)
-
then [ "--with-readline" ]
-
else [ "--without-readline" ])
+
(if (readline != null)
+
then [ "--with-readline" ]
+
else [ "--without-readline" ])
++ lib.optional (lvm2 == null) "--disable-device-mapper"
++ lib.optional enableStatic "--enable-static";
+7 -5
pkgs/tools/graphics/wallutils/default.nix
···
{ buildGoPackage, fetchFromGitHub, lib
-
, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm
+
, pkg-config
+
, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm, libheif
}:
buildGoPackage rec {
pname = "wallutils";
-
version = "5.9.0";
+
version = "5.10.0";
src = fetchFromGitHub {
owner = "xyproto";
repo = "wallutils";
rev = version;
-
sha256 = "17xw1311xpmi5c8mwa9yvn4pxa7g4n09j84lvy61gmxc5m128fwy";
+
sha256 = "1phlkpy8kg4ai2xmachpbbxvl8fga9hqqbad2a2121yl60709l1k";
};
goPackagePath = "github.com/xyproto/wallutils";
···
sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go
'';
-
buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm ];
+
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ];
meta = with lib; {
description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";
inherit (src.meta) homepage;
license = licenses.mit;
-
maintainers = with maintainers; [ primeos ];
+
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
+5 -4
pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
···
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }:
stdenv.mkDerivation rec {
-
name = "fcitx-configtool-0.4.10";
+
pname = "fcitx-configtool";
+
version = "0.4.10";
meta = with lib; {
description = "GTK-based config tool for Fcitx";
-
license = licenses.gpl2;
-
platforms = platforms.linux;
+
license = licenses.gpl2;
+
platforms = platforms.linux;
maintainers = with maintainers; [ cdepillabout ];
};
src = fetchurl {
-
url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz";
+
url = "https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-${version}.tar.xz";
sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w";
};
+3 -3
pkgs/tools/misc/chezmoi/default.nix
···
buildGoModule rec {
pname = "chezmoi";
-
version = "2.7.3";
+
version = "2.7.4";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
-
sha256 = "sha256-xn9DSbAqfSK7CokxVRrHuOO62oSXKGR0/HZYadLLd74=";
+
sha256 = "sha256-RX9Hgjl/i/FWXHFp+yYWQEYDiOQijU+eiBnREu4K1Mg=";
};
-
vendorSha256 = "sha256-e+LsFlF83OGbhajaGGyWARv7O6dI6ZKm3yhDqrgmMpk=";
+
vendorSha256 = "sha256-tz3Vcw/p7BKcgc3EsLsSPOKhwqN5kysOcmER7OoKQ+w=";
doCheck = false;
+3 -3
pkgs/tools/misc/cht.sh/default.nix
···
stdenv.mkDerivation {
pname = "cht.sh";
-
version = "unstable-2021-10-20";
+
version = "unstable-2021-11-13";
nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub {
owner = "chubin";
repo = "cheat.sh";
-
rev = "5a79c76c9b8ef337cffb9537a3d8a47c9ffc8b04";
-
sha256 = "zDkYp2YPEur26qEwG8DQQzv8/T288HG/9mzzkN4SEtU=";
+
rev = "4bb7b14843c302695b7d47d4d814f38998da1a68";
+
sha256 = "NbB+UGydk0zSkqTPYw5KOHR0mv1UHH2pXLYdMRdG8UE=";
};
# Fix ".cht.sh-wrapped" in the help message
+5 -3
pkgs/tools/misc/ckb-next/default.nix
···
-
{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev
-
, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu }:
+
{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev, stdenv
+
, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu
+
, withPulseaudio ? stdenv.isLinux, libpulseaudio
+
}:
mkDerivation rec {
version = "0.4.4";
···
qttools
qtx11extras
libdbusmenu
-
];
+
] ++ lib.optional withPulseaudio libpulseaudio;
nativeBuildInputs = [
pkg-config
+2 -2
pkgs/tools/misc/flameshot/default.nix
···
mkDerivation rec {
pname = "flameshot";
-
version = "0.10.1";
+
version = "0.10.2";
src = fetchFromGitHub {
owner = "flameshot-org";
repo = "flameshot";
rev = "v${version}";
-
sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a";
+
sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4=";
};
patches = [
+15 -4
pkgs/tools/misc/tty-clock/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config }:
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config }:
stdenv.mkDerivation rec {
pname = "tty-clock";
-
version = "2.3";
+
version = "2.3+unstable=2021-04-07";
src = fetchFromGitHub {
owner = "xorg62";
repo = "tty-clock";
-
rev = "v${version}";
-
sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp";
+
# Use unreleased version to pull in fix for ncurses-6.3
+
rev = "9e00c32098524c30dac4dab701f7e33f8bc7c880";
+
sha256 = "14jrzz06jr29887bxgad1x6kd26c2fnqrc26864wqm3838fpcqw0";
};
+
+
patches = [
+
# Pull upstream patch pending inclusion fir more ncurses-6.3 fixes:
+
# https://github.com/xorg62/tty-clock/pull/100
+
(fetchpatch {
+
name = "ncurses-6.2.patch";
+
url = "https://github.com/xorg62/tty-clock/commit/4cfd73080da1964557484da620c401745d73881c.patch";
+
sha256 = "13pj1v6yrfc4vynsa746974kixfxxsy2jzzpl73c8bp7msr9d3md";
+
})
+
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ];
+2 -2
pkgs/tools/misc/ytree/default.nix
···
stdenv.mkDerivation rec {
pname = "ytree";
-
version = "2.03";
+
version = "2.04";
src = fetchurl {
url = "https://han.de/~werner/${pname}-${version}.tar.gz";
-
sha256 = "sha256-WDqnFVLRNH4Oq+OaI2+loXS/Z93piHGFO5/iojO8rvE=";
+
sha256 = "sha256-bnqLf2jv5tNlq+M6HQbXOa2F8io9VN3QrsJKNHjWZkI=";
};
buildInputs = [
+1 -1
pkgs/tools/networking/chrony/default.nix
···
hardeningEnable = [ "pie" ];
-
configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ]
+
configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" "--enable-ntp-signd" ]
++ lib.optional stdenv.isLinux "--enable-scfilter";
meta = with lib; {
+12 -5
pkgs/tools/networking/easyrsa/2.x.nix
···
-
{ lib, stdenv, fetchurl, autoreconfHook, makeWrapper
-
, gnugrep, openssl }:
+
{ lib
+
, stdenv
+
, fetchurl
+
, autoreconfHook
+
, makeWrapper
+
, gnugrep
+
, openssl
+
}:
-
stdenv.mkDerivation {
-
name = "easyrsa-2.2.0";
+
stdenv.mkDerivation rec {
+
pname = "easyrsa";
+
version = "2.2.0";
src = fetchurl {
-
url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz";
+
url = "https://github.com/OpenVPN/easy-rsa/archive/v${version}.tar.gz";
sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk";
};
+17 -1
pkgs/tools/networking/horst/default.nix
···
-
{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }:
+
{lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ncurses, libnl }:
stdenv.mkDerivation rec {
pname = "horst";
···
rev = "v${version}";
sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a";
};
+
+
patches = [
+
# Fix pending upstream inclusion for ncurses-6.3:
+
# https://github.com/br101/horst/pull/110
+
(fetchpatch {
+
name = "ncurses-6.3.patch";
+
url = "https://github.com/br101/horst/commit/c9e9b6cc1f97edb9c53f3a67b43f3588f3ac6ea7.patch";
+
sha256 = "15pahbnql44d5zzxmkd5ky8bl3c3hh3lh5190wynd90jrrhf1a26";
+
# collides for context change, well apply this part in postPatch
+
excludes = [ "display-main.c" ];
+
})
+
];
+
postPatch = ''
+
# Apply second part of ncurses-6.3.patch:
+
substituteInPlace display-main.c --replace 'wprintw(dump_win, str);' 'wprintw(dump_win, "%s", str);'
+
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses libnl ];
+11 -1
pkgs/tools/networking/nethogs/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }:
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }:
stdenv.mkDerivation rec {
pname = "nethogs";
···
rev = "v${version}";
sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9";
};
+
+
patches = [
+
# Pull upstream patch for ncurses-6.3 support:
+
# https://github.com/raboof/nethogs/pull/210
+
(fetchpatch {
+
name = "ncurses-6.3.patch";
+
url = "https://github.com/raboof/nethogs/commit/455daf357da7f394763e5b93b11b3defe1f82ed1.patch";
+
sha256 = "0wkp0yr6qg1asgvmsn7blf7rq48sh5k4n3w0nxf5869hxvkhnnzs";
+
})
+
];
buildInputs = [ ncurses libpcap ];
+16 -9
pkgs/tools/networking/offlineimap/default.nix
···
{ lib
, fetchFromGitHub
-
, python2Packages
+
, python3
, asciidoc
, cacert
, docbook_xsl
···
, libxslt
}:
-
python2Packages.buildPythonApplication rec {
-
version = "7.3.4";
+
python3.pkgs.buildPythonApplication rec {
pname = "offlineimap";
+
version = "8.0.0";
src = fetchFromGitHub {
owner = "OfflineIMAP";
-
repo = "offlineimap";
+
repo = "offlineimap3";
rev = "v${version}";
-
sha256 = "sha256-sra2H0+5+LAIU3+uJnii+AYA05nuDyKVMW97rbaFOfI=";
+
sha256 = "0y3giaz9i8vvczlxkbwymfkn3vi9fv599dy4pc2pn2afxsl4mg2w";
};
nativeBuildInputs = [
···
libxslt
];
-
propagatedBuildInputs = with python2Packages; [
-
six
+
propagatedBuildInputs = with python3.pkgs; [
+
certifi
+
distro
+
imaplib2
kerberos
+
pysocks
rfc6555
-
pysocks
+
urllib3
];
postPatch = ''
···
sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |"
# Provide CA certificates (Used when "sslcacertfile = OS-DEFAULT" is configured")
-
sed -i offlineimap/utils/distro.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"'
+
sed -i offlineimap/utils/distro_utils.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"'
'';
postInstall = ''
···
# Test requires credentials
doCheck = false;
+
+
pythonImportsCheck = [
+
"offlineimap"
+
];
meta = with lib; {
description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
+3 -2
pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
···
-
{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
+
{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
stdenv.mkDerivation {
-
name = "openvpn-learnaddress-19b03c3";
+
pname = "openvpn-learnaddress";
+
version = "unstable-2013-10-21";
src = fetchgit {
url = "https://gist.github.com/4058733.git";
+4 -2
pkgs/tools/networking/openvpn/update-resolv-conf.nix
···
let
binPath = lib.makeBinPath [ coreutils openresolv systemd ];
-
in stdenv.mkDerivation {
-
name = "update-resolv-conf-2017-06-21";
+
in
+
stdenv.mkDerivation {
+
pname = "update-resolv-conf";
+
version = "unstable-2017-06-21";
src = fetchFromGitHub {
owner = "masterkorp";
+1 -1
pkgs/tools/nix/info/info.sh
···
}
desc_system() {
-
nixev '(import <nixpkgs> {}).system'
+
nixev '(import <nixpkgs> {}).stdenv.hostPlatform.system'
}
desc_host_os() {
+2 -2
pkgs/tools/package-management/nix-update/default.nix
···
{ lib
, buildPythonApplication
, fetchFromGitHub
-
, nixUnstable
+
, nix
, nix-prefetch
, nixpkgs-fmt
, nixpkgs-review
···
};
makeWrapperArgs = [
-
"--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ])
+
"--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch nixpkgs-fmt nixpkgs-review ])
];
checkPhase = ''
+3 -2
pkgs/tools/security/gnupg/1.nix
···
{ lib, stdenv, fetchurl, readline, bzip2 }:
stdenv.mkDerivation rec {
-
name = "gnupg-1.4.23";
+
pname = "gnupg";
+
version = "1.4.23";
src = fetchurl {
-
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
+
url = "mirror://gnupg/gnupg/gnupg-${version}.tar.bz2";
sha256 = "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9";
};
+3 -3
pkgs/tools/security/gopass/default.nix
···
buildGoModule rec {
pname = "gopass";
-
version = "1.12.8";
+
version = "1.13.0";
nativeBuildInputs = [ installShellFiles makeWrapper ];
···
owner = "gopasspw";
repo = pname;
rev = "v${version}";
-
sha256 = "0f3nnhipx2p8w04rxva0pcf7g1nhr4f5bz5dbvr2m76lkiaz5q3v";
+
sha256 = "sha256-MBpk84H3Ng/+rCjW2Scm/su0/5kgs7IzvFk/bFLNzXY=";
};
-
vendorSha256 = "14khs15k9d5m5dms3l4a5bi0s3zl1irm0i4s9pf86gpyz7b55l6a";
+
vendorSha256 = "sha256-HGc6jUp4WO5P5dwfa0r7+X78a8us9fWrf+/IOotZHqk=";
subPackages = [ "." ];
+1 -1
pkgs/tools/system/tree/default.nix
···
preConfigure = ''
sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |'
-
makeFlags+=("CC=$CC")
+
makeFlagsArray+=("CC=$CC")
'';
makeFlags = [
+4 -3
pkgs/tools/text/gnused/422.nix
···
{ lib, stdenv, fetchurl }:
-
stdenv.mkDerivation {
-
name = "gnused-4.2.2";
+
stdenv.mkDerivation rec {
+
pname = "gnused";
+
version = "4.2.2";
src = fetchurl {
-
url = "mirror://gnu/sed/sed-4.2.2.tar.bz2";
+
url = "mirror://gnu/sed/sed-${version}.tar.bz2";
sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
};
+6 -7
pkgs/tools/text/highlight/default.nix
···
{ lib, stdenv, fetchFromGitLab, getopt, lua, boost, pkg-config, swig, perl, gcc }:
-
with lib;
-
let
self = stdenv.mkDerivation rec {
pname = "highlight";
···
enableParallelBuilding = true;
-
nativeBuildInputs = [ pkg-config swig perl ] ++ optional stdenv.isDarwin gcc;
+
nativeBuildInputs = [ pkg-config swig perl ]
+
++ lib.optional stdenv.isDarwin gcc;
buildInputs = [ getopt lua boost ];
-
prePatch = ''
+
postPatch = ''
substituteInPlace src/makefile \
--replace "shell pkg-config" "shell $PKG_CONFIG"
substituteInPlace makefile \
···
# This has to happen _before_ the main build because it does a
# `make clean' for some reason.
-
preBuild = optionalString (!stdenv.isDarwin) ''
+
preBuild = lib.optionalString (!stdenv.isDarwin) ''
make -C extras/swig $makeFlags perl
'';
-
postCheck = optionalString (!stdenv.isDarwin) ''
+
postCheck = lib.optionalString (!stdenv.isDarwin) ''
perl -Iextras/swig extras/swig/testmod.pl
'';
-
preInstall = optionalString (!stdenv.isDarwin) ''
+
preInstall = lib.optionalString (!stdenv.isDarwin) ''
mkdir -p $out/${perl.libPrefix}
install -m644 extras/swig/highlight.{so,pm} $out/${perl.libPrefix}
make -C extras/swig clean # Clean up intermediate files.
+2 -2
pkgs/tools/text/mark/default.nix
···
buildGoModule rec {
pname = "mark";
-
version = "6.3";
+
version = "6.4";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
-
sha256 = "sha256-HKP8ZYhYDJizZ91q4MRwS00YIMvgB6EJ3au5rMg02hg=";
+
sha256 = "sha256-Ti7qxNb+7S67bXdvEWPyi/v/OAsAI4pd41dlF7GFjjo=";
};
vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0=";
+2 -2
pkgs/tools/text/proselint/default.nix
···
buildPythonApplication rec {
pname = "proselint";
-
version = "0.12.0";
+
version = "0.13.0";
doCheck = false; # fails to pass because it tries to run in home directory
src = fetchurl {
url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz";
-
sha256 = "2a98d9c14382d94ed9122a6c0b0657a814cd5c892c77d9477309fc99f86592e6";
+
sha256 = "7dd2b63cc2aa390877c4144fcd3c80706817e860b017f04882fbcd2ab0852a58";
};
propagatedBuildInputs = [ click future six ];
+5 -4
pkgs/tools/typesetting/pdftk/legacy.nix
···
{ fetchurl, lib, stdenv, gcj, unzip }:
-
stdenv.mkDerivation {
-
name = "pdftk-2.02";
+
stdenv.mkDerivation rec {
+
pname = "pdftk";
+
version = "2.02";
src = fetchurl {
-
url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip";
+
url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-${version}-src.zip";
sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi";
};
···
description = "Simple tool for doing everyday things with PDF documents";
homepage = "https://www.pdflabs.com/tools/pdftk-server/";
license = lib.licenses.gpl2;
-
maintainers = with lib.maintainers; [raskin];
+
maintainers = with lib.maintainers; [ raskin ];
platforms = with lib.platforms; linux;
broken = true; # Broken on Hydra since 2020-08-24
};
+2 -2
pkgs/tools/typesetting/scdoc/default.nix
···
stdenv.mkDerivation rec {
pname = "scdoc";
-
version = "1.11.1";
+
version = "1.11.2";
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = pname;
rev = version;
-
sha256 = "1g37j847j3h4a4qbbfbr6vvsxpifj9v25jgv25nd71d1n0dxlhvk";
+
sha256 = "07c2vmdgqifbynm19zjnrk7h102pzrriv73izmx8pmd7b3xl5mfq";
};
postPatch = ''
+5 -4
pkgs/tools/typesetting/tex/pgf/1.x.nix
···
-
{lib, stdenv, fetchurl}:
+
{ lib, stdenv, fetchurl }:
-
stdenv.mkDerivation {
-
name = "pgf-1.18";
+
stdenv.mkDerivation rec {
+
pname = "pgf";
+
version = "1.18";
src = fetchurl {
-
url = "mirror://sourceforge/pgf/pgf-1.18.tar.gz";
+
url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz";
sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv";
};
+5 -4
pkgs/tools/typesetting/tex/pgf/2.x.nix
···
-
{lib, stdenv, fetchurl}:
+
{ lib, stdenv, fetchurl }:
-
stdenv.mkDerivation {
-
name = "pgf-2.00";
+
stdenv.mkDerivation rec {
+
pname = "pgf";
+
version = "2.00";
src = fetchurl {
-
url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz";
+
url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz";
sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264";
};
+5 -4
pkgs/tools/typesetting/tex/pgf/3.x.nix
···
-
{lib, stdenv, fetchurl, unzip}:
+
{ lib, stdenv, fetchurl, unzip }:
-
stdenv.mkDerivation {
-
name = "pgf-3.00";
+
stdenv.mkDerivation rec {
+
pname = "pgf";
+
version = "3.0.0";
src = fetchurl {
-
url = "mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip";
+
url = "mirror://sourceforge/project/pgf/pgf/version%20${version}/pgf_${version}.tds.zip";
sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
};
+11
pkgs/top-level/all-packages.nix
···
libpinyin = callPackage ../development/libraries/libpinyin { };
+
inherit (import ../development/libraries/libsbsms pkgs)
+
libsbsms
+
libsbsms_2_0_2
+
libsbsms_2_3_0
+
;
+
libskk = callPackage ../development/libraries/libskk {
inherit (gnome) gnome-common;
};
···
vscodium = callPackage ../applications/editors/vscode/vscodium.nix { };
vscodium-fhs = vscodium.fhs;
vscodium-fhsWithPackages = vscodium.fhsWithPackages;
+
+
openvscode-server = callPackage ../servers/openvscode-server {
+
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
+
inherit (darwin) cctools;
+
};
code-server = callPackage ../servers/code-server {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
+1 -2
pkgs/top-level/metrics.nix
···
runCommand "nixpkgs-metrics"
{ nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ];
-
#FIXME: the job doesn't work, see issue #76776
-
#requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time
+
requiredSystemFeatures = [ "benchmark" ]; # dedicated `t2a` machine, by @vcunat
}
''
export NIX_STORE_DIR=$TMPDIR/store
+15 -1
pkgs/top-level/python-packages.nix
···
docloud = callPackage ../development/python-modules/docloud { };
+
docstring-to-markdown = callPackage ../development/python-modules/docstring-to-markdown { };
+
docopt = callPackage ../development/python-modules/docopt { };
docopt-ng = callPackage ../development/python-modules/docopt-ng { };
···
jdcal = callPackage ../development/python-modules/jdcal { };
jedi = callPackage ../development/python-modules/jedi { };
+
+
jedi-language-server = callPackage ../development/python-modules/jedi-language-server { };
jeepney = callPackage ../development/python-modules/jeepney { };
···
qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { };
+
qiskit = callPackage ../development/python-modules/qiskit { };
+
qiskit-aer = callPackage ../development/python-modules/qiskit-aer { };
qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { };
-
qiskit = callPackage ../development/python-modules/qiskit { };
+
qiskit-finance = callPackage ../development/python-modules/qiskit-finance { };
qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };
qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { };
+
+
qiskit-machine-learning = callPackage ../development/python-modules/qiskit-machine-learning { };
+
+
qiskit-nature = callPackage ../development/python-modules/qiskit-nature { };
+
+
qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { };
qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };
···
watermark = callPackage ../development/python-modules/watermark { };
wavedrom = callPackage ../development/python-modules/wavedrom { };
+
+
wavefile = callPackage ../development/python-modules/wavefile { };
wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { };