nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-03 00:14:57 +00:00 committed by GitHub
commit 74200a7126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 8100 additions and 2479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/labels.yml vendored
View File

@ -2,6 +2,7 @@ name: "Label PR"
on:
pull_request_target:
types: [edited, opened, synchronize, reopened]
jobs:
labels:

6
maintainers/maintainer-list.nix
View File

@ -9821,6 +9821,12 @@
githubId = 27586264;
name = "Tobias Schmidt";
};
totoroot = {
name = "Matthias Thym";
email = "git@thym.at";
github = "totoroot";
githubId = 39650930;
};
travisbhartwell = {
email = "nafai@travishartwell.net";
github = "travisbhartwell";

9
nixos/modules/services/monitoring/grafana.nix
View File

@ -15,6 +15,7 @@ let
SERVER_PROTOCOL = cfg.protocol;
SERVER_HTTP_ADDR = cfg.addr;
SERVER_HTTP_PORT = cfg.port;
SERVER_SOCKET = cfg.socket;
SERVER_DOMAIN = cfg.domain;
SERVER_ROOT_URL = cfg.rootUrl;
SERVER_STATIC_ROOT_PATH = cfg.staticRootPath;
@ -291,6 +292,12 @@ in {
type = types.int;
};
socket = mkOption {
description = "Listening socket.";
default = "/run/grafana/grafana.sock";
type = types.str;
};
domain = mkOption {
description = "The public facing domain name used to access grafana from a browser.";
default = "localhost";
@ -622,6 +629,8 @@ in {
serviceConfig = {
WorkingDirectory = cfg.dataDir;
User = "grafana";
RuntimeDirectory = "grafana";
RuntimeDirectoryMode = "0755";
};
preStart = ''
ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir}

14
nixos/modules/services/x11/desktop-managers/kodi.nix
View File

@ -14,6 +14,16 @@ in
default = false;
description = "Enable the kodi multimedia center.";
};
package = mkOption {
type = types.package;
default = pkgs.kodi;
defaultText = "pkgs.kodi";
example = "pkgs.kodi.withPackages (p: with p; [ jellyfin pvr-iptvsimple vfs-sftp ])";
description = ''
Package that should be used for Kodi.
'';
};
};
};
@ -21,11 +31,11 @@ in
services.xserver.desktopManager.session = [{
name = "kodi";
start = ''
LIRC_SOCKET_PATH=/run/lirc/lircd ${pkgs.kodi}/bin/kodi --standalone &
LIRC_SOCKET_PATH=/run/lirc/lircd ${cfg.package}/bin/kodi --standalone &
waitPID=$!
'';
}];
environment.systemPackages = [ pkgs.kodi ];
environment.systemPackages = [ cfg.package ];
};
}

4
nixos/tests/pomerium.nix
View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: {
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "pomerium";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with lib.maintainers; {
maintainers = [ lukegb ];
};

2
pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
sha256 = "10nf29zr0xg9mxmknkc39jh3y9kpxzy5wg1v0s3kkd180lja9zpn";
sha256 = "sha256-k7L6CU2lY9192tfaWtVOxq9BCY7FZZdxmHT8EA+ZFsk=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];

36
pkgs/applications/audio/spotify-qt/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ fetchFromGitHub
, lib
, cmake
, mkDerivation
, libxcb
, qtbase
, qtsvg
}:
mkDerivation rec {
pname = "spotify-qt";
version = "3.5";
src = fetchFromGitHub {
owner = "kraxarn";
repo = pname;
rev = "v${version}";
sha256 = "1bgd0q4sbbww3lbrx2zwgaz0sl7qh195s4kvgsq16gv7ij82bskn";
};
buildInputs = [ libxcb qtbase qtsvg ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=" ];
installFlags = [ "DESTDIR=$(out)" ];
meta = with lib; {
description = "Lightweight unofficial Spotify client using Qt";
homepage = "https://github.com/kraxarn/spotify-qt";
license = licenses.gpl3Only;
maintainers = with maintainers; [ kiyengar ];
platforms = platforms.unix;
};
}

3
pkgs/applications/editors/jucipp/default.nix
View File

@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ xnwdd ];
# error: token ""1.1"" is not valid in preprocessor expression
# TODO: fix pname being different from the attribute name
broken = true;
};
src = fetchgit {

7
pkgs/applications/misc/khard/default.nix
View File

@ -1,4 +1,4 @@
{ lib, glibcLocales, python3 }:
{ lib, python3 }:
python3.pkgs.buildPythonApplication rec {
version = "0.17.0";
@ -9,6 +9,11 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "062nv4xkfsjc11k9m52dh6xjn9z68a4a6x1s8z05wwv4jbp1lkhn";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
python3.pkgs.setuptools-scm
];
propagatedBuildInputs = with python3.pkgs; [
atomicwrites
configobj

10
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
"version": "89.0.4389.90",
"sha256": "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi",
"sha256bin64": "1hgpx7isp9krarj7jpbhs97ym4i9j9a1srywv9pdfzbhw6cid2pk",
"version": "89.0.4389.114",
"sha256": "007df9p78bbmk3iyfi8qn57mmn68qqrdhx6z8n2hl8ksd7lspw7j",
"sha256bin64": "06wblyvyr93032fbzwm6qpzz4jjm6adziq4i4n6kmfdix2ajif8a",
"deps": {
"gn": {
"version": "2021-01-07",
@ -55,8 +55,8 @@
"sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
},
"ungoogled-patches": {
"rev": "89.0.4389.90-1",
"sha256": "0pr756d1b4wc67d61b21yszi7mx1hsjy14i44j0kvcwm05pgnf79"
"rev": "89.0.4389.114-1",
"sha256": "0cr2i51gxhgl55c8f9w0ra3m5q2dk03sf7p2qn4bqq1l1l72hw6s"
}
}
}

56
pkgs/applications/office/fava/default.nix
View File

@ -1,40 +1,44 @@
{ lib, python3, beancount }:
{ lib, python3 }:
let
inherit (python3.pkgs) buildPythonApplication fetchPypi;
in
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "fava";
version = "1.18";
src = fetchPypi {
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5";
};
checkInputs = [ python3.pkgs.pytest ];
propagatedBuildInputs = with python3.pkgs;
[
Babel
cheroot
flaskbabel
flask
jinja2
beancount
click
markdown2
ply
simplejson
werkzeug
jaraco_functools
];
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
# CLI test expects fava on $PATH. Not sure why static_url fails.
# the entry_slices and render_entries requires other files to pass
checkPhase = ''
py.test tests -k 'not cli and not static_url and not entry_slice and not render_entries'
propagatedBuildInputs = with python3.pkgs; [
Babel
cheroot
flaskbabel
flask
jinja2
beancount
click
markdown2
ply
simplejson
werkzeug
jaraco_functools
];
checkInputs = with python3.pkgs; [
pytestCheckHook
];
preCheck = ''
export HOME=$TEMPDIR
'';
disabledTests = [
# runs fava in debug mode, which tries to interpret bash wrapper as Python
"test_cli"
];
meta = {
homepage = "https://beancount.github.io/fava";
description = "Web interface for beancount";

14
pkgs/applications/office/qownnotes/default.nix
View File

@ -1,19 +1,19 @@
{ mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv /* for isLinux */ }:
{ mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv, qtx11extras }:
mkDerivation rec {
pname = "qownnotes";
version = "20.2.5";
version = "21.3.2";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256
sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5";
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-21.3.2.tar.xz.sha256
sha256 = "a8e8ab2ca1ef6684407adeb8fc63abcafff407a367471e053c583a1c4215e5ee";
};
nativeBuildInputs = [ qmake qttools ];
buildInputs = [
qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets
qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras
] ++ lib.optional stdenv.isLinux qtwayland;
meta = with lib; {
@ -21,7 +21,7 @@ mkDerivation rec {
homepage = "https://www.qownnotes.org/";
platforms = platforms.all;
license = licenses.gpl2;
maintainers = with maintainers; [ dtzWill ];
license = licenses.gpl2Only;
maintainers = with maintainers; [ dtzWill totoroot ];
};
}

4
pkgs/applications/version-management/git-and-tools/gh/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gh";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "009jh1i1ji7d773ismifdw4qvwlb8s1zn14d0n84j9h3n0hyynbc";
sha256 = "1q0vc9wr4n813mxkf7jjj3prw1n7xv4l985qd57pg4a2js1dqa1y";
};
vendorSha256 = "1wv30z0jg195nkpz3rwvhixyw81lg2wzwwajq9g6s3rfjj8gs9v2";

4
pkgs/applications/virtualization/libnvidia-container/default.nix
View File

@ -20,13 +20,13 @@ let
in
stdenv.mkDerivation rec {
pname = "libnvidia-container";
version = "1.3.1";
version = "1.3.3";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = pname;
rev = "v${version}";
sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq";
sha256 = "0rr6ngkzqgw250nilv36fz7fhsqxcgl4nhld2hnr0sr4ngirqcjp";
};
patches = [

12
pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, glib, gnome3, gettext }:
{ lib, stdenv, fetchFromGitHub, glib, gettext }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-topicons-plus";
version = "22";
version = "27";
src = fetchFromGitHub {
owner = "phocean";
repo = "TopIcons-plus";
rev = "v${version}";
sha256 = "196s1gdir52gbc444pzrb5l7gn5xr5vqk5ajqaiqryqlmp3i8vil";
rev = version;
sha256 = "1p3jlvs4zgnrvy8am7myivv4rnnshjp49kg87rd22qqyvcz51ykr";
};
buildInputs = [ glib ];
@ -21,10 +21,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ eperuffo ];
homepage = "https://github.com/phocean/TopIcons-plus";
# Unmaintained and no longer working with GNOME Shell 3.34+
broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32";
};
}

10
pkgs/development/compilers/gleam/default.nix
View File

@ -1,22 +1,22 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.14.3";
version = "0.14.4";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NCLPatJWpvYKM+QdJB/Gfldlz5MQynWZB8o4x4cf5cA=";
sha256 = "sha256-iW4mH9zLJzD+E+H/b0NAbPWzfSbDmRpirDwrLlyZppI=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security ];
lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoSha256 = "sha256-Tvb6QJubV8FS8UER++bEhst7Z0hVw42TCl+wOzZzi8Y=";
cargoSha256 = "sha256-ErLwrve2Fpyg9JaH3y7VIYuFcOPVP++XAIrRvv5dGm0=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";

127
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -64,7 +64,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "1y9js3n8ml2g492nivy7gk371rdmibwydb4fwzzwbviya280akaq";
sha256 = "13n62v3cdkx23fywdccczcr8vsf0vmjbimmgin766bf428jlhh6h";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -91,6 +91,7 @@ self: super: {
tdigest = doJailbreak super.tdigest;
text-short = doJailbreak super.text-short;
tree-diff = doJailbreak super.tree-diff;
zinza = doJailbreak super.zinza;
# Tests require a Kafka broker running locally
haskakafka = dontCheck super.haskakafka;
@ -708,8 +709,13 @@ self: super: {
diagrams-postscript = doJailbreak super.diagrams-postscript;
diagrams-svg = doJailbreak super.diagrams-svg;
diagrams-contrib = doJailbreak super.diagrams-contrib;
# https://github.com/diagrams/diagrams-lib/issues/288
diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }));
# apply patch from master to add compat with optparse-applicative >= 0.16
diagrams-lib = doJailbreak (appendPatch super.diagrams-lib
(pkgs.fetchpatch {
url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch";
sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";
includes = [ "*/CmdLine.hs" ];
}));
# https://github.com/danidiaz/streaming-eversion/issues/1
streaming-eversion = dontCheck super.streaming-eversion;
@ -1159,10 +1165,11 @@ self: super: {
# $HOME, which we don't have in our build sandbox.
cabal-install-parsers = dontCheck super.cabal-install-parsers;
# version constraints break the build, so we jailbreak
# can be removed at a new release which also fixes
# https://github.com/jgm/gitit/issues/665
gitit = doJailbreak super.gitit;
# * jailbreak can be removed at the next release (current is 0.13.0.0)
# * patch fixes compilation with pandoc >= 2.12, can be removed if a
# release contains https://github.com/jgm/gitit/pull/670 or equivalent.
# Patch is vendored in as it may change upstream in the future.
gitit = doJailbreak (appendPatch super.gitit ./patches/gitit-pandoc-2.12.patch);
# Test suite requires database
persistent-mysql = dontCheck super.persistent-mysql;
@ -1407,13 +1414,26 @@ self: super: {
# 2021-03-19: https://github.com/Avi-D-coder/implicit-hie-cradle/pull/8
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
# 2021-03-09: Overrides because nightly is to old for hls 1.0.0
lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
# 2021-03-09: Golden tests seem to be missing in hackage release:
# https://github.com/haskell/haskell-language-server/issues/1536
hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
# 2021-03-24: hlint 3.3 is for ghc 9 compat, but hls only supports ghc 8.10
hls-hlint-plugin = super.hls-hlint-plugin.override {
hlint = super.hlint_3_2_7;
};
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint.overrideScope (self: super: {
ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
doHaddock = false;
};
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
});
# 2021-03-09: Overrides because nightly is to old for hls 1.0.0
lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
# 2021-03-21 Test hangs
# https://github.com/haskell/haskell-language-server/issues/1562
# Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595
@ -1593,9 +1613,6 @@ self: super: {
vivid-osc = dontCheck super.vivid-osc;
vivid-supercollider = dontCheck super.vivid-supercollider;
# Overly strict version bounds: https://github.com/Profpatsch/yarn-lock/issues/8
yarn-lock = doJailbreak super.yarn-lock;
# Dependency to regex-tdfa-text can be removed for later regex-tdfa versions.
# Fix protolude compilation error by applying patch from pull-request.
# Override can be removed for the next release > 0.8.0.
@ -1675,8 +1692,92 @@ self: super: {
# https://github.com/jgm/pandoc/issues/7163
pandoc = dontCheck super.pandoc;
# test suite triggers some kind of linking bug at runtime
# https://github.com/noinia/hgeometry/issues/132
hgeometry-combinatorial = dontCheck super.hgeometry-combinatorial;
# Too strict version bounds on ansi-terminal
# https://github.com/kowainik/co-log/pull/218
co-log = doJailbreak super.co-log;
# Test suite has a too strict bound on base
# https://github.com/jswebtools/language-ecmascript/pull/88
language-ecmascript = doJailbreak super.language-ecmascript;
# Too strict bounds on containers
# https://github.com/jswebtools/language-ecmascript-analysis/issues/1
language-ecmascript-analysis = doJailbreak super.language-ecmascript-analysis;
# Too strict bounds on optparse-applicative
# https://github.com/faylang/fay/pull/474
fay = doJailbreak super.fay;
# Too strict version bounds on cryptonite.
# Issue reported upstream, no bug tracker url yet.
darcs = doJailbreak super.darcs;
# Too strict version bounds on ansi-terminal
# This patch will be contained with the next release (current is 0.1.0.0).
colourista = appendPatch super.colourista
(pkgs.fetchpatch {
url = "https://github.com/kowainik/colourista/commit/15ace92105b56eba4ea3717bd55f733afe5be401.patch";
sha256 = "sha256-9gJFlyWUkO5sJodDRNuH10I66j8/0ZZIv6nJQkhlA0s=";
});
# Too strict version bounds on base16-bytestring and http-link-header.
# This patch will be merged when next release comes.
github = appendPatch super.github (pkgs.fetchpatch {
url = "https://github.com/phadej/github/commit/514b175851dd7c4a9722ff203dd6f652a15d33e8.patch";
sha256 = "0pmx54xd7ah85y9mfi5366wbnwrp918j0wbx8yw8hrdac92qi4gh";
});
# 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream.
trial-optparse-applicative = assert super.trial-optparse-applicative.version == "0.0.0.0"; doJailbreak super.trial-optparse-applicative;
# 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream.
extensions = assert super.extensions.version == "0.0.0.1"; doJailbreak super.extensions;
# 2021-04-02: iCalendar is basically unmaintained.
# There are PRs for bumping the bounds: https://github.com/chrra/iCalendar/pull/46
iCalendar = overrideCabal (doJailbreak super.iCalendar) {
# Overriding bounds behind a cabal flag
preConfigure = ''substituteInPlace iCalendar.cabal --replace "network >=2.6 && <2.7" "network -any"'';
};
# Too strict bounds on base: https://github.com/runarorama/fuzzyfind/issues/1
fuzzyfind = doJailbreak super.fuzzyfind;
# Apply patch from master relaxing the version bounds on tasty.
# Can be removed at next release (current is 0.10.1.0).
ginger = appendPatch super.ginger
(pkgs.fetchpatch {
url = "https://github.com/tdammers/ginger/commit/bd8cb39c1853d4fb4f663c4c201884575906acea.patch";
sha256 = "1rdy53k0384g52bnc59j1f0i13hr4lbnbksfsabr4av6zmw9wmzf";
});
# Too strict version bounds on cryptonite
# https://github.com/obsidiansystems/haveibeenpwned/issues/7
haveibeenpwned = doJailbreak super.haveibeenpwned;
# Too strict version bounds on ghc-events
# https://github.com/haskell/ThreadScope/issues/118
threadscope = doJailbreak super.threadscope;
# Too strict version bounds on tasty
# Can likely be removed next week (2021-04-09) when 1.1.1.1 is released.
fused-effects = doJailbreak super.fused-effects;
# Test suite doesn't support base16-bytestring >= 1.0
# https://github.com/centromere/blake2/issues/6
blake2 = dontCheck super.blake2;
# Test suite doesn't support base16-bytestring >= 1.0
# https://github.com/serokell/haskell-crypto/issues/25
crypto-sodium = dontCheck super.crypto-sodium;
# Too strict version bounds on a bunch of libraries:
# https://github.com/smallhadroncollider/taskell/issues/100
# May be possible to remove at the next release (1.11.0)
taskell = doJailbreak super.taskell;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

203
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -73,11 +73,33 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
- hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet.
- ghcide < 1.1 # To stay hls 1.0 compatible
- hls-retrie-plugin < 1.0.0.1 # To stay hls 1.0 compatible
# Needs Cabal 3.4 for Setup.hs
- gi-javascriptcore < 4.0.23 #
- gi-soup < 2.4.24 #
- gi-webkit2 < 4.0.27 #
# To stay hls 1.0 compatible
- ghcide < 1.1
- hls-retrie-plugin < 1.0.0.1
- lsp < 1.2
- lsp-types < 1.2
# 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25,
# so we need to restrict these to compatible versions
# Remove these as soon as haskell-gi{,-base} are 0.25.*
# in Stackage Nightly!
- gi-ggit < 1.0.10
- gi-girepository < 1.0.24
- gi-gst < 1.0.24
- gi-gstbase < 1.0.24
- gi-gstvideo < 1.0.24
- gi-gtksource < 3.0.24
- gi-ibus < 1.5.3
- gi-notify < 0.7.23
- gi-ostree < 1.0.14
- gi-pangocairo < 1.0.25
- gi-secret < 0.0.13
- gi-vte < 2.91.28
# Stackage Nightly 2021-03-17
# Stackage Nightly 2021-03-21
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@ -112,6 +134,7 @@ default-package-overrides:
- alarmclock ==0.7.0.5
- alerts ==0.1.2.0
- alex ==3.2.6
- alex-meta ==0.3.0.13
- alg ==0.2.13.1
- algebraic-graphs ==0.5
- Allure ==0.9.5.0
@ -350,6 +373,7 @@ default-package-overrides:
- blaze-textual ==0.2.1.0
- bmp ==1.2.6.3
- BNFC ==2.9.1
- BNFC-meta ==0.6.1
- board-games ==0.3
- boltzmann-samplers ==0.1.1.0
- Boolean ==0.2.4
@ -409,7 +433,7 @@ default-package-overrides:
- cache ==0.1.3.0
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
- call-stack ==0.2.0
- call-stack ==0.3.0
- can-i-haz ==0.3.1.0
- ca-province-codes ==1.0.0.0
- cardano-coin-selection ==1.0.1
@ -707,6 +731,7 @@ default-package-overrides:
- dotnet-timespan ==0.0.1.0
- double-conversion ==2.0.2.0
- download ==0.3.2.7
- download-curl ==0.1.4
- drinkery ==0.4
- dsp ==0.2.5.1
- dual ==0.1.1.1
@ -829,6 +854,7 @@ default-package-overrides:
- filelock ==0.1.1.5
- filemanip ==0.3.6.3
- file-modules ==0.1.2.4
- filepath-bytestring ==1.4.2.1.7
- file-path-th ==0.1.0.0
- filepattern ==0.1.2
- fileplow ==0.1.0.0
@ -1010,6 +1036,7 @@ default-package-overrides:
- gluturtle ==0.0.58.1
- gnuplot ==0.5.6.1
- google-isbn ==1.0.3
- gopher-proxy ==0.1.1.2
- gothic ==0.1.6
- gpolyline ==0.1.0.1
- graph-core ==0.3.0.0
@ -1042,6 +1069,7 @@ default-package-overrides:
- hapistrano ==0.4.1.2
- happstack-server ==7.7.0
- happy ==1.20.0
- happy-meta ==0.2.0.11
- HasBigDecimal ==0.1.1
- hasbolt ==0.1.4.4
- hashable ==1.3.0.0
@ -1050,7 +1078,7 @@ default-package-overrides:
- hashing ==0.1.0.1
- hashmap ==1.3.3
- hashtables ==1.2.4.1
- haskeline ==0.8.1.1
- haskeline ==0.8.1.2
- haskell-gi ==0.24.7
- haskell-gi-base ==0.24.5
- haskell-gi-overloading ==1.0
@ -1080,7 +1108,7 @@ default-package-overrides:
- HDBC-session ==0.1.2.0
- headroom ==0.4.1.0
- heap ==1.0.4
- heaps ==0.3.6.1
- heaps ==0.4
- hebrew-time ==0.1.2
- hedgehog ==1.0.5
- hedgehog-corpus ==0.2.0
@ -1157,7 +1185,7 @@ default-package-overrides:
- hslua-module-path ==0.1.0.1
- hslua-module-system ==0.2.2.1
- hslua-module-text ==0.3.0.1
- HsOpenSSL ==0.11.5.1
- HsOpenSSL ==0.11.6
- HsOpenSSL-x509-system ==0.1.0.4
- hsp ==0.10.0
- hspec ==2.7.8
@ -1173,6 +1201,7 @@ default-package-overrides:
- hspec-golden ==0.1.0.3
- hspec-golden-aeson ==0.7.0.0
- hspec-hedgehog ==0.0.1.2
- hspec-junit-formatter ==1.0.0.0
- hspec-leancheck ==0.0.4
- hspec-megaparsec ==2.2.0
- hspec-meta ==2.7.8
@ -1198,7 +1227,7 @@ default-package-overrides:
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
- http2 ==2.0.6
- HTTP ==4000.3.15
- HTTP ==4000.3.16
- http-api-data ==0.4.2
- http-client ==0.6.4.1
- http-client-openssl ==0.3.2.0
@ -1217,7 +1246,7 @@ default-package-overrides:
- http-streams ==0.8.7.2
- http-types ==0.12.3
- human-readable-duration ==0.2.1.4
- HUnit ==1.6.1.0
- HUnit ==1.6.2.0
- HUnit-approx ==1.1.1.1
- hunit-dejafu ==2.0.0.4
- hvect ==0.4.0.0
@ -1377,7 +1406,7 @@ default-package-overrides:
- ki ==0.2.0.1
- kind-apply ==0.3.2.0
- kind-generics ==0.4.1.0
- kind-generics-th ==0.2.2.1
- kind-generics-th ==0.2.2.2
- kmeans ==0.1.3
- koofr-client ==1.0.0.3
- krank ==0.2.2
@ -1793,9 +1822,9 @@ default-package-overrides:
- persist ==0.1.1.5
- persistable-record ==0.6.0.5
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.11.0.2
- persistent ==2.11.0.4
- persistent-documentation ==0.1.0.2
- persistent-mtl ==0.2.0.0
- persistent-mtl ==0.2.1.0
- persistent-mysql ==2.10.3.1
- persistent-pagination ==0.1.1.2
- persistent-postgresql ==2.11.0.1
@ -1830,6 +1859,7 @@ default-package-overrides:
- pipes-wai ==3.2.0
- pkcs10 ==0.2.0.0
- pkgtreediff ==0.4
- place-cursor-at ==1.0.1
- placeholders ==0.1
- plaid ==0.1.0.4
- plotlyhs ==0.2.1
@ -1965,7 +1995,7 @@ default-package-overrides:
- rate-limit ==1.4.2
- ratel-wai ==1.1.5
- rattle ==0.2
- rattletrap ==11.0.0
- rattletrap ==11.0.1
- Rattus ==0.5
- rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0
@ -1982,7 +2012,7 @@ default-package-overrides:
- record-hasfield ==1.0
- records-sop ==0.1.0.3
- record-wrangler ==0.1.1.0
- recursion-schemes ==5.2.2
- recursion-schemes ==5.2.2.1
- reducers ==3.12.3
- refact ==0.3.0.2
- ref-fd ==0.4.0.2
@ -2104,6 +2134,7 @@ default-package-overrides:
- semiring-simple ==1.0.0.1
- semver ==0.4.0.1
- sendfile ==0.7.11.1
- sendgrid-v3 ==0.3.0.0
- seqalign ==0.2.0.4
- seqid ==0.6.2
- seqid-streams ==0.7.2
@ -2179,11 +2210,11 @@ default-package-overrides:
- skein ==1.0.9.4
- skews ==0.1.0.3
- skip-var ==0.1.1.0
- skylighting ==0.10.4.1
- skylighting-core ==0.10.4.1
- skylighting ==0.10.5
- skylighting-core ==0.10.5
- slack-api ==0.12
- slack-progressbar ==0.1.0.1
- slist ==0.1.1.0
- slist ==0.2.0.0
- slynx ==0.5.0.2
- smallcheck ==1.2.1
- smash ==0.1.1.0
@ -2199,6 +2230,7 @@ default-package-overrides:
- soap ==0.2.3.6
- soap-openssl ==0.1.0.2
- soap-tls ==0.1.1.4
- socket ==0.8.3.0
- socks ==0.6.1
- some ==1.0.2
- sop-core ==0.5.0.1
@ -2207,6 +2239,7 @@ default-package-overrides:
- sourcemap ==0.1.6
- sox ==0.2.3.1
- soxlib ==0.0.3.1
- spacecookie ==1.0.0.0
- sparse-linear-algebra ==0.3.1
- sparse-tensor ==0.2.1.5
- spatial-math ==0.5.0.1
@ -2327,7 +2360,7 @@ default-package-overrides:
- tardis ==0.4.3.0
- tasty ==1.4.1
- tasty-ant-xml ==1.1.8
- tasty-bench ==0.2.2
- tasty-bench ==0.2.3
- tasty-dejafu ==2.0.0.7
- tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.3
@ -2486,6 +2519,7 @@ default-package-overrides:
- type-level-numbers ==0.1.1.1
- type-map ==0.1.6.0
- type-natural ==1.1.0.0
- typenums ==0.1.3
- type-of-html ==1.6.2.0
- type-of-html-static ==0.1.0.2
- type-operators ==0.2.0.0
@ -2570,7 +2604,7 @@ default-package-overrides:
- vector-algorithms ==0.8.0.4
- vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
- vector-builder ==0.3.8
- vector-builder ==0.3.8.1
- vector-bytes-instances ==0.1.1
- vector-circular ==0.1.3
- vector-instances ==3.4
@ -2599,6 +2633,7 @@ default-package-overrides:
- wai-feature-flags ==0.1.0.1
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.6
- wai-middleware-auth ==0.2.4.1
- wai-middleware-caching ==0.1.0.2
- wai-middleware-clacks ==0.1.0.1
- wai-middleware-static ==0.9.0
@ -2750,10 +2785,9 @@ extra-packages:
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
- mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls
- haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet.
- optparse-applicative < 0.16 # needed for niv-0.2.19
- lsp-test < 0.14 # needed for hls 1.0.0
package-maintainers:
peti:
@ -2831,6 +2865,8 @@ package-maintainers:
- taskwarrior
- haskell-language-server
- shake-bench
- iCalendar
- stm-containers
sorki:
- cayene-lpp
- data-stm32
@ -3075,6 +3111,7 @@ broken-packages:
- ACME
- acme-all-monad
- acme-comonad
- acme-dont
- acme-flipping-tables
- acme-hq9plus
- acme-http
@ -3147,6 +3184,7 @@ broken-packages:
- aeson-tiled
- aeson-typescript
- aeson-utils
- aeson-via
- affection
- affine-invariant-ensemble-mcmc
- afv
@ -3204,6 +3242,7 @@ broken-packages:
- amazon-emailer
- amazon-emailer-client-snap
- amazon-products
- amazonka-ec2
- amazonka-s3-streaming
- amby
- AMI
@ -3282,6 +3321,7 @@ broken-packages:
- apiary-session
- apiary-websockets
- apis
- apns-http2
- apotiki
- app-lens
- appc
@ -3291,6 +3331,7 @@ broken-packages:
- applicative-parsec
- applicative-quoters
- applicative-splice
- apply-unordered
- approveapi
- approx
- ApproxFun-hs
@ -3298,8 +3339,10 @@ broken-packages:
- arbb-vm
- arbor-datadog
- arbor-monad-counter
- arbor-monad-logger
- arbor-monad-metric
- arbor-monad-metric-datadog
- arbor-postgres
- arch-hs
- arch-web
- archive-libarchive
@ -3351,6 +3394,8 @@ broken-packages:
- asn1-codec
- asn1-data
- assert
- assert4hs
- assert4hs-tasty
- assertions
- asset-map
- assimp
@ -3460,6 +3505,7 @@ broken-packages:
- azure-service-api
- azure-servicebus
- azurify
- b-tree
- b9
- babylon
- backblaze-b2-hs
@ -3491,9 +3537,12 @@ broken-packages:
- barrier
- barrier-monad
- base-compat-migrate
- base-encoding
- base-feature-macros
- base-generics
- base-io-access
- base16
- base16-lens
- base32-bytestring
- base62
- base64-bytes
@ -3553,10 +3602,12 @@ broken-packages:
- betacode
- betris
- bff
- bglib
- bgmax
- bgzf
- bhoogle
- bibdb
- bidi-icu
- bidirectional
- bidirectionalization-combined
- bidispec
@ -3646,6 +3697,7 @@ broken-packages:
- biopsl
- biosff
- biostockholm
- bip32
- birch-beer
- bird
- BirdPP
@ -3660,10 +3712,12 @@ broken-packages:
- bitcoin-block
- bitcoin-compact-filters
- bitcoin-hs
- bitcoin-keys
- bitcoin-rpc
- bitcoin-script
- bitcoin-scripting
- bitcoin-tx
- bitcoin-types
- bitcoind-regtest
- bitcoind-rpc
- Bitly
@ -3721,6 +3775,7 @@ broken-packages:
- blunk-hask-tests
- blunt
- bno055-haskell
- bogocopy
- bogre-banana
- boilerplate
- bolt
@ -3743,6 +3798,7 @@ broken-packages:
- boring-window-switcher
- bot
- botpp
- bound-extras
- bounded-array
- bowntz
- box
@ -3851,6 +3907,7 @@ broken-packages:
- cabal-dependency-licenses
- cabal-dev
- cabal-dir
- cabal-edit
- cabal-file-th
- cabal-ghc-dynflags
- cabal-ghci
@ -4281,6 +4338,7 @@ broken-packages:
- conferer-provider-dhall
- conferer-provider-json
- conferer-provider-yaml
- conferer-snap
- conferer-source-dhall
- conferer-source-json
- conferer-source-yaml
@ -4467,6 +4525,7 @@ broken-packages:
- ctkl
- ctpl
- cube
- cubical
- cuboid
- cuckoo
- curl-runnings
@ -4744,6 +4803,7 @@ broken-packages:
- dingo-core
- dingo-example
- dingo-widgets
- diohsc
- diophantine
- diplomacy
- diplomacy-server
@ -4964,6 +5024,7 @@ broken-packages:
- eibd-client-simple
- eigen
- Eight-Ball-Pool-Hack-Cheats
- eio
- either-list-functions
- either-unwrap
- EitherT
@ -5042,6 +5103,7 @@ broken-packages:
- equeue
- erf-native
- erlang
- erlang-ffi
- eros
- eros-client
- eros-http
@ -5080,6 +5142,7 @@ broken-packages:
- ethereum-analyzer-webui
- ethereum-client-haskell
- ethereum-merkle-patricia-db
- ethereum-rlp
- euphoria
- eurofxref
- evdev
@ -5176,23 +5239,15 @@ broken-packages:
- fastedit
- fastirc
- fastly
- fastpbkdf2
- FastPush
- fastsum
- FastxPipe
- fathead-util
- fault-tree
- fay
- fay-base
- fay-builder
- fay-dom
- fay-geoposition
- fay-hsx
- fay-jquery
- fay-ref
- fay-simplejson
- fay-text
- fay-uri
- fay-websockets
- fb-persistent
- fbmessenger-api
- fbrnch
@ -5307,6 +5362,7 @@ broken-packages:
- fizzbuzz-as-a-service
- flac
- flac-picture
- flaccuraterip
- flamethrower
- flamingra
- flashblast
@ -5451,6 +5507,8 @@ broken-packages:
- ft-generator
- ftdi
- FTGL-bytestring
- ftp-client
- ftp-client-conduit
- ftp-conduit
- ftphs
- FTPLine
@ -5495,6 +5553,7 @@ broken-packages:
- fwgl
- fwgl-glfw
- fwgl-javascript
- fxpak
- g-npm
- g2
- g2q
@ -5576,6 +5635,7 @@ broken-packages:
- GenSmsPdu
- gentlemark
- GenussFold
- genvalidity-persistent
- geo-resolver
- GeocoderOpenCage
- geodetic
@ -5591,6 +5651,7 @@ broken-packages:
- GGg
- ggtsTC
- gh-labeler
- ghc-bignum
- ghc-clippy-plugin
- ghc-core-smallstep
- ghc-datasize
@ -5642,8 +5703,6 @@ broken-packages:
- gi-gstaudio
- gi-gstpbutils
- gi-gsttag
- gi-gtk-declarative
- gi-gtk-declarative-app-simple
- gi-gtkosxapplication
- gi-gtksheet
- gi-handy
@ -5849,6 +5908,7 @@ broken-packages:
- gross
- GroteTrap
- groundhog-converters
- groundhog-mysql
- group-theory
- group-with
- grouped-list
@ -5934,6 +5994,7 @@ broken-packages:
- hackernews
- HackMail
- hackmanager
- hackport
- hactor
- hactors
- haddock
@ -6122,6 +6183,7 @@ broken-packages:
- haskell-ml
- haskell-mpfr
- haskell-mpi
- haskell-names
- haskell-neo4j-client
- haskell-openflow
- haskell-overridez
@ -6244,6 +6306,7 @@ broken-packages:
- haskyapi
- haslo
- hasloGUI
- hasmin
- hasparql-client
- hasql-backend
- hasql-class
@ -6355,7 +6418,6 @@ broken-packages:
- heckle
- hedgehog-checkers
- hedgehog-checkers-lens
- hedgehog-classes
- hedgehog-fakedata
- hedgehog-gen-json
- hedgehog-generic
@ -6407,6 +6469,7 @@ broken-packages:
- heterolist
- hetris
- heukarya
- hevm
- hevolisa
- hevolisa-dph
- hex-text
@ -6420,6 +6483,7 @@ broken-packages:
- hexpr
- hexpress
- hexquote
- hexstring
- hext
- hextream
- heyefi
@ -6443,8 +6507,6 @@ broken-packages:
- hGelf
- hgen
- hgeometric
- hgeometry
- hgeometry-combinatorial
- hgeometry-ipe
- hgeometry-svg
- hgeos
@ -6461,6 +6523,7 @@ broken-packages:
- HHDL
- hhp
- hhwloc
- hi
- hi3status
- hiccup
- hichi
@ -6549,6 +6612,7 @@ broken-packages:
- hlrdb
- hlrdb-core
- hls
- hls-exactprint-utils
- hlwm
- hly
- hmark
@ -6601,6 +6665,7 @@ broken-packages:
- hol
- hold-em
- hole
- holmes
- Holumbus-Searchengine
- holy-project
- homeomorphic
@ -6724,6 +6789,7 @@ broken-packages:
- hs-scrape
- hs-snowtify
- hs-speedscope
- hs-tags
- hs-twitter
- hs-twitterarchiver
- hs-vcard
@ -6789,6 +6855,7 @@ broken-packages:
- HsHyperEstraier
- hsI2C
- hSimpleDB
- hsimport
- hsinspect
- hsinspect-lsp
- HsJudy
@ -6935,6 +7002,7 @@ broken-packages:
- human-text
- humble-prelude
- hums
- hunch
- HUnit-Diff
- hunit-gui
- hunit-rematch
@ -7023,7 +7091,6 @@ broken-packages:
- ib-api
- iban
- ical
- iCalendar
- ice40-prim
- IcoGrid
- iconv-typed
@ -7103,6 +7170,7 @@ broken-packages:
- indentation-core
- indentation-parsec
- indentation-trifecta
- indents
- index-core
- indexation
- IndexedList
@ -7153,6 +7221,7 @@ broken-packages:
- interruptible
- interval
- IntFormats
- intricacy
- intro-prelude
- introduction
- introduction-test
@ -7293,7 +7362,6 @@ broken-packages:
- json-builder
- JSON-Combinator
- JSON-Combinator-Examples
- json-directory
- json-encoder
- json-enumerator
- json-extra
@ -7319,6 +7387,7 @@ broken-packages:
- jsonextfilter
- JsonGrammar
- jsonifier
- jsonnet
- jsonresume
- jsonrpc-conduit
- jsons-to-schema
@ -7496,8 +7565,6 @@ broken-packages:
- language-dart
- language-dickinson
- language-dockerfile
- language-ecmascript
- language-ecmascript-analysis
- language-eiffel
- language-elm
- language-fortran
@ -7546,7 +7613,6 @@ broken-packages:
- latex-svg-image
- latex-svg-pandoc
- LATS
- lattices
- launchdarkly-server-sdk
- launchpad-control
- lawless-concurrent-machines
@ -7647,6 +7713,7 @@ broken-packages:
- libxml-enumerator
- libxslt
- lie
- life-sync
- lifetimes
- lifted-base-tf
- lifted-protolude
@ -7705,6 +7772,7 @@ broken-packages:
- liquid-platform
- liquid-prelude
- liquid-vector
- liquidhaskell
- liquidhaskell-cabal
- Liquorice
- list-fusion-probe
@ -7936,6 +8004,7 @@ broken-packages:
- math-grads
- math-interpolate
- math-metric
- math-programming
- math-programming-glpk
- math-programming-tests
- mathblog
@ -8000,6 +8069,8 @@ broken-packages:
- memorypool
- menoh
- menshen
- mergeful-persistent
- mergeless-persistent
- merkle-patricia-db
- merkle-tree
- messagepack-rpc
@ -8027,6 +8098,7 @@ broken-packages:
- mi
- Michelangelo
- miconix-test
- micro-gateway
- micro-recursion-schemes
- microbase
- microformats2-parser
@ -8077,6 +8149,7 @@ broken-packages:
- miss-porcelain
- missing-py2
- MissingPy
- mit-3qvpPyAi6mH
- mix-arrows
- mixed-strategies
- mixpanel-client
@ -8282,6 +8355,7 @@ broken-packages:
- muon
- murder
- murmur
- murmur3
- murmurhash3
- mushu
- music-graphics
@ -8355,6 +8429,7 @@ broken-packages:
- nationstates
- nats-client
- nats-queue
- natural
- natural-number
- NaturalLanguageAlphabets
- NaturalSort
@ -8417,6 +8492,7 @@ broken-packages:
- network-minihttp
- network-msgpack-rpc
- network-netpacket
- network-packet-linux
- network-protocol-xmpp
- network-rpca
- network-server
@ -8529,6 +8605,7 @@ broken-packages:
- NXTDSL
- nylas
- nymphaea
- nyx-game
- oanda-rest-api
- oasis-xrd
- oauth2-jwt-bearer
@ -8693,6 +8770,7 @@ broken-packages:
- pam
- pan-os-syslog
- panda
- pandoc-citeproc
- pandoc-csv2table
- pandoc-filter-graphviz
- pandoc-filter-indent
@ -8763,6 +8841,7 @@ broken-packages:
- parsers-megaparsec
- parsestar
- parsimony
- parsnip
- partage
- partial-lens
- partial-records
@ -8853,6 +8932,7 @@ broken-packages:
- persistent-odbc
- persistent-protobuf
- persistent-ratelimit
- persistent-redis
- persistent-relational-record
- persistent-template-classy
- persistent-test
@ -8925,6 +9005,7 @@ broken-packages:
- pipes-extra
- pipes-files
- pipes-illumina
- pipes-interleave
- pipes-io
- pipes-key-value-csv
- pipes-mongodb
@ -8945,6 +9026,7 @@ broken-packages:
- pivotal-tracker
- pixel-printer
- pixelated-avatar-generator
- pixiv
- pkcs10
- pkcs7
- pkggraph
@ -9058,6 +9140,7 @@ broken-packages:
- postgresql-simple-queue
- postgresql-simple-sop
- postgresql-simple-typed
- postgresql-simple-url
- postgresql-syntax
- postgresql-tx-query
- postgresql-tx-squeal
@ -9124,7 +9207,6 @@ broken-packages:
- primitive-checked
- primitive-containers
- primitive-convenience
- primitive-extras
- primitive-foreign
- primitive-indexed
- primitive-maybe
@ -9191,6 +9273,7 @@ broken-packages:
- proto-lens-arbitrary
- proto-lens-combinators
- proto-lens-descriptors
- proto-lens-optparse
- proto3-suite
- proto3-wire
- protobuf-native
@ -9264,6 +9347,7 @@ broken-packages:
- QIO
- QLearn
- qlinear
- qnap-decrypt
- qr-imager
- qr-repa
- qsem
@ -9301,6 +9385,7 @@ broken-packages:
- quickcheck-string-random
- quickcheck-webdriver
- QuickCheckVariant
- quickjs-hs
- QuickPlot
- quickpull
- quickset
@ -9363,6 +9448,7 @@ broken-packages:
- random-stream
- RandomDotOrg
- Range
- range-set-list
- range-space
- rangemin
- Ranka
@ -9420,6 +9506,7 @@ broken-packages:
- read-bounded
- read-ctags
- read-io
- readability
- readline
- readline-statevar
- readme-lhs
@ -9511,6 +9598,7 @@ broken-packages:
- regions-monadstf
- regions-mtl
- register-machine-typelevel
- registry
- registry-hedgehog
- regress
- regression-simple
@ -9524,6 +9612,7 @@ broken-packages:
- reified-records
- reify
- relacion
- relapse
- relational-postgresql8
- relational-query-postgresql-pure
- relative-date
@ -9848,6 +9937,7 @@ broken-packages:
- seclib
- second-transfer
- secp256k1
- secp256k1-haskell
- secp256k1-legacy
- secret-santa
- secrm
@ -9888,6 +9978,7 @@ broken-packages:
- sequent-core
- sequor
- serialize-instances
- serialport
- serokell-util
- serpentine
- serv
@ -10020,6 +10111,7 @@ broken-packages:
- shake-extras
- shake-futhark
- shake-minify
- shake-minify-css
- shake-pack
- shake-path
- shake-persist
@ -10060,6 +10152,7 @@ broken-packages:
- Shpadoinkle-examples
- Shpadoinkle-html
- Shpadoinkle-router
- Shpadoinkle-streaming
- Shpadoinkle-template
- Shpadoinkle-widgets
- shpider
@ -10073,6 +10166,7 @@ broken-packages:
- sign
- signable
- signals
- signature
- signed-multiset
- signify-hs
- silkscreen
@ -10100,6 +10194,7 @@ broken-packages:
- simple-pipe
- simple-rope
- simple-server
- simple-sql-parser
- simple-stacked-vm
- simple-tabular
- simple-tar
@ -10121,6 +10216,8 @@ broken-packages:
- simseq
- singleton-dict
- singleton-typelits
- singletons-base
- singletons-th
- singnal
- singular-factory
- sink
@ -10147,6 +10244,7 @@ broken-packages:
- skype4hs
- slack
- slack-notify-haskell
- slack-verify
- slack-web
- slave-thread
- sliceofpy
@ -10327,6 +10425,7 @@ broken-packages:
- splaytree
- spline3
- splines
- splint
- split-morphism
- splitter
- Spock
@ -10437,9 +10536,7 @@ broken-packages:
- STL
- STLinkUSB
- stm-chunked-queues
- stm-containers
- stm-firehose
- stm-hamt
- stm-promise
- stm-stats
- STM32-Zombie
@ -10505,6 +10602,7 @@ broken-packages:
- stripe-hs
- stripe-http-streams
- stripe-scotty
- stripe-signature
- stripe-wreq
- strongswan-sql
- structural-induction
@ -10552,6 +10650,8 @@ broken-packages:
- supplemented
- surjective
- sv
- sv-cassava
- sv-core
- sv-svfactor
- SVD2HS
- svfactor
@ -10667,11 +10767,11 @@ broken-packages:
- target
- task
- task-distribution
- taskell
- TaskMonad
- tasty-auto
- tasty-bdd
- tasty-fail-fast
- tasty-grading-system
- tasty-groundhog-converters
- tasty-hedgehog-coverage
- tasty-html
@ -10682,6 +10782,7 @@ broken-packages:
- tasty-mgolden
- tasty-silver
- tasty-stats
- tasty-test-vector
- tateti-tateti
- Taxonomy
- TaxonomyTools
@ -10932,6 +11033,8 @@ broken-packages:
- trace-function-call
- traced
- tracetree
- tracing
- tracing-control
- tracked-files
- tracker
- trackit
@ -11109,6 +11212,7 @@ broken-packages:
- uhc-light
- uhc-util
- uhexdump
- uhttpc
- ui-command
- UMM
- unagi-bloomfilter
@ -11148,7 +11252,6 @@ broken-packages:
- universe-instances-base
- universe-instances-extended
- universe-instances-trans
- universe-reverse-instances
- universe-th
- unix-fcntl
- unix-handle
@ -11181,6 +11284,7 @@ broken-packages:
- upskirt
- urbit-airlock
- urbit-api
- urbit-hob
- ureader
- urembed
- uri
@ -11274,7 +11378,6 @@ broken-packages:
- vect-floating-accelerate
- vect-opengl
- vector-bytestring
- vector-circular
- vector-clock
- vector-conduit
- vector-endian
@ -11397,6 +11500,7 @@ broken-packages:
- waitra
- waldo
- wallpaper
- warc
- warp-dynamic
- warp-static
- warp-systemd
@ -11442,7 +11546,9 @@ broken-packages:
- webdriver-w3c
- WeberLogic
- webfinger-client
- webify
- webkit-javascriptcore
- webmention
- Webrexp
- webserver
- webshow
@ -11505,6 +11611,7 @@ broken-packages:
- WordNet
- WordNet-ghc74
- wordpass
- wordpress-auth
- wordsearch
- work-time
- workdays

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -445,6 +445,7 @@ self: super: builtins.intersectAttrs super {
# requires an X11 display in test suite
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = dontCheck super.gi-gtk-declarative-app-simple;
# tests depend on executable
ghcide = overrideCabal super.ghcide (drv: {
@ -815,5 +816,4 @@ self: super: builtins.intersectAttrs super {
# Tests access internet
prune-juice = dontCheck super.prune-juice;
}

4992
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

65
pkgs/development/haskell-modules/patches/gitit-pandoc-2.12.patch Normal file
View File

@ -0,0 +1,65 @@
commit a03d3b043458f45d29ba32068a77c0d3b8a4223f
Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri Apr 2 15:14:02 2021 +0200
Allow compilation with pandoc 2.12 and 2.13
pandoc 2.13 introduced the following breakages for gitit:
* UTF8.readFile now returns a Text which is actually ideal for gitit.
If pandoc is new enough we just make readFileUTF8 an alias for
UTF8.readFile.
* Text.Pandoc.Shared no longer exports substitute. In order to be
conservative I've chosen to just copy the substitute function from
pandoc 2.11.4. I need this patch kind of urgently so I didn't want to
make any changes or refactors independently from upstream if
avoidable. However, I'd be happy to rebase this PR branch to adopt a
different solution to just copying the function.
diff --git a/src/Network/Gitit/Authentication.hs b/src/Network/Gitit/Authentication.hs
index 4c240e7..c0f92fd 100644
--- a/src/Network/Gitit/Authentication.hs
+++ b/src/Network/Gitit/Authentication.hs
@@ -44,7 +44,7 @@ import System.Exit
import System.Log.Logger (logM, Priority(..))
import Data.Char (isAlphaNum, isAlpha)
import qualified Data.Map as M
-import Text.Pandoc.Shared (substitute)
+import Data.List (stripPrefix)
import Data.Maybe (isJust, fromJust, isNothing, fromMaybe)
import Network.URL (exportURL, add_param, importURL)
import Network.BSD (getHostName)
@@ -54,6 +54,16 @@ import Codec.Binary.UTF8.String (encodeString)
import Data.ByteString.UTF8 (toString)
import Network.Gitit.Rpxnow as R
+-- | Replace each occurrence of one sublist in a list with another.
+-- Vendored in from pandoc 2.11.4 as 2.12 removed this function.
+substitute :: (Eq a) => [a] -> [a] -> [a] -> [a]
+substitute _ _ [] = []
+substitute [] _ xs = xs
+substitute target replacement lst@(x:xs) =
+ case stripPrefix target lst of
+ Just lst' -> replacement ++ substitute target replacement lst'
+ Nothing -> x : substitute target replacement xs
+
data ValidationType = Register
| ResetPassword
deriving (Show,Read)
diff --git a/src/Network/Gitit/Util.hs b/src/Network/Gitit/Util.hs
index c5e9fe5..067130a 100644
--- a/src/Network/Gitit/Util.hs
+++ b/src/Network/Gitit/Util.hs
@@ -45,7 +45,11 @@ import Network.URL (encString)
-- | Read file as UTF-8 string. Encode filename as UTF-8.
readFileUTF8 :: FilePath -> IO Text
+#if MIN_VERSION_pandoc(2,12,0)
+readFileUTF8 = UTF8.readFile
+#else
readFileUTF8 = fmap T.pack . UTF8.readFile
+#endif
-- | Perform a function a directory and return to working directory.
inDir :: FilePath -> IO a -> IO a

78
pkgs/development/libraries/libftdi/1.x.nix
View File

@ -1,47 +1,73 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse
, cppSupport ? true, boost ? null
, pythonSupport ? true, python3 ? null, swig ? null
, docSupport ? true, doxygen ? null
{ lib
, stdenv
, fetchgit
, cmake
, pkg-config
, libusb1
, libconfuse
, cppSupport ? true
, boost
, pythonSupport ? true
, python3
, swig
, docSupport ? true
, doxygen
, graphviz
}:
assert cppSupport -> boost != null;
assert pythonSupport -> python3 != null && swig != null;
assert docSupport -> doxygen != null;
let
inherit (lib) optionals optionalString;
onOff = a: if a then "ON" else "OFF";
in
stdenv.mkDerivation rec {
name = "libftdi1-1.4";
pname = "libftdi";
version = "1.5";
src = fetchurl {
url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2";
sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc";
src = fetchgit {
url = "git://developer.intra2net.com/libftdi";
rev = "v${version}";
sha256 = "0vipg3y0kbbzjhxky6hfyxy42mpqhvwn1r010zr5givcfp8ghq26";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = with lib; [ libconfuse ]
++ optionals cppSupport [ boost ]
++ optionals pythonSupport [ python3 swig ]
++ optionals docSupport [ doxygen ];
nativeBuildInputs = [ cmake pkg-config ]
++ optionals docSupport [ doxygen graphviz ]
++ optionals pythonSupport [ swig ];
preBuild = lib.optionalString docSupport ''
make doc_i
'';
buildInputs = [ libconfuse ]
++ optionals cppSupport [ boost ]
++ optionals pythonSupport [ python3 ];
cmakeFlags = [
"-DFTDIPP=${onOff cppSupport}"
"-DBUILD_TESTS=${onOff cppSupport}"
"-DLINK_PYTHON_LIBRARY=${onOff pythonSupport}"
"-DPYTHON_BINDINGS=${onOff pythonSupport}"
"-DDOCUMENTATION=${onOff docSupport}"
];
propagatedBuildInputs = [ libusb1 ];
postInstall = ''
mkdir -p "$out/etc/udev/rules.d/"
cp ../packages/99-libftdi.rules "$out/etc/udev/rules.d/"
'' + optionalString docSupport ''
cp -r doc/man "$out/share/"
'' + lib.optionalString docSupport ''
mkdir -p "$out/share/libftdi/doc/"
cp -r doc/html "$out/share/libftdi/doc/"
cp -r doc/html "$out/share/doc/libftdi1/"
'';
postFixup = optionalString cppSupport ''
# This gets misassigned to the C++ version's path for some reason
for fileToFix in $out/{bin/libftdi1-config,lib/pkgconfig/libftdi1.pc}; do
substituteInPlace $fileToFix \
--replace "$out/include/libftdipp1" "$out/include/libftdi1"
done
'';
meta = with lib; {
description = "A library to talk to FTDI chips using libusb";
homepage = "https://www.intra2net.com/en/developer/libftdi/";
license = with licenses; [ lgpl2 gpl2 ];
platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.bjornfor ];
license = with licenses; [ lgpl2Only gpl2Only ];
platforms = platforms.all;
maintainers = with maintainers; [ bjornfor ];
};
}

4
pkgs/development/libraries/pupnp/default.nix
View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "libupnp";
version = "1.14.1";
version = "1.14.2";
outputs = [ "out" "dev" ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "mrjimenez";
repo = "pupnp";
rev = "release-${version}";
sha256 = "sha256-QWwgtfgO+7zGW1M5qdfrIilVw6D/A/Er3l2bZ8V35kE=";
sha256 = "sha256-PVlmAtiozF1dqgXsRXPuDY13TchHdb0UnK6mam4chBE=";
};
nativeBuildInputs = [

39
pkgs/development/misc/qmk_firmware/default.nix
View File

@ -1,39 +0,0 @@
{ stdenv, fetchFromGitHub
, avrgcc, avrbinutils
, gcc-arm-embedded, gcc-armhf-embedded
, teensy-loader-cli, dfu-programmer, dfu-util }:
let version = "0.6.144";
in stdenv.mkDerivation {
pname = "qmk_firmware";
inherit version;
src = fetchFromGitHub {
owner = "qmk";
repo = "qmk_firmware";
rev = version;
sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace tmk_core/arm_atsam.mk \
--replace arm-none-eabi arm-none-eabihf
rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk
'';
buildFlags = [ "all:default" ];
doCheck = true;
checkTarget = "test:all";
installPhase = ''
mkdir $out
'';
NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [
avrgcc
avrbinutils
gcc-arm-embedded
gcc-armhf-embedded
teensy-loader-cli
dfu-programmer
dfu-util
];
}

41
pkgs/development/python-modules/aws-adfs/default.nix
View File

@ -1,6 +1,19 @@
{ lib, buildPythonPackage, fetchPypi
, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, botocore
, requests, requests-kerberos, click, configparser, fido2, isPy27 }:
{ lib
, botocore
, buildPythonPackage
, click
, configparser
, fetchPypi
, fido2
, glibcLocales
, isPy27
, lxml
, mock
, pyopenssl
, pytestCheckHook
, requests
, requests-kerberos
}:
buildPythonPackage rec {
pname = "aws-adfs";
@ -12,8 +25,25 @@ buildPythonPackage rec {
sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55";
};
propagatedBuildInputs = [
botocore
click
configparser
fido2
lxml
pyopenssl
requests
requests-kerberos
];
checkInputs = [
glibcLocales
mock
pytestCheckHook
];
# Relax version constraint
patchPhase = ''
postPatch = ''
sed -i 's/coverage < 4/coverage/' setup.py
'';
@ -23,9 +53,6 @@ buildPythonPackage rec {
# Required for python3 tests, along with glibcLocales
LC_ALL = "en_US.UTF-8";
checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ];
propagatedBuildInputs = [ botocore lxml requests requests-kerberos click configparser fido2 ];
pythonImportsCheck = [ "aws_adfs" ];
meta = with lib; {

25
pkgs/development/python-modules/cirq/default.nix
View File

@ -3,7 +3,6 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, freezegun
, google-api-core
, matplotlib
, networkx
@ -14,8 +13,10 @@
, scipy
, sortedcontainers
, sympy
, tqdm
, typing-extensions
# test inputs
, freezegun
, pytestCheckHook
, pytest-asyncio
, pytest-benchmark
@ -27,7 +28,7 @@
buildPythonPackage rec {
pname = "cirq";
version = "0.9.1";
version = "0.10.0";
disabled = pythonOlder "3.6";
@ -35,42 +36,36 @@ buildPythonPackage rec {
owner = "quantumlib";
repo = "cirq";
rev = "v${version}";
sha256 = "0mygvpq7kzga8l1w2jvwv9a2n3akpss45hrx250gdrnqjp6xrw64";
sha256 = "0xinml44n2lfl0q2lb2apmn69gsszlwim83082f66vyk0gpwd4lr";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "freezegun~=0.3.15" "freezegun" \
--replace "matplotlib~=3.0" "matplotlib" \
--replace "networkx~=2.4" "networkx" \
--replace "numpy~=1.16" "numpy" \
--replace "protobuf~=3.12.0" "protobuf"
# Fix serialize_sympy_constants test by allowing small errors in pi
substituteInPlace cirq/google/arg_func_langs_test.py \
--replace "'float_value': float(str(np.float32(sympy.pi)))" "'float_value': pytest.approx(float(str(np.float32(sympy.pi))))"
--replace "protobuf~=3.13.0" "protobuf"
'';
propagatedBuildInputs = [
freezegun
google-api-core
numpy
matplotlib
networkx
numpy
pandas
protobuf
requests
scipy
sortedcontainers
sympy
tqdm
typing-extensions
];
doCheck = true;
# pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here
dontUseSetuptoolsCheck = true;
checkInputs = [
pytestCheckHook
freezegun
pytest-asyncio
pytest-benchmark
ply
@ -84,9 +79,7 @@ buildPythonPackage rec {
"--ignore=cirq/contrib/" # requires external (unpackaged) python packages, so untested.
"--benchmark-disable" # Don't need to run benchmarks when packaging.
];
disabledTests = [
"test_convert_to_ion_gates" # fails on some systems due to rounding error, 0.75 != 0.750...2
] ++ lib.optionals stdenv.isAarch64 [
disabledTests = lib.optionals stdenv.isAarch64 [
# Seem to fail due to math issues on aarch64?
"expectation_from_wavefunction"
"test_single_qubit_op_to_framed_phase_form_output_on_example_case"

2
pkgs/development/python-modules/docloud/default.nix
View File

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, requests
, six
}:
buildPythonPackage rec {
@ -15,6 +16,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
six
];
# Pypi's tarball doesn't contain tests. Source not available.

52
pkgs/development/python-modules/flask-limiter/default.nix
View File

@ -1,16 +1,60 @@
{ lib, fetchPypi, buildPythonPackage, flask, limits }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, flask
, flask-restful
, hiro
, limits
, mock
, ordereddict
, pymemcache
, pytestCheckHook
, redis
}:
buildPythonPackage rec {
pname = "Flask-Limiter";
version = "1.4";
src = fetchPypi {
inherit pname version;
sha256 = "021279c905a1e24f181377ab3be711be7541734b494f4e6db2b8edeba7601e48";
src = fetchFromGitHub {
owner = "alisaifee";
repo = "flask-limiter";
rev = version;
sha256 = "1k1b4b3s1acphqnar0y5g747bh1y7w35gcl5g819idq2a5vqnass";
};
propagatedBuildInputs = [ flask limits ];
checkInputs = [
pytestCheckHook
hiro
mock
redis
flask-restful
pymemcache
ordereddict
];
postPatch = ''
sed -i "/--cov/d" pytest.ini
'';
# Some tests requires a local Redis instance
disabledTests = [
"test_fallback_to_memory"
"test_reset_unsupported"
"test_constructor_arguments_over_config"
"test_fallback_to_memory_config"
"test_fallback_to_memory_backoff_check"
"test_fallback_to_memory_with_global_override"
"test_custom_key_prefix"
"test_redis_request_slower_than_fixed_window"
"test_redis_request_slower_than_moving_window"
"test_custom_key_prefix_with_headers"
];
pythonImportsCheck = [ "flask_limiter" ];
meta = with lib; {
description = "Rate limiting for flask applications";
homepage = "https://flask-limiter.readthedocs.org/";

54
pkgs/development/python-modules/gradient/default.nix
View File

@ -1,8 +1,23 @@
{ lib, fetchPypi, buildPythonPackage
, attrs, boto3, requests, gradient_statsd, terminaltables
, click-completion , click-didyoumean, click-help-colors
, colorama, requests_toolbelt, gradient-utils, halo, progressbar2
, marshmallow, pyyaml, websocket_client
{ lib
, attrs
, boto3
, buildPythonPackage
, click-completion
, click-didyoumean
, click-help-colors
, colorama
, fetchPypi
, gradient_statsd
, gradient-utils
, halo
, marshmallow
, progressbar2
, pyopenssl
, pyyaml
, requests
, requests_toolbelt
, terminaltables
, websocket_client
}:
buildPythonPackage rec {
@ -21,11 +36,26 @@ buildPythonPackage rec {
--replace 'PyYAML==' 'PyYAML>=' \
--replace 'marshmallow<' 'marshmallow>=' \
--replace 'websocket-client==' 'websocket-client>='
'';
'';
propagatedBuildInputs = [ attrs boto3 requests gradient_statsd terminaltables
click-completion click-didyoumean click-help-colors requests_toolbelt
colorama gradient-utils halo marshmallow progressbar2 pyyaml websocket_client
propagatedBuildInputs = [
attrs
boto3
click-completion
click-didyoumean
click-help-colors
colorama
gradient_statsd
gradient-utils
halo
marshmallow
progressbar2
pyopenssl
pyyaml
requests
requests_toolbelt
terminaltables
websocket_client
];
# tries to use /homeless-shelter to mimic container usage, etc
@ -33,9 +63,9 @@ buildPythonPackage rec {
meta = with lib; {
description = "The command line interface for Gradient";
homepage = "https://github.com/Paperspace/gradient-cli";
license = licenses.isc;
platforms = platforms.unix;
homepage = "https://github.com/Paperspace/gradient-cli";
license = licenses.isc;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ];
};
}

21
pkgs/development/python-modules/ntlm-auth/default.nix
View File

@ -1,10 +1,10 @@
{ lib
, buildPythonPackage
, cryptography
, fetchFromGitHub
, mock
, pytest
, pytestCheckHook
, requests
, unittest2
, six
}:
@ -19,13 +19,18 @@ buildPythonPackage rec {
sha256 = "00dpf5bfsy07frsjihv1k10zmwcyq4bvkilbxha7h6nlwpcm2409";
};
checkInputs = [ mock pytest requests unittest2 ];
propagatedBuildInputs = [ six ];
propagatedBuildInputs = [
cryptography
six
];
# Functional tests require networking
checkPhase = ''
py.test --ignore=tests/functional/test_iis.py
'';
checkInputs = [
mock
pytestCheckHook
requests
];
pythonImportsCheck = [ "ntlm_auth" ];
meta = with lib; {
description = "Calculates NTLM Authentication codes";

43
pkgs/development/python-modules/pymemcache/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, future
, mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pymemcache";
version = "3.4.0";
src = fetchFromGitHub {
owner = "pinterest";
repo = pname;
rev = "v${version}";
sha256 = "0xkw76y4059jg2a902wlpk6psyh2g4x6j6vlj9gzd5vqb7ihg2y7";
};
checkInputs = [
future
mock
pytestCheckHook
];
postPatch = ''
sed -i "/--cov/d" setup.cfg
'';
disabledTests = [
# python-memcached is not available (last release in 2017)
"TestClientSocketConnect"
];
pythonImportsCheck = [ "pymemcache" ];
meta = with lib; {
description = "Python memcached client";
homepage = "https://pymemcache.readthedocs.io/";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

8
pkgs/development/python-modules/pystray/default.nix
View File

@ -3,17 +3,17 @@
buildPythonPackage rec {
pname = "pystray";
version = "0.17.2";
version = "0.17.3";
src = fetchFromGitHub {
owner = "moses-palmer";
repo = "pystray";
rev = "v${version}";
sha256 = "sha256-/dU+jwe/3qhypq7e5tawhJKzSryW7EIbmrpP+VLDvHA=";
sha256 = "sha256-da2ZkehyXrxW5LdMR3K5AEQhiCpx8ygn6eswTC8fsRo=";
};
propagatedBuildInputs = [ pillow xlib six ];
nativeBuildInputs = [ sphinx ];
propagatedBuildInputs = [ pillow xlib six ];
checkInputs = [ xvfb_run ];
checkPhase = ''
@ -25,7 +25,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/moses-palmer/pystray";
description = "This library allows you to create a system tray icon";
license = licenses.lgpl3;
license = with licenses; [ gpl3Only lgpl3Only ];
platforms = platforms.linux;
maintainers = with maintainers; [ jojosch ];
};

8
pkgs/development/python-modules/python-awair/default.nix
View File

@ -2,7 +2,7 @@
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, poetry
, poetry-core
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "python-awair";
version = "0.2.1";
version = "0.2.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -20,10 +20,10 @@ buildPythonPackage rec {
owner = "ahayworth";
repo = "python_awair";
rev = version;
sha256 = "1fqjigc1a0lr9q6bjjq3j8pa39wg1cbkb0l67w94a0i4dkdfri8r";
sha256 = "sha256-5+s1aSvt+rXyumvf/qZ58Uvmq0p45mu23Djbwgih3qI=";
};
nativeBuildInputs = [ poetry ];
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
aiohttp

30
pkgs/development/python-modules/requests-kerberos/default.nix
View File

@ -1,4 +1,12 @@
{ lib, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }:
{ lib
, fetchFromGitHub
, buildPythonPackage
, cryptography
, requests
, pykerberos
, pytestCheckHook
, mock
}:
buildPythonPackage rec {
pname = "requests-kerberos";
@ -12,16 +20,26 @@ buildPythonPackage rec {
sha256 = "1qw96aw84nljh9cip372mfv50p1yyirfgigavvavgpc3c5g278s6";
};
checkInputs = [ mock ];
propagatedBuildInputs = [ requests pykerberos ];
propagatedBuildInputs = [
cryptography
requests
pykerberos
];
checkInputs = [
mock
pytestCheckHook
];
# they have a setup.py which mentions a test suite that doesn't exist...
patches = [ ./fix_setup.patch ];
pythonImportsCheck = [ "requests_kerberos" ];
meta = with lib; {
description = "An authentication handler for using Kerberos with Python Requests.";
homepage = "https://github.com/requests/requests-kerberos";
license = licenses.isc;
description = "An authentication handler for using Kerberos with Python Requests";
homepage = "https://github.com/requests/requests-kerberos";
license = licenses.isc;
maintainers = with maintainers; [ catern ];
};
}

4
pkgs/development/python-modules/uranium/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, python, cmake
, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
, pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }:
buildPythonPackage rec {
version = "4.7.1";
@ -16,7 +16,7 @@ buildPythonPackage rec {
disabled = pythonOlder "3.5.0";
buildInputs = [ python gettext ];
propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcus ];
propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcus cryptography ];
nativeBuildInputs = [ cmake doxygen ];
postPatch = ''

6
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -211,12 +211,12 @@ in
'';
};
pg_query = attrs: lib.optionalAttrs (attrs.version == "2.0.1") {
pg_query = attrs: lib.optionalAttrs (attrs.version == "2.0.2") {
dontBuild = false;
postPatch = ''
sed -i "s;'https://codeload.github.com.*';'${fetchurl {
url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/13-2.0.0";
sha256 = "0ghk0dlmrn634p3zjr41fy4ipgw8i44f67a4l8cspqg0395m3rp5";
url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/13-2.0.2";
sha256 = "0ms2s6hmy8qyzv4g1hj4i2p5fws1v8lrj73b2knwbp2ipd45yj7y";
}}';" ext/pg_query/extconf.rb
'';
} // lib.optionalAttrs (attrs.version == "1.3.0") {

12
pkgs/development/tools/dapr/cli/default.nix
View File

@ -1,15 +1,13 @@
{ buildGoModule, fetchFromGitHub, lib }:
let
buildGoModule rec {
pname = "dapr";
version = "0.9.0";
sha256 = "1vdbh5pg3j7kqqqhhf4d9xfzbpqmjc4x373sk43pb05prg4w71s7";
vendorSha256 = "19qcpd5i60xmsr8m8mx16imm5falkqcgqpwpx3clfvqxjyflglpp";
in buildGoModule {
inherit pname version vendorSha256;
version = "1.0.1";
vendorSha256 = "13fb6fdjqrsl74569nh2l7x9w7w61bcvkksj410s2f85bicc29rf";
src = fetchFromGitHub {
inherit sha256;
sha256 = "15zz212sm83l6l7npislixxn23fg190b44bfxnrjrlyjbz370kch";
owner = "dapr";
repo = "cli";

10
pkgs/development/tools/misc/blackmagic/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub
{ stdenv, lib, fetchFromGitHub, fetchpatch
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
, python3
}:
@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# Fix deprecation warning with libftdi 1.5
(fetchpatch {
url = "https://github.com/blacksphere/blackmagic/commit/dea4be2539c5ea63836ec78dca08b52fa8b26ab5.patch";
sha256 = "0f81simij1wdhifsxaavalc6yxzagfbgwry969dbjmxqzvrsrds5";
})
];
nativeBuildInputs = [
gcc-arm-embedded pkg-config
python3

4
pkgs/development/tools/omnisharp-roslyn/default.nix
View File

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "omnisharp-roslyn";
version = "1.37.4";
version = "1.37.8";
src = fetchurl {
url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
sha256 = "0pknphydf194n7rjyax4mh8n7j8679j0jflw63gfgh37daxry0r2";
sha256 = "0kgv4l15rli9a7grmcsbv72csmxi7vqa7lrrr8bd4cq9ighh54q3";
};
nativeBuildInputs = [ makeWrapper dotnet-sdk dotnetPackages.Nuget ];

8
pkgs/development/tools/rust/cargo-c/default.nix
View File

@ -5,7 +5,7 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-c";
version = "0.7.3";
version = "0.8.0";
src = stdenv.mkDerivation rec {
name = "${pname}-source-${version}";
@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec {
owner = "lu-zero";
repo = pname;
rev = "v${version}";
sha256 = "0df87kx8dfq2fvz00k6advwg2iw9djkflhrbsjw0xhac78623c56";
sha256 = "1rvbikhbqsfa2sh79kapqg4yz19r1yhqfykl6cf4yjg6vawkwfw1";
};
cargoLock = fetchurl {
url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock";
sha256 = "18l54jf9q5xb908bwyyil1sblxxa9mkrgr33gm0r6nxicw6kf8in";
sha256 = "17cdac8ym59jwjxs3k4isazknhrlr6lw0j0r76n5xf0dd7apfgcs";
};
installPhase = ''
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "0z7sjfnnmld5bijn14c7v7arh0vzqmbkjk7bf9ky67acq2r2cv2f";
cargoSha256 = "1rmhg9xhljgd5yq3xs0fzw1b0bgz7jfpf5mr2gviwqahl5vxvfiq";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]

2
pkgs/development/tools/sqlint/Gemfile.lock
View File

@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/
specs:
google-protobuf (3.15.6)
pg_query (2.0.1)
pg_query (2.0.2)
google-protobuf (~> 3.15.5)
sqlint (0.2.0)
pg_query (~> 2)

2
pkgs/development/tools/sqlint/default.nix
View File

@ -13,6 +13,6 @@ bundlerApp {
homepage = "https://github.com/purcell/sqlint";
license = licenses.mit;
maintainers = with maintainers; [ ariutta nicknovitski purcell ];
platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ];
platforms = platforms.unix;
};
}

4
pkgs/development/tools/sqlint/gemset.nix
View File

@ -15,10 +15,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01a8asbgkr7f1gp50ikzr1zzmvwv50da389943hrrqzxwd202268";
sha256 = "0bvn0swyzzhl9x8hlgaz7m7s1jqmpdi2c4klarix0hiyapy2il9y";
type = "gem";
};
version = "2.0.1";
version = "2.0.2";
};
sqlint = {
dependencies = ["pg_query"];

53
pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ lib
, fetchzip
, fetchpatch
, cups
, python3Packages
}:
python3Packages.buildPythonApplication rec {
pname = "rastertosag-gdi";
version = "0.1";
src = fetchzip {
url = "https://www.openprinting.org/download/printing/${pname}/${pname}-${version}.tar.gz";
sha256 = "1ldplpv497j8vhw24sksg3fiw8c5pqr0wajajh7p5xpvb6zlcmvw";
};
patches = [
# port to python 3
( fetchpatch {
url = "https://sources.debian.org/data/main/r/${pname}/0.1-7/debian/patches/0001-${pname}-python3.patch";
sha256 = "1l3xbrs67025595k9ba5794q3s74anizpbxwsshcfhmbrzd9h8hg";
})
];
format = "other";
nativeBuildInputs = [ (lib.getBin cups) ];
# The source image also brings pre-built ppd files,
# be we prefer to generate from source where possible, so
# the following line generates ppd files from the drv file.
postBuild = ''
ppdc -v -d . -I "${cups}/share/cups/ppdc" rastertosag-gdi.drv
'';
installPhase = ''
runHook preInstall
install -vDm 0644 -t "${placeholder "out"}/share/cups/model/rastertosag-gdi/" *.ppd
install -vDm 0755 -t "${placeholder "out"}/bin/" rastertosag-gdi
install -vd "${placeholder "out"}/lib/cups/filter/"
ln -vst "${placeholder "out"}/lib/cups/filter/" "${placeholder "out"}/bin/rastertosag-gdi"
runHook postInstall
'';
meta = {
description = "CUPS driver for Ricoh Aficio SP 1000S and SP 1100S printers";
downloadPage = "https://www.openprinting.org/download/printing/rastertosag-gdi/";
homepage = "https://www.openprinting.org/driver/rastertosag-gdi/";
license = lib.licenses.free; # just "GPL", according to README
maintainers = [ lib.maintainers.yarny ];
longDescription = ''
This package brings CUPS raster filter
for Ricoh Aficio SP 1000S and SP 1100S.
In contrast to other Ricoh laser printers,
they use the proprietary SAG-GDI raster format by
Sagem Communication and do not understand PCL or PostScript.
Therefore they do not work with Ricoh's PPD files.
'';
};
}

9
pkgs/misc/emulators/ruffle/default.nix
View File

@ -13,13 +13,13 @@
rustPlatform.buildRustPackage rec {
pname = "ruffle";
version = "nightly-2021-01-12";
version = "nightly-2021-04-02";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = pname;
rev = version;
sha256 = "1lywxn61w0b3pb8vjpavd9f3v58gq35ypwp41b7rjkc4rjxmf3cd";
sha256 = "1diz94y53hvii28894zz65aya12v8yw1864lqpkrdbj67yc6ykdj";
};
nativeBuildInputs = [
@ -42,10 +42,13 @@ rustPlatform.buildRustPackage rec {
];
postInstall = ''
# This name is too generic
mv $out/bin/exporter $out/bin/ruffle_exporter
wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
'';
cargoSha256 = "113gh8nf2fs9shfvnzpwlc7zaq1l9l9jhlybcc4dq0wr4r8qpff5";
cargoSha256 = "0pnp5kmij4dwwvmgdv81mqcawcjcgg5gd6cpyf0xalyfjgj8i732";
meta = with lib; {
description = "An Adobe Flash Player emulator written in the Rust programming language.";

44
pkgs/os-specific/darwin/mas/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, stdenv
, fetchurl
, libarchive
, p7zip
}:
stdenv.mkDerivation rec {
pname = "mas";
version = "1.8.1";
src = fetchurl {
url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas.pkg";
sha256 = "W/wgg+ETeJPoZ7MoVGH2uJzQiZMLIy3n1JYKUloc3ZU=";
};
nativeBuildInputs = [ libarchive p7zip ];
unpackPhase = ''
7z x $src
bsdtar -xf Payload~
'';
doBuild = false;
installPhase = ''
mkdir -p $out
cp -r ./bin $out
cp -r ./Frameworks $out
'';
postFixup = ''
install_name_tool -change @rpath/MasKit.framework/Versions/A/MasKit $out/Frameworks/MasKit.framework/Versions/A/MasKit $out/bin/mas
install_name_tool -change @rpath/Commandant.framework/Commandant $out/Frameworks/MasKit.framework/Versions/A/Frameworks/Commandant.framework/Versions/A/Commandant $out/bin/mas
'';
meta = with lib; {
description = "Mac App Store command line interface";
homepage = "https://github.com/mas-cli/mas";
license = licenses.mit;
maintainers = with maintainers; [ zachcoyle ];
platforms = platforms.darwin;
};
}

6
pkgs/os-specific/linux/bpftrace/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "bpftrace";
version = "0.11.4";
version = "0.12.0";
src = fetchFromGitHub {
owner = "iovisor";
repo = "bpftrace";
rev = "refs/tags/v${version}";
sha256 = "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h";
rev = "v${version}";
sha256 = "0njbixkrpdl9gjnkzg0ybmqsva0ydfda5vms66v8ij7xida2qy07";
};
buildInputs = with llvmPackages;

4
pkgs/servers/dns/bind/default.nix
View File

@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
stdenv.mkDerivation rec {
pname = "bind";
version = "9.16.12";
version = "9.16.13";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-mRSvkxH9NJyrRBCXiY2U+yjQv9m/btBP4fl/BCZE2n8=";
sha256 = "sha256-pUzHk/pbabNfYQ8glXYPgjjf9c/VJBn37hycIn2kzAg=";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

4
pkgs/servers/tegola/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "tegola";
version = "0.12.1";
version = "0.13.0";
goPackagePath = "github.com/go-spatial/tegola";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "go-spatial";
repo = pname;
rev = "v${version}";
sha256 = "0x8wv9xx0dafn55y0i7x43plg1blnslzj0l5047laipw7gnmfwad";
sha256 = "sha256-NA2KwyhLLIusf6a6v+OcmHz91kPcIhvG9PRmRk8h+fQ=";
};
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ];

4
pkgs/servers/x11/xorg/overrides.nix
View File

@ -800,6 +800,10 @@ self: super:
};
});
xf86videoopenchrome = super.xf86videoopenchrome.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.libXv ];
});
xf86videoxgi = super.xf86videoxgi.overrideAttrs (attrs: {
patches = [
# fixes invalid open mode

4
pkgs/servers/zigbee2mqtt/default.nix
View File

@ -3,14 +3,14 @@ let
package = (import ./node.nix { inherit pkgs system; }).package;
in
package.override rec {
version = "1.16.2";
version = "1.18.2";
reconstructLock = true;
src = pkgs.fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
sha256 = "0rpmm4pwm8s4i9fl26ql0czg5kijv42k9wwik7jb3ppi5jzxrakd";
sha256 = "sha256-95RhoJ0aqprzMNOUw9UbLosBwBtQvudKOQaBvBJohn8=";
};
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

4367
pkgs/servers/zigbee2mqtt/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

10
pkgs/servers/zigbee2mqtt/node.nix
View File

@ -1,17 +1,17 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let
nodeEnv = import ./node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
nodeEnv = import ../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

6
pkgs/tools/backup/duplicity/default.nix
View File

@ -1,5 +1,4 @@
{ lib, stdenv
, fetchpatch
, fetchurl
, pythonPackages
, librsync
@ -9,7 +8,6 @@
, par2cmdline
, util-linux
, rsync
, backblaze-b2
, makeWrapper
, gettext
}:
@ -34,13 +32,17 @@ pythonPackages.buildPythonApplication rec {
# to make the testing code stop assuming it is run from the source directory.
./use-installed-scripts-in-test.patch
] ++ lib.optionals stdenv.isLinux [
# Broken on Linux in Nix' build environment
./linux-disable-timezone-test.patch
];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
makeWrapper
gettext
pythonPackages.wrapPython
pythonPackages.setuptools-scm
];
buildInputs = [
librsync

6
pkgs/tools/misc/duf/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "duf";
version = "0.6.0";
version = "0.6.2";
src = fetchFromGitHub {
owner = "muesli";
repo = "duf";
rev = "v${version}";
sha256 = "sha256-Wm3gfir6blQFLLi+2bT5Y/5tf7qUxEddJQ7tCYfBGgM=";
sha256 = "sha256-aRXm31sGHvHPpqPck5+jplbWT52OzaiQIgU/C7llJs8=";
};
vendorSha256 = "0icxy6wbqjqawr6i5skwp1z37fq303p8f95crd8lwn6pjjiqzk4i";
vendorSha256 = "153z0ccd556c0wpnxgyjq7m0c4y2z6fxsqq2p77kly9nr8cpzdb9";
buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ];

4
pkgs/tools/networking/swagger-codegen/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
version = "2.4.17";
version = "2.4.19";
pname = "swagger-codegen";
jarfilename = "${pname}-cli-${version}.jar";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://repo1.maven.org/maven2/io/swagger/${pname}-cli/${version}/${jarfilename}";
sha256 = "06xx42ayh4xqpr71lq1hj7kv1v6m9ld9jm1d15fhs935zqckv32a";
sha256 = "04wl5k8k1ziqz7k5w0g7i6zdfn41pbh3k0m8vq434k1886inf8yn";
};
phases = [ "installPhase" ];

4
pkgs/tools/text/miller/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "miller";
version = "5.10.1";
version = "5.10.2";
src = fetchFromGitHub {
owner = "johnkerl";
repo = "miller";
rev = "v${version}";
sha256 = "sha256-S3OGc7rirNkP5aSnaASP6n7b7zYHSaDDWRVRWWTM2hc=";
sha256 = "sha256-NI57U3FpUfQ6ouBEYrzzG+9kpL58BD4HoAuRAFJMO9k=";
};
nativeBuildInputs = [ autoreconfHook flex libtool ];

1
pkgs/top-level/aliases.nix
View File

@ -584,6 +584,7 @@ mapAliases ({
python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05
qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02
qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02
quake3game = ioquake3; # added 2016-01-14
qvim = throw "qvim has been removed."; # added 2020-08-31

13
pkgs/top-level/all-packages.nix
View File

@ -25508,6 +25508,8 @@ in
split2flac = callPackage ../applications/audio/split2flac { };
spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { };
spotify-tui = callPackage ../applications/audio/spotify-tui {
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
@ -29303,6 +29305,8 @@ in
cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { };
cups-drv-rastertosag-gdi = callPackage ../misc/cups/drivers/cups-drv-rastertosag-gdi { };
# this driver ships with pre-compiled 32-bit binary libraries
cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
@ -29540,6 +29544,8 @@ in
martyr = callPackage ../development/libraries/martyr { };
mas = callPackage ../os-specific/darwin/mas { };
moltengamepad = callPackage ../misc/drivers/moltengamepad { };
openzwave = callPackage ../development/libraries/openzwave { };
@ -30617,13 +30623,6 @@ in
pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { };
qmk_firmware = callPackage ../development/misc/qmk_firmware {
avrgcc = pkgsCross.avr.buildPackages.gcc;
avrbinutils = pkgsCross.avr.buildPackages.binutils;
gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc;
};
new-session-manager = callPackage ../applications/audio/new-session-manager { };
newlib = callPackage ../development/misc/newlib { };

2
pkgs/top-level/python-packages.nix
View File

@ -5966,6 +5966,8 @@ in {
pymeeus = callPackage ../development/python-modules/pymeeus { };
pymemcache = callPackage ../development/python-modules/pymemcache { };
pymemoize = callPackage ../development/python-modules/pymemoize { };
pyment = callPackage ../development/python-modules/pyment { };