mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-20 02:55:39 +00:00
Merge staging-next into staging
This commit is contained in:
zowoq
commit
fb2311d430
28
.github/workflows/manual-nixos.yml
vendored
Normal file
28
.github/workflows/manual-nixos.yml
vendored
Normal file
@ -0,0 +1,28 @@
|
||||
name: "Build NixOS manual"
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
branches:
|
||||
- master
|
||||
paths:
|
||||
- 'nixos/**'
|
||||
|
||||
jobs:
|
||||
nixos:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v12
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
- uses: cachix/cachix-action@v8
|
||||
with:
|
||||
# This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.
|
||||
name: nixpkgs-ci
|
||||
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
|
||||
- name: Building NixOS manual
|
||||
run: nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux
|
||||
28
.github/workflows/manual-nixpkgs.yml
vendored
Normal file
28
.github/workflows/manual-nixpkgs.yml
vendored
Normal file
@ -0,0 +1,28 @@
|
||||
name: "Build Nixpkgs manual"
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
branches:
|
||||
- master
|
||||
paths:
|
||||
- 'doc/**'
|
||||
|
||||
jobs:
|
||||
nixpkgs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v12
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
- uses: cachix/cachix-action@v8
|
||||
with:
|
||||
# This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.
|
||||
name: nixpkgs-ci
|
||||
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
|
||||
- name: Building Nixpkgs manual
|
||||
run: nix-build --option restrict-eval true pkgs/top-level/release.nix -A manual
|
||||
4
.github/workflows/rebase-staging.yml
vendored
4
.github/workflows/rebase-staging.yml
vendored
@ -11,6 +11,10 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase-staging')
|
||||
steps:
|
||||
- uses: peter-evans/create-or-update-comment@v1
|
||||
with:
|
||||
comment-id: ${{ github.event.comment.id }}
|
||||
reactions: eyes
|
||||
- uses: scherermichael-oss/action-has-permission@1.0.6
|
||||
id: check-write-access
|
||||
with:
|
||||
|
||||
2
COPYING
2
COPYING
@ -1,4 +1,4 @@
|
||||
Copyright (c) 2003-2020 Eelco Dolstra and the Nixpkgs/NixOS contributors
|
||||
Copyright (c) 2003-2021 Eelco Dolstra and the Nixpkgs/NixOS contributors
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Cataclysm: Dark Days Ahead
|
||||
# Cataclysm: Dark Days Ahead {#cataclysm-dark-days-ahead}
|
||||
|
||||
## How to install Cataclysm DDA
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ This works just like `runCommand`. The only difference is that it also provides
|
||||
|
||||
Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.
|
||||
|
||||
::: {.note}
|
||||
::: note
|
||||
This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the `system` is usually the same as `builtins.currentSystem`.
|
||||
:::
|
||||
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
---
|
||||
title: Agda
|
||||
author: Alex Rice (alexarice)
|
||||
date: 2020-01-06
|
||||
---
|
||||
# Agda
|
||||
# Agda {#agda}
|
||||
|
||||
## How to use Agda
|
||||
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
---
|
||||
title: Android
|
||||
author: Sander van der Burg
|
||||
date: 2018-11-18
|
||||
---
|
||||
# Android
|
||||
# Android {#android}
|
||||
|
||||
The Android build environment provides three major features and a number of
|
||||
supporting features.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Crystal
|
||||
# Crystal {#crystal}
|
||||
|
||||
## Building a Crystal package
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Emscripten
|
||||
# Emscripten {#emscripten}
|
||||
|
||||
[Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler
|
||||
|
||||
|
||||
@ -1,10 +1,4 @@
|
||||
---
|
||||
title: User's Guide for Haskell in Nixpkgs
|
||||
author: Peter Simons
|
||||
date: 2015-06-01
|
||||
---
|
||||
|
||||
# Haskell
|
||||
# Haskell {#haskell}
|
||||
|
||||
The documentation for the Haskell infrastructure is published at
|
||||
<https://haskell4nix.readthedocs.io/>. The source code for that
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Idris
|
||||
# Idris {#idris}
|
||||
|
||||
## Installing Idris
|
||||
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
---
|
||||
title: iOS
|
||||
author: Sander van der Burg
|
||||
date: 2019-11-10
|
||||
---
|
||||
# iOS
|
||||
# iOS {#ios}
|
||||
|
||||
This component is basically a wrapper/workaround that makes it possible to
|
||||
expose an Xcode installation as a Nix package by means of symlinking to the
|
||||
|
||||
@ -1,10 +1,4 @@
|
||||
---
|
||||
title: Lua
|
||||
author: Matthieu Coudron
|
||||
date: 2019-02-05
|
||||
---
|
||||
|
||||
# User's Guide to Lua Infrastructure
|
||||
# User's Guide to Lua Infrastructure {#users-guide-to-lua-infrastructure}
|
||||
|
||||
## Using Lua
|
||||
|
||||
|
||||
@ -1,10 +1,4 @@
|
||||
---
|
||||
title: Maven
|
||||
author: Farid Zakaria
|
||||
date: 2020-10-15
|
||||
---
|
||||
|
||||
# Maven
|
||||
# Maven {#maven}
|
||||
|
||||
Maven is a well-known build tool for the Java ecosystem however it has some challenges when integrating into the Nix build system.
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Node.js
|
||||
=======
|
||||
# Node.js {#node.js}
|
||||
|
||||
The `pkgs/development/node-packages` folder contains a generated collection of
|
||||
[NPM packages](https://npmjs.com/) that can be installed with the Nix package
|
||||
manager.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Python
|
||||
# Python {#python}
|
||||
|
||||
## User Guide
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
R
|
||||
=
|
||||
# R {#r}
|
||||
|
||||
## Installation
|
||||
|
||||
|
||||
@ -1,10 +1,4 @@
|
||||
---
|
||||
title: Rust
|
||||
author: Matthias Beyer
|
||||
date: 2017-03-05
|
||||
---
|
||||
|
||||
# Rust
|
||||
# Rust {#rust}
|
||||
|
||||
To install the rust compiler and cargo put
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
# TeX Live {#sec-language-texlive}
|
||||
|
||||
Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute `texlive`.
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
---
|
||||
title: Titanium
|
||||
author: Sander van der Burg
|
||||
date: 2018-11-18
|
||||
---
|
||||
# Titanium
|
||||
# Titanium {#titanium}
|
||||
|
||||
The Nixpkgs repository contains facilities to deploy a variety of versions of
|
||||
the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
---
|
||||
title: User's Guide for Vim in Nixpkgs
|
||||
author: Marc Weber
|
||||
date: 2016-06-25
|
||||
---
|
||||
# Vim
|
||||
# Vim {#vim}
|
||||
|
||||
Both Neovim and Vim can be configured to include your favorite plugins
|
||||
and additional libraries.
|
||||
|
||||
@ -1,10 +1,4 @@
|
||||
---
|
||||
title: Preface
|
||||
author: Frederik Rietdijk
|
||||
date: 2015-11-25
|
||||
---
|
||||
|
||||
# Preface
|
||||
# Preface {#preface}
|
||||
|
||||
The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the
|
||||
[Nix package manager](https://nixos.org/nix/), released under a
|
||||
|
||||
@ -817,14 +817,54 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
|
||||
};
|
||||
} // {
|
||||
# TODO: remove legacy aliases
|
||||
agpl3 = lib.licenses.agpl3Only;
|
||||
fdl11 = lib.licenses.fdl11Only;
|
||||
fdl12 = lib.licenses.fdl12Only;
|
||||
fdl13 = lib.licenses.fdl13Only;
|
||||
gpl1 = lib.licenses.gpl1Only;
|
||||
gpl2 = lib.licenses.gpl2Only;
|
||||
gpl3 = lib.licenses.gpl3Only;
|
||||
lgpl2 = lib.licenses.lgpl2Only;
|
||||
lgpl21 = lib.licenses.lgpl21Only;
|
||||
lgpl3 = lib.licenses.lgpl3Only;
|
||||
agpl3 = spdx {
|
||||
spdxId = "AGPL-3.0";
|
||||
fullName = "GNU Affero General Public License v3.0";
|
||||
deprecated = true;
|
||||
};
|
||||
fdl11 = spdx {
|
||||
spdxId = "GFDL-1.1";
|
||||
fullName = "GNU Free Documentation License v1.1";
|
||||
deprecated = true;
|
||||
};
|
||||
fdl12 = spdx {
|
||||
spdxId = "GFDL-1.2";
|
||||
fullName = "GNU Free Documentation License v1.2";
|
||||
deprecated = true;
|
||||
};
|
||||
fdl13 = spdx {
|
||||
spdxId = "GFDL-1.3";
|
||||
fullName = "GNU Free Documentation License v1.3";
|
||||
deprecated = true;
|
||||
};
|
||||
gpl1 = spdx {
|
||||
spdxId = "GPL-1.0";
|
||||
fullName = "GNU General Public License v1.0";
|
||||
deprecated = true;
|
||||
};
|
||||
gpl2 = spdx {
|
||||
spdxId = "GPL-2.0";
|
||||
fullName = "GNU General Public License v2.0";
|
||||
deprecated = true;
|
||||
};
|
||||
gpl3 = spdx {
|
||||
spdxId = "GPL-3.0";
|
||||
fullName = "GNU General Public License v3.0";
|
||||
deprecated = true;
|
||||
};
|
||||
lgpl2 = spdx {
|
||||
spdxId = "LGPL-2.0";
|
||||
fullName = "GNU Library General Public License v2";
|
||||
deprecated = true;
|
||||
};
|
||||
lgpl21 = spdx {
|
||||
spdxId = "LGPL-2.1";
|
||||
fullName = "GNU Lesser General Public License v2.1";
|
||||
deprecated = true;
|
||||
};
|
||||
lgpl3 = spdx {
|
||||
spdxId = "LGPL-3.0";
|
||||
fullName = "GNU Lesser General Public License v3.0";
|
||||
deprecated = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -76,6 +76,12 @@
|
||||
githubId = 882455;
|
||||
name = "Elliot Cameron";
|
||||
};
|
||||
_6AA4FD = {
|
||||
email = "f6442954@gmail.com";
|
||||
github = "6AA4FD";
|
||||
githubId = 12578560;
|
||||
name = "Quinn Bohner";
|
||||
};
|
||||
a1russell = {
|
||||
email = "adamlr6+pub@gmail.com";
|
||||
github = "a1russell";
|
||||
|
||||
@ -168,6 +168,14 @@
|
||||
<literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
xfsprogs was update from 4.19 to 5.10. It now enables reflink support by default on filesystem creation.
|
||||
Support for reflinks was added with an experimental status to kernel 4.9 and deemed stable in kernel 4.16.
|
||||
If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than those, you need to format them
|
||||
with <literal>mkfs.xfs -m reflink=0</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<package>btc1</package> has been abandoned upstream, and removed.
|
||||
|
||||
@ -145,7 +145,8 @@ in
|
||||
'';
|
||||
|
||||
systemd.services.systemd-vconsole-setup =
|
||||
{ before = [ "display-manager.service" ];
|
||||
{
|
||||
before = optional config.services.xserver.enable "display-manager.service";
|
||||
after = [ "systemd-udev-settle.service" ];
|
||||
restartTriggers = [ vconsoleConf consoleEnv ];
|
||||
};
|
||||
|
||||
@ -27,8 +27,8 @@ if (!defined $res || scalar @$res == 0) {
|
||||
my $package = @$res[0]->{package};
|
||||
if ($ENV{"NIX_AUTO_INSTALL"} // "") {
|
||||
print STDERR <<EOF;
|
||||
The program ‘$program’ is currently not installed. It is provided by
|
||||
the package ‘$package’, which I will now install for you.
|
||||
The program '$program' is currently not installed. It is provided by
|
||||
the package '$package', which I will now install for you.
|
||||
EOF
|
||||
;
|
||||
exit 126 if system("nix-env", "-iA", "nixos.$package") == 0;
|
||||
@ -36,16 +36,17 @@ EOF
|
||||
exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV));
|
||||
} else {
|
||||
print STDERR <<EOF;
|
||||
The program ‘$program’ is currently not installed. You can install it by typing:
|
||||
nix-env -iA nixos.$package
|
||||
The program '$program' is not in your PATH. You can make it available in a
|
||||
ephemeral shell by typing:
|
||||
nix-shell -p $package
|
||||
EOF
|
||||
}
|
||||
} else {
|
||||
print STDERR <<EOF;
|
||||
The program ‘$program’ is currently not installed. It is provided by
|
||||
several packages. You can install it by typing one of the following:
|
||||
The program '$program' is not in your PATH. It is provided by several packages.
|
||||
You can make it available in a ephemeral shell by typing one of the following:
|
||||
EOF
|
||||
print STDERR " nix-env -iA nixos.$_->{package}\n" foreach @$res;
|
||||
print STDERR " nix-shell -p $_->{package}\n" foreach @$res;
|
||||
}
|
||||
|
||||
exit 127;
|
||||
|
||||
@ -8,8 +8,7 @@ let
|
||||
cfg = xcfg.desktopManager.plasma5;
|
||||
|
||||
inherit (pkgs) kdeApplications kdeFrameworks plasma5;
|
||||
libsForQt5 = pkgs.libsForQt514;
|
||||
qt5 = pkgs.qt514;
|
||||
inherit (pkgs) qt5 libsForQt5;
|
||||
inherit (pkgs) writeText;
|
||||
|
||||
pulseaudio = config.hardware.pulseaudio;
|
||||
|
||||
@ -158,6 +158,7 @@ in
|
||||
home-assistant = handleTest ./home-assistant.nix {};
|
||||
hostname = handleTest ./hostname.nix {};
|
||||
hound = handleTest ./hound.nix {};
|
||||
hub = handleTest ./git/hub.nix {};
|
||||
hydra = handleTest ./hydra {};
|
||||
i3wm = handleTest ./i3wm.nix {};
|
||||
icingaweb2 = handleTest ./icingaweb2.nix {};
|
||||
|
||||
17
nixos/tests/git/hub.nix
Normal file
17
nixos/tests/git/hub.nix
Normal file
@ -0,0 +1,17 @@
|
||||
import ../make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "hub";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ nequissimus ];
|
||||
};
|
||||
|
||||
nodes.hub = { pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.gitAndTools.hub ];
|
||||
};
|
||||
|
||||
testScript =
|
||||
''
|
||||
assert "git version ${pkgs.git.version}\nhub version ${pkgs.gitAndTools.hub.version}\n" in hub.succeed("hub version")
|
||||
assert "These GitHub commands are provided by hub" in hub.succeed("hub help")
|
||||
'';
|
||||
})
|
||||
27
pkgs/applications/audio/new-session-manager/default.nix
Normal file
27
pkgs/applications/audio/new-session-manager/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchFromGitHub, meson, pkg-config, ninja, liblo, libjack2, fltk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "new-session-manager";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxaudio";
|
||||
repo = "new-session-manager";
|
||||
rev = "v${version}";
|
||||
sha256 = "PqOv4tx3NLxL2+GWIUVgL72EQYMyDPIMrAkyby3TZ+0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
|
||||
buildInputs = [ liblo libjack2 fltk ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://linuxaudio.github.io/new-session-manager/";
|
||||
description = "A session manager designed for audio applications.";
|
||||
maintainers = [ maintainers._6AA4FD ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = ["x86_64-linux"];
|
||||
};
|
||||
}
|
||||
163
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
163
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
@ -223,10 +223,10 @@
|
||||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "12.3.1";
|
||||
version = "13.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-12.3.1.tar";
|
||||
sha256 = "0kn48mmsvp1yp8fjcl4lriymhyskv5s70wscmf596xf56s7mqas4";
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.0.1.tar";
|
||||
sha256 = "1y5q3phd0xr7342i757hr4hic8nad4kkdf1zk56mlj5snwr0g0w7";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -264,16 +264,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
auto-overlays = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "auto-overlays";
|
||||
ename = "auto-overlays";
|
||||
version = "0.10.9";
|
||||
version = "0.10.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auto-overlays-0.10.9.tar";
|
||||
sha256 = "0aqjp3bkd7mi191nm971z857s09py390ikcd93hyhmknblk0v14p";
|
||||
url = "https://elpa.gnu.org/packages/auto-overlays-0.10.10.tar";
|
||||
sha256 = "0wln6b4j3pd3mhx6sx0bnz74c4n6fidmkg77cqfpxs4j5l1zjp2z";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/auto-overlays.html";
|
||||
license = lib.licenses.free;
|
||||
@ -437,10 +437,10 @@
|
||||
elpaBuild {
|
||||
pname = "chess";
|
||||
ename = "chess";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/chess-2.0.4.tar";
|
||||
sha256 = "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js";
|
||||
url = "https://elpa.gnu.org/packages/chess-2.0.5.tar";
|
||||
sha256 = "1a4iwjdh6k348df6qywjws9z9f862d62m0b2sz57z4xhywiyxpr7";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@ -685,10 +685,10 @@
|
||||
elpaBuild {
|
||||
pname = "csv-mode";
|
||||
ename = "csv-mode";
|
||||
version = "1.13";
|
||||
version = "1.14";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.13.tar";
|
||||
sha256 = "0g9rj8sgdbzqnqqvhx3022zz665wqam2nlxsbhzz2393cz11y0d2";
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.14.tar";
|
||||
sha256 = "1jz4134pk8dwzsqih9wybx4l9yl244cgcilw8rdnnqmm8i6vxgrp";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -790,10 +790,10 @@
|
||||
elpaBuild {
|
||||
pname = "dict-tree";
|
||||
ename = "dict-tree";
|
||||
version = "0.14";
|
||||
version = "0.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dict-tree-0.14.el";
|
||||
sha256 = "1k00k3510bgq7rijvrxbx4b7qlq2abq1dyyn51zgm8q0qk68p5jq";
|
||||
url = "https://elpa.gnu.org/packages/dict-tree-0.16.tar";
|
||||
sha256 = "1myf26g3jjk2v8yp3k2n8m45vi20452wd7w2bja8csfkk0qx3300";
|
||||
};
|
||||
packageRequires = [ heap tNFA trie ];
|
||||
meta = {
|
||||
@ -805,10 +805,10 @@
|
||||
elpaBuild {
|
||||
pname = "diff-hl";
|
||||
ename = "diff-hl";
|
||||
version = "1.8.7";
|
||||
version = "1.8.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/diff-hl-1.8.7.tar";
|
||||
sha256 = "1qcwicflvm6dxcflnlg891hyzwp2q79fdkdbdwp1440a0j09riam";
|
||||
url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar";
|
||||
sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1026,21 +1026,24 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
eglot = callPackage ({ elpaBuild
|
||||
eglot = callPackage ({ eldoc
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, flymake ? null
|
||||
, jsonrpc
|
||||
, lib }:
|
||||
, lib
|
||||
, project
|
||||
, xref }:
|
||||
elpaBuild {
|
||||
pname = "eglot";
|
||||
ename = "eglot";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eglot-1.6.tar";
|
||||
sha256 = "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx";
|
||||
url = "https://elpa.gnu.org/packages/eglot-1.7.tar";
|
||||
sha256 = "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk";
|
||||
};
|
||||
packageRequires = [ emacs flymake jsonrpc ];
|
||||
packageRequires = [ eldoc emacs flymake jsonrpc project xref ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/eglot.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1130,10 +1133,10 @@
|
||||
elpaBuild {
|
||||
pname = "emms";
|
||||
ename = "emms";
|
||||
version = "6.2";
|
||||
version = "6.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/emms-6.2.tar";
|
||||
sha256 = "0d95sjrh9vpl41vz26y8clgji987z15lj4ky2kr9yrl0zpa8yv35";
|
||||
url = "https://elpa.gnu.org/packages/emms-6.3.tar";
|
||||
sha256 = "12cfq503li0gcqmm5bmqz8yjvfdif5xvz0l9vx3g5jl6ljygwgmf";
|
||||
};
|
||||
packageRequires = [ cl-lib seq ];
|
||||
meta = {
|
||||
@ -1746,10 +1749,10 @@
|
||||
elpaBuild {
|
||||
pname = "ivy-posframe";
|
||||
ename = "ivy-posframe";
|
||||
version = "0.5.3";
|
||||
version = "0.5.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.3.el";
|
||||
sha256 = "03ydfb155p5lak7nw4s79ab9zadwsjw1zggzwxgnlydsqdqbr6l6";
|
||||
url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.5.tar";
|
||||
sha256 = "184730grclxmlw6nfs41d4g6fvz9c6xnclvwgqx1ii0xm7p9xy95";
|
||||
};
|
||||
packageRequires = [ emacs ivy posframe ];
|
||||
meta = {
|
||||
@ -1791,10 +1794,10 @@
|
||||
elpaBuild {
|
||||
pname = "js2-mode";
|
||||
ename = "js2-mode";
|
||||
version = "20190219";
|
||||
version = "20201220";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/js2-mode-20190219.tar";
|
||||
sha256 = "0jgqs7cwykw5ihdq9wp5qc05y6br9gsyfiylqhjq43z59673chcc";
|
||||
url = "https://elpa.gnu.org/packages/js2-mode-20201220.tar";
|
||||
sha256 = "0zdrp8lap1ijrmsn9jsnvm44b6vxlgh9vcla5ysh1ga95zkjxrwm";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1847,6 +1850,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }:
|
||||
elpaBuild {
|
||||
pname = "kiwix";
|
||||
ename = "kiwix";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/kiwix-1.0.1.tar";
|
||||
sha256 = "1dly6pilf71hq3mra9kc63i6iynzkxjmp9gwy0rhnvhq4b4qr01d";
|
||||
};
|
||||
packageRequires = [ emacs request ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/kiwix.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "kmb";
|
||||
@ -2430,10 +2448,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.4";
|
||||
version = "9.4.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.4.tar";
|
||||
sha256 = "1awkrh3y90q7c0as3327rqj0zylf5cpjzr1pyvbzymli16irhwb6";
|
||||
url = "https://elpa.gnu.org/packages/org-9.4.4.tar";
|
||||
sha256 = "05ma8n6hr10323d85ay8ai0xrpc9q2m93n8avqh7j9fmmb3bhr0b";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2460,10 +2478,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-translate";
|
||||
ename = "org-translate";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-translate-0.1.2.el";
|
||||
sha256 = "1087h6l5d8946dl4bg7g7is5pwc6004l4k9i2qcki4ahglvzdkz4";
|
||||
url = "https://elpa.gnu.org/packages/org-translate-0.1.3.el";
|
||||
sha256 = "0m52vv1961kf8f1gw8c4n02hxcvhdw3wgzmcxvjcdijfnjkarm33";
|
||||
};
|
||||
packageRequires = [ emacs org ];
|
||||
meta = {
|
||||
@ -2670,10 +2688,10 @@
|
||||
elpaBuild {
|
||||
pname = "project";
|
||||
ename = "project";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/project-0.5.2.el";
|
||||
sha256 = "181hls4phhj8kgpfcky6h0mgzpl9xj616abvcvx8mrn4nmpyh655";
|
||||
url = "https://elpa.gnu.org/packages/project-0.5.3.el";
|
||||
sha256 = "0cpf69m41h8gfcqnq72h11925zdk35b7hw7bfy83xm83xwp12rxx";
|
||||
};
|
||||
packageRequires = [ emacs xref ];
|
||||
meta = {
|
||||
@ -2715,10 +2733,10 @@
|
||||
elpaBuild {
|
||||
pname = "python";
|
||||
ename = "python";
|
||||
version = "0.27";
|
||||
version = "0.27.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/python-0.27.el";
|
||||
sha256 = "03k527p1jp47hmm7rmld3cn9dls1smyspvgii2xn95jfvrp9klvv";
|
||||
url = "https://elpa.gnu.org/packages/python-0.27.1.el";
|
||||
sha256 = "0jygl2w8x73v22w0rzq75i2hnm3f46dzgg5x1ckz720nznvwwkka";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -3040,10 +3058,10 @@
|
||||
elpaBuild {
|
||||
pname = "rt-liberation";
|
||||
ename = "rt-liberation";
|
||||
version = "1.31";
|
||||
version = "2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rt-liberation-1.31.tar";
|
||||
sha256 = "0qqqqwdkb0h8137rqsr08179skl1475cg4hl7a987rmccys0j83c";
|
||||
url = "https://elpa.gnu.org/packages/rt-liberation-2.1.tar";
|
||||
sha256 = "1ahl1ys72rvqs2bf9zv9648h65fx0283ibqlk1b8ayahc04w6qbl";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -3076,10 +3094,10 @@
|
||||
elpaBuild {
|
||||
pname = "scanner";
|
||||
ename = "scanner";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/scanner-0.1.tar";
|
||||
sha256 = "0hv4w7yzfdnz8vrfhw6i6agj9hs09vzsqr63nrp6dd93q0gk71mw";
|
||||
url = "https://elpa.gnu.org/packages/scanner-0.2.tar";
|
||||
sha256 = "1nbfpgndjkv7mr81bxy58k4y13lc4cidyz9mbwh7433r8rfhymb5";
|
||||
};
|
||||
packageRequires = [ dash emacs ];
|
||||
meta = {
|
||||
@ -3147,21 +3165,6 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "shell-command-plus";
|
||||
ename = "shell-command+";
|
||||
version = "2.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar";
|
||||
sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/shell-command+.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "shen-mode";
|
||||
@ -3545,10 +3548,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.4.4.4";
|
||||
version = "2.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.4.4.4.tar";
|
||||
sha256 = "1f2d02xz3kpy50186wcy688lx76dv0gmrbkj2qdvifcwhyc26sz8";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.0.tar";
|
||||
sha256 = "1jpnqyk108nksaym2b9v243y5zkpr4px9d070wsb9cwm3xrcd8rh";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3590,10 +3593,10 @@
|
||||
elpaBuild {
|
||||
pname = "trie";
|
||||
ename = "trie";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/trie-0.4.el";
|
||||
sha256 = "0869fh3bghxil94wd9vgbb5bk1hx2qkh75vbvp0psmcima8dgzgw";
|
||||
url = "https://elpa.gnu.org/packages/trie-0.5.tar";
|
||||
sha256 = "1qbzxw7h3p3k3r3fzq66pj223vjiw20dvaljkb8w3r5q16fnav3p";
|
||||
};
|
||||
packageRequires = [ heap tNFA ];
|
||||
meta = {
|
||||
@ -3704,10 +3707,10 @@
|
||||
elpaBuild {
|
||||
pname = "vcard";
|
||||
ename = "vcard";
|
||||
version = "0.1";
|
||||
version = "0.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vcard-0.1.tar";
|
||||
sha256 = "1awcm2s292r2nkyz5bwjaga46jsh5rn92469wrg1ag843mlyxbd0";
|
||||
url = "https://elpa.gnu.org/packages/vcard-0.2.1.tar";
|
||||
sha256 = "0nfrh1mz2h7h259kf7sj13z30kmjywfvs83ax5qjkfwxhqm03abf";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4074,10 +4077,10 @@
|
||||
elpaBuild {
|
||||
pname = "xref";
|
||||
ename = "xref";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xref-1.0.3.el";
|
||||
sha256 = "1r531gl73y1br8g4n77gxbyj26yiaw7snjad21fgs5m80cka8fi3";
|
||||
url = "https://elpa.gnu.org/packages/xref-1.0.4.el";
|
||||
sha256 = "0hkm59qqlsfw3w9ws9xhpmmz30ylifmh05a00ba58zvv1kz04x1g";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20201207";
|
||||
version = "20201228";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20201207.tar";
|
||||
sha256 = "0hryicg3nbvc17ypwdcx08kl8samd979388hw7jwbp5sw3v95y0c";
|
||||
url = "https://orgmode.org/elpa/org-20201228.tar";
|
||||
sha256 = "0rv98v3zbdbc4yfq9mymrxrcj422xpfhvw31xrspydwgpxqgsf99";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -19,10 +19,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20201207";
|
||||
version = "20201228";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20201207.tar";
|
||||
sha256 = "07xmnxrn63ini3c8hfrgv13b28dh91x2lpf875fhi5wz70w0a9s4";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20201228.tar";
|
||||
sha256 = "0libzh2a51m9l0kb01zjw2fai2nbxqw9r01i8fkjy94hq0lbw7cc";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "13.9.9";
|
||||
version = "14.1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
|
||||
hash = "sha256-+rNbLHpkFnvM7gDFbZ9AItPIA2IVTmscz+gTXF8riIY=";
|
||||
hash = "sha256-dM/DGtUDnJBD4Cfhm/zbxfgBhUcIlEzlF4z3cmQuW14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,25 +1,24 @@
|
||||
{ stdenv, cmake, fetchurl, ncurses, readline }:
|
||||
{ stdenv, fetchFromGitHub, cmake, ncurses, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ctodo";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz";
|
||||
sha256 = "1k3raigcgpwa0h8zkv5x9rycnn2iqkb9qim4q9ydqy9wbv3m32jb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Acolarh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna";
|
||||
};
|
||||
|
||||
buildInputs = [ stdenv cmake ncurses readline ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ ncurses readline ];
|
||||
|
||||
configurePhase = ''
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$out .
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://ctodo.apakoh.dk/";
|
||||
description = "A simple ncurses-based task list manager";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
1091
pkgs/applications/misc/elfx86exts/cargo-lock.patch
Normal file
1091
pkgs/applications/misc/elfx86exts/cargo-lock.patch
Normal file
File diff suppressed because it is too large
Load Diff
30
pkgs/applications/misc/elfx86exts/default.nix
Normal file
30
pkgs/applications/misc/elfx86exts/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elfx86exts";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkgw";
|
||||
repo = pname;
|
||||
rev = "${pname}@${version}";
|
||||
sha256 = "1j9ca2lyxjsrf0rsfv83xi53vj6jz5nb76xibh367brcsc26mvd6";
|
||||
};
|
||||
|
||||
cargoSha256 = "1dfhx40jr5llqa554wifd920mqdbm8s5fns98m6vcqdjxzan4nr2";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Decode x86 binaries and print out which instruction set extensions they use.";
|
||||
longDescription = ''
|
||||
Disassemble a binary containing x86 instructions and print out which extensions it uses.
|
||||
Despite the utterly misleading name, this tool supports ELF and MachO binaries, and
|
||||
perhaps PE-format ones as well. (It used to be more limited.)
|
||||
'';
|
||||
homepage = "https://github.com/pkgw/elfx86exts";
|
||||
maintainers = with maintainers; [ rmcgibbo ];
|
||||
license = with licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +1,14 @@
|
||||
{ stdenv, python27Packages, fetchFromGitHub }:
|
||||
|
||||
python27Packages.buildPythonApplication rec {
|
||||
name = "printrun-20150310";
|
||||
pname = "printrun";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kliment";
|
||||
repo = "Printrun";
|
||||
rev = name;
|
||||
sha256 = "09ijv8h4k5h15swg64s7igamvynawz7gdi7hiymzrzywdvr0zwsa";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0nhcx1bi1hals0a6d6994y0kcwsfqx3hplwbmn9136hgrplg0l2l";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python27Packages; [
|
||||
|
||||
@ -36,9 +36,6 @@ update `upstream-info.json`. After updates it is important to test at least
|
||||
`nixosTests.chromium` (or basic manual testing) and `google-chrome` (which
|
||||
reuses `upstream-info.json`).
|
||||
|
||||
After updating, please also update pkgs/development/tools/selenium/chromedriver/default.nix
|
||||
to a matching version.
|
||||
|
||||
## Backports
|
||||
|
||||
All updates are considered security critical and should be ported to the stable
|
||||
|
||||
@ -9,11 +9,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "msmtp";
|
||||
version = "1.8.13";
|
||||
version = "1.8.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd";
|
||||
sha256 = "1W8GXXEUhunCNGGFFaAqSKSNq0BRs08+EI++y2+3c7Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
|
||||
, seafile-shared, ccnet, jansson, libsearpc
|
||||
, seafile-shared, jansson, libsearpc
|
||||
, withShibboleth ? true, qtwebengine }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "seafile-client";
|
||||
version = "7.0.9";
|
||||
version = "7.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9";
|
||||
sha256 = "082v1qbysrqb7m0lk56fpx8n403fjxbvbj0svm4mkjl6mzs2cv22";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
@ -21,7 +21,7 @@ mkDerivation rec {
|
||||
++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--suffix PATH : ${lib.makeBinPath [ ccnet seafile-shared ]}"
|
||||
"--suffix PATH : ${lib.makeBinPath [ seafile-shared ]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
{ stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, genericUpdater
|
||||
, common-updater-scripts
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
@ -17,6 +22,15 @@ buildGoModule rec {
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = genericUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
||||
rev-prefix = "v";
|
||||
ignoredVersions = ".(rc|beta).*";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description =
|
||||
"Enables easy access any Linux device behind firewall and NAT";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, qtbase }:
|
||||
|
||||
let
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
pname = "nanovna-saver";
|
||||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication {
|
||||
@ -12,7 +12,7 @@ in mkDerivationWith python3Packages.buildPythonApplication {
|
||||
owner = "NanoVNA-Saver";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0c22ckyypg91gfb2sdc684msw28nnb6r8cq3b362gafvv00a35mi";
|
||||
sha256 = "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
||||
@ -27,7 +27,7 @@ let
|
||||
calculus in one easy-to-use package.
|
||||
'';
|
||||
homepage = "https://www.geogebra.org/";
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
hydraPlatforms = [];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qgroundcontrol";
|
||||
version = "4.0.10";
|
||||
version = "4.0.11";
|
||||
|
||||
qtInputs = [
|
||||
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
|
||||
@ -62,7 +62,7 @@ mkDerivation rec {
|
||||
owner = "mavlink";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1jmhhd2nwxq3m9rzzmrjls8f6hhj52ia71b1sv4vvcjh802cha8g";
|
||||
sha256 = "14pk1vmcpg2cc5p100chbhnynclcwyqmyb2n2w11vvk0l2c9z1gz";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A syntax-highlighting pager for git";
|
||||
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marsam ma27 zowoq ];
|
||||
maintainers = with maintainers; [ marsam zowoq ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, util-linux }:
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "hub";
|
||||
@ -20,6 +20,8 @@ buildGoPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace git/git.go --replace "cmd.New(\"git\")" "cmd.New(\"${git}/bin/git\")"
|
||||
substituteInPlace commands/args.go --replace "Executable: \"git\"" "Executable: \"${git}/bin/git\""
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
@ -33,6 +35,8 @@ buildGoPackage rec {
|
||||
installManPage share/man/man[1-9]/*.[1-9]
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) hub; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Command-line wrapper for git that makes you better at GitHub";
|
||||
license = licenses.mit;
|
||||
|
||||
57
pkgs/applications/window-managers/wio/default.nix
Normal file
57
pkgs/applications/window-managers/wio/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{ stdenv, fetchgit
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, alacritty
|
||||
, cage
|
||||
, cairo
|
||||
, libxkbcommon
|
||||
, udev
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots
|
||||
, xwayland
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wio";
|
||||
version = "unstable-2020-11-02";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~sircmpwn/wio";
|
||||
rev = "31b742e473b15a2087be740d1de28bc2afd47a4d";
|
||||
sha256 = "1vpvlahv6dmr7vfb11p5cc5ds2y2vfvcb877nkqx18yin6pg357l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config makeWrapper ];
|
||||
buildInputs = [
|
||||
cairo
|
||||
libxkbcommon
|
||||
udev
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlroots
|
||||
xwayland
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/wio \
|
||||
--prefix PATH ":" "${stdenv.lib.makeBinPath [ alacritty cage ]}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "That Plan 9 feel, for Wayland";
|
||||
longDescription = ''
|
||||
Wio is a Wayland compositor for Linux and FreeBSD which has a similar look
|
||||
and feel to plan9's rio.
|
||||
'';
|
||||
homepage = "https://wio-project.org/";
|
||||
license = licenses.mit;
|
||||
platforms = with platforms; linux;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
};
|
||||
|
||||
passthru.providedSessions = [ "wio" ];
|
||||
}
|
||||
# TODO: factor Linux-specific options
|
||||
@ -50,6 +50,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/geommer/yabar";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "7.7";
|
||||
version = "8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09r9ggngskazddhcm9c2n0cjc4qs9215vyri4i02cbp1jl82kwvg";
|
||||
sha256 = "0ljigm5z13r0idfkjgy5ysq9pzdj66ql269p5phhp47aagmjcv3s";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -112,7 +112,10 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
|
||||
# wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS
|
||||
# so 'save as...' works:
|
||||
nativeBuildInputs = [ glib wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
jdk
|
||||
ant
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, bash
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
, glibcLocales ? null
|
||||
|
||||
, # GHC can be built with system libffi or a bundled one.
|
||||
libffi ? null
|
||||
@ -95,12 +96,12 @@ let
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "9.0.0.20200925";
|
||||
version = "9.0.0.20201227";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/9.0.1-alpha1/ghc-${version}-src.tar.xz";
|
||||
sha256 = "1c6vgic0bx0c4c6gszq7znvc5gxf0lgh630283mivbs1lyiqj88l";
|
||||
url = "https://downloads.haskell.org/ghc/9.0.1-rc1/ghc-${version}-src.tar.xz";
|
||||
sha256 = "1kg227fzg9qq2p7r8xqr99vvnx7ind4clxkydikyzf3vqvaacjfy";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -109,6 +110,9 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
# GHC needs the locale configured during the Haddock phase.
|
||||
LANG = "en_US.UTF-8";
|
||||
|
||||
# GHC is a bit confused on its cross terminology.
|
||||
preConfigure = ''
|
||||
for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
|
||||
@ -129,6 +133,8 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
echo -n "${buildMK}" > mk/build.mk
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
'' + stdenv.lib.optionalString (stdenv.isLinux) ''
|
||||
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
|
||||
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
||||
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
@ -185,7 +191,7 @@ stdenv.mkDerivation (rec {
|
||||
strictDeps = true;
|
||||
|
||||
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
|
||||
dontAddExtraLibs = true;
|
||||
dontAddExtraLibs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl autoconf automake m4 python3 sphinx
|
||||
|
||||
@ -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 = "1l2syrslba4mrxjzj0iblflz72siw3ibqri6p5hf59fk7rmm30a8";
|
||||
sha256 = "0w71kbz127fcli24sxsvd48l5xamwamjwhr18x9alam5cldqkkz1";
|
||||
};
|
||||
}).override {
|
||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||
@ -130,7 +130,8 @@ self: super: {
|
||||
ABList = dontCheck super.ABList;
|
||||
|
||||
# sse2 flag due to https://github.com/haskell/vector/issues/47.
|
||||
vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;
|
||||
# Jailbreak is necessary for QuickCheck dependency.
|
||||
vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
|
||||
|
||||
conduit-extra = if pkgs.stdenv.isDarwin
|
||||
then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; })
|
||||
@ -216,11 +217,7 @@ self: super: {
|
||||
# building of the executable has been disabled for ghc < 8.10 in hnix.
|
||||
# Generating the completions should be activated again, once we default to
|
||||
# ghc 8.10.
|
||||
hnix = dontCheck (super.hnix.override {
|
||||
# 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage
|
||||
prettyprinter = self.prettyprinter_1_7_0; # at least 1.7
|
||||
|
||||
});
|
||||
hnix = dontCheck super.hnix;
|
||||
|
||||
# Fails for non-obvious reasons while attempting to use doctest.
|
||||
search = dontCheck super.search;
|
||||
@ -363,9 +360,6 @@ self: super: {
|
||||
punycode = dontCheck super.punycode;
|
||||
pwstore-cli = dontCheck super.pwstore-cli;
|
||||
quantities = dontCheck super.quantities;
|
||||
QuickCheck_2_14_2 = super.QuickCheck_2_14_2.override( {
|
||||
splitmix = self.splitmix_0_1_0_3;
|
||||
});
|
||||
redis-io = dontCheck super.redis-io;
|
||||
rethinkdb = dontCheck super.rethinkdb;
|
||||
Rlang-QQ = dontCheck super.Rlang-QQ;
|
||||
@ -399,7 +393,6 @@ self: super: {
|
||||
xsd = dontCheck super.xsd;
|
||||
zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57
|
||||
|
||||
random_1_2_0 = super.random_1_2_0.override ({ splitmix = self.splitmix_0_1_0_3; });
|
||||
# These test suites run for ages, even on a fast machine. This is nuts.
|
||||
Random123 = dontCheck super.Random123;
|
||||
systemd = dontCheck super.systemd;
|
||||
@ -863,8 +856,7 @@ self: super: {
|
||||
swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
|
||||
|
||||
# hledger-lib requires the latest version of pretty-simple
|
||||
hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple_4_0_0_0; };
|
||||
pretty-simple_4_0_0_0 = super.pretty-simple_4_0_0_0.overrideScope (self: super: { prettyprinter = self.prettyprinter_1_7_0; });
|
||||
hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple; };
|
||||
|
||||
# Copy hledger man pages from data directory into the proper place. This code
|
||||
# should be moved into the cabal2nix generator.
|
||||
@ -1532,20 +1524,27 @@ self: super: {
|
||||
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
|
||||
pandoc-include-code = doJailbreak super.pandoc-include-code;
|
||||
|
||||
# https://github.com/jgm/pandoc/issues/6961
|
||||
pandoc = dontCheck super.pandoc;
|
||||
|
||||
# Update pandoc dependencies to fix the build.
|
||||
doctemplates = self.doctemplates_0_9;
|
||||
skylighting = self.skylighting_0_10_2;
|
||||
skylighting-core = self.skylighting-core_0_10_2;
|
||||
|
||||
# https://github.com/yesodweb/yesod/issues/1714
|
||||
yesod-core = dontCheck super.yesod-core;
|
||||
|
||||
# Add ApplicationServices on darwin
|
||||
# use 0.4.5 instead of 0.4.4 to fix build with glibc >= 2.32
|
||||
apecs-physics = addPkgconfigDepends super.apecs-physics_0_4_5
|
||||
apecs-physics = addPkgconfigDepends super.apecs-physics
|
||||
(pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices);
|
||||
|
||||
# Break out of overspecified constraint on QuickCheck.
|
||||
algebraic-graphs = dontCheck super.algebraic-graphs;
|
||||
attoparsec = doJailbreak super.attoparsec; # https://github.com/haskell/attoparsec/pull/168
|
||||
cassava = doJailbreak super.cassava;
|
||||
filepath-bytestring = doJailbreak super.filepath-bytestring;
|
||||
ghc-source-gen = doJailbreak super.ghc-source-gen;
|
||||
haddock-library = doJailbreak super.haddock-library;
|
||||
HsYAML = doJailbreak super.HsYAML;
|
||||
http-api-data = doJailbreak super.http-api-data;
|
||||
lzma = doJailbreak super.lzma;
|
||||
psqueues = doJailbreak super.psqueues;
|
||||
|
||||
# Break out of overspecified constraint on QuickCheck.
|
||||
# https://github.com/Gabriel439/Haskell-Nix-Derivation-Library/pull/10
|
||||
nix-derivation = doJailbreak super.nix-derivation;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
||||
@ -83,12 +83,6 @@ self: super: {
|
||||
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
|
||||
});
|
||||
|
||||
# Version 4.7.2 is broken by the bytestring library shipped by ghc-8.10.3.
|
||||
ListLike = appendPatch super.ListLike (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/ListLike-4.7.2.patch";
|
||||
sha256 = "1v392a74w0sxyn6x0bqixpmjbgla0i2b5hxzkcn1vaa3gaya7ag4";
|
||||
});
|
||||
|
||||
# hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now.
|
||||
hnix = generateOptparseApplicativeCompletion "hnix"
|
||||
(overrideCabal super.hnix (drv: {
|
||||
@ -98,4 +92,11 @@ self: super: {
|
||||
|
||||
# Break out of "Cabal < 3.2" constraint.
|
||||
stylish-haskell = doJailbreak super.stylish-haskell;
|
||||
|
||||
# Agda 2.6.1.2 only declares a transformers dependency for ghc < 8.10.3.
|
||||
# https://github.com/agda/agda/issues/5109
|
||||
Agda = appendPatch super.Agda (pkgs.fetchpatch {
|
||||
url = "https://github.com/agda/agda/commit/76278c23d447b49f59fac581ca4ac605792aabbc.patch";
|
||||
sha256 = "1g34g8a09j73h89pk4cdmri0nb0qg664hkff45amcr9kyz14a9f3";
|
||||
});
|
||||
}
|
||||
|
||||
@ -59,6 +59,7 @@ self: super: {
|
||||
# Jailbreaks & Version Updates
|
||||
async = doJailbreak super.async;
|
||||
ChasingBottoms = markBrokenVersion "1.3.1.9" super.ChasingBottoms;
|
||||
data-fix = doJailbreak super.data-fix;
|
||||
dec = doJailbreak super.dec;
|
||||
ed25519 = doJailbreak super.ed25519;
|
||||
hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; });
|
||||
@ -66,14 +67,16 @@ self: super: {
|
||||
integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
|
||||
lukko = doJailbreak super.lukko;
|
||||
parallel = doJailbreak super.parallel;
|
||||
primitive = doJailbreak (dontCheck super.primitive);
|
||||
regex-posix = doJailbreak super.regex-posix;
|
||||
resolv = doJailbreak super.resolv;
|
||||
singleton-bool = doJailbreak super.singleton-bool;
|
||||
split = doJailbreak super.split;
|
||||
splitmix = self.splitmix_0_1_0_3;
|
||||
tar = doJailbreak super.tar;
|
||||
time-compat = doJailbreak super.time-compat;
|
||||
vector = doJailbreak (dontCheck super.vector);
|
||||
vector-binary-instances = doJailbreak super.vector-binary-instances;
|
||||
vector-th-unbox = doJailbreak super.vector-th-unbox;
|
||||
zlib = doJailbreak super.zlib;
|
||||
|
||||
# Apply patches from head.hackage.
|
||||
@ -93,7 +96,6 @@ self: super: {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
|
||||
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
|
||||
});
|
||||
QuickCheck = super.QuickCheck_2_14_2;
|
||||
regex-base = appendPatch (doJailbreak super.regex-base) (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch";
|
||||
sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -550,7 +550,6 @@ self: super: builtins.intersectAttrs super {
|
||||
|
||||
# Break infinite recursion cycle between QuickCheck and splitmix.
|
||||
splitmix = dontCheck super.splitmix;
|
||||
splitmix_0_1_0_3 = dontCheck super.splitmix_0_1_0_3;
|
||||
|
||||
# Break infinite recursion cycle between tasty and clock.
|
||||
clock = dontCheck super.clock;
|
||||
|
||||
2975
pkgs/development/haskell-modules/hackage-packages.nix
generated
2975
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -9,6 +9,8 @@ self: super: {
|
||||
|
||||
dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { };
|
||||
|
||||
ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { };
|
||||
|
||||
# https://github.com/channable/vaultenv/issues/1
|
||||
vaultenv = self.callPackage ../tools/haskell/vaultenv { };
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, unixODBC ? null # odbcSupport
|
||||
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
|
||||
, parallelBuild ? false
|
||||
, withSystemd ? stdenv.isLinux, systemd # systemd support in epmd
|
||||
, systemd
|
||||
}:
|
||||
|
||||
{ baseName ? "erlang"
|
||||
@ -20,6 +20,7 @@
|
||||
, enableKernelPoll ? true
|
||||
, javacSupport ? false, javacPackages ? [ openjdk8 ]
|
||||
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
|
||||
, withSystemd ? stdenv.isLinux # systemd support in epmd
|
||||
, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
|
||||
, preUnpack ? "", postUnpack ? ""
|
||||
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aml";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1pmiflkd9idnf6p0rnmccqqlj87k8crz9ixpx6rix671vnpk0xzi";
|
||||
sha256 = "0mxmzlhiv88hm4sf8kyawyrml8qy1xis019hdyb5skl9g95z9yyf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkgconfig, libjpeg
|
||||
{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -12,13 +12,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ ffmpeg_3 libpng libjpeg ];
|
||||
cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/dirkvdb/ffmpegthumbnailer";
|
||||
description = "A lightweight video thumbnailer";
|
||||
longDescription = "FFmpegthumbnailer is a lightweight video
|
||||
longDescription = "FFmpegthumbnailer is a lightweight video
|
||||
thumbnailer that can be used by file managers to create thumbnails
|
||||
for your video files. The thumbnailer uses ffmpeg o decode frames
|
||||
from the video files, so supported videoformats depend on the
|
||||
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
The only dependencies are ffmpeg and libpng.
|
||||
";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.jagajaga ];
|
||||
};
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ index f2db3e9..4ff2602 100644
|
||||
if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned)
|
||||
- && len && len < (1 << 12)) {
|
||||
+ && len) {
|
||||
+ if (len >= (1 << 14)) {
|
||||
+ if (len >= (1 << 20)) {
|
||||
+ fprintf(stderr, "%s: exceeded environment length limit", argv[0]);
|
||||
+ return 1;
|
||||
+ }
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
, intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus
|
||||
, docbook_xml_dtd_412, gtk-doc, coreutils
|
||||
, useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind
|
||||
, withIntrospection ? true
|
||||
# needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222)
|
||||
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
|
||||
# Not yet investigated; it may be due to the "Make netgroup support optional"
|
||||
# patch not updating the tests correctly yet, or doing something wrong,
|
||||
|
||||
@ -1,28 +1,35 @@
|
||||
{ stdenv, fetchurl, cmake, pkg-config, gtest, doxygen
|
||||
, graphviz, lcov }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, pkg-config
|
||||
, gtest
|
||||
, doxygen
|
||||
, graphviz
|
||||
, lcov
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "properties-cpp";
|
||||
version = "0.0.1";
|
||||
|
||||
src = let srcver = version+"+14.10.20140730"; in
|
||||
fetchurl {
|
||||
url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz";
|
||||
sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w";
|
||||
};
|
||||
src = let srcver = "${version}+14.10.20140730"; in
|
||||
fetchurl {
|
||||
url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz";
|
||||
sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ gtest doxygen graphviz lcov ];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i "/add_subdirectory(tests)/d" CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ gtest doxygen graphviz lcov ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://launchpad.net/properties-cpp";
|
||||
description = "A very simple convenience library for handling properties and signals in C++11";
|
||||
license = licenses.lgpl3;
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
43
pkgs/development/libraries/pslib/default.nix
Normal file
43
pkgs/development/libraries/pslib/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, zlib, libpng, libjpeg, libungif, libtiff
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pslib";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-snixource-${version}.tar.gz";
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0m191ckqj1kj2yvxiilqw26x4vrn7pnlc2vy636yphjxr02q8bk4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ zlib libpng libjpeg libungif libtiff ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
for path in *.so *.so.* *.o *.o.*; do
|
||||
mv $path $out/lib/
|
||||
done
|
||||
mkdir -p $dev/include
|
||||
mv ../include/libps $dev/include
|
||||
if test -d nix-support; then
|
||||
mv nix-support $dev
|
||||
fi
|
||||
mkdir -p $doc/share/doc/${pname}
|
||||
cp -r ../doc/. $doc/share/doc/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A C-library for generating multi page PostScript documents";
|
||||
homepage = "http://pslib.sourceforge.net/";
|
||||
changelog =
|
||||
"https://sourceforge.net/p/pslib/git/ci/master/tree/pslib/ChangeLog";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
};
|
||||
}
|
||||
@ -51,7 +51,7 @@ let
|
||||
|
||||
patches = {
|
||||
qtbase =
|
||||
optionals stdenv.isDarwin [
|
||||
[
|
||||
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
|
||||
./qtbase.patch.d/0002-qtbase-mac.patch
|
||||
./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
|
||||
@ -59,8 +59,7 @@ let
|
||||
# Patch framework detection to support X.framework/X.tbd,
|
||||
# extending the current support for X.framework/X.
|
||||
./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
|
||||
]
|
||||
++ [
|
||||
|
||||
./qtbase.patch.d/0003-qtbase-mkspecs.patch
|
||||
./qtbase.patch.d/0004-qtbase-replace-libdir.patch
|
||||
./qtbase.patch.d/0005-qtbase-cmake.patch
|
||||
@ -97,7 +96,7 @@ let
|
||||
stripLen = 1;
|
||||
extraPrefix = "src/3rdparty/";
|
||||
})
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
|
||||
./qtwebengine-darwin-no-platform-check.patch
|
||||
./qtwebengine-darwin-fix-failed-static-assertion.patch
|
||||
];
|
||||
@ -108,7 +107,7 @@ let
|
||||
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
|
||||
})
|
||||
./qtwebkit.patch
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
];
|
||||
|
||||
@ -1,18 +1,5 @@
|
||||
From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Tue, 17 Sep 2019 05:34:00 -0500
|
||||
Subject: [PATCH 01/12] qtbase-mkspecs-mac
|
||||
|
||||
---
|
||||
mkspecs/common/mac.conf | 2 +-
|
||||
mkspecs/features/mac/default_post.prf | 202 ----------------------------------
|
||||
mkspecs/features/mac/default_pre.prf | 58 ----------
|
||||
mkspecs/features/mac/sdk.mk | 25 -----
|
||||
mkspecs/features/mac/sdk.prf | 61 ----------
|
||||
5 files changed, 1 insertion(+), 347 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
|
||||
index b77494ec9b..470c38e772 100644
|
||||
index b77494ec..470c38e7 100644
|
||||
--- a/mkspecs/common/mac.conf
|
||||
+++ b/mkspecs/common/mac.conf
|
||||
@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \
|
||||
@ -25,7 +12,7 @@ index b77494ec9b..470c38e772 100644
|
||||
|
||||
QMAKE_LFLAGS_REL_RPATH =
|
||||
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
|
||||
index 993f4d56a9..b80ec1e801 100644
|
||||
index d052808c..b80ec1e8 100644
|
||||
--- a/mkspecs/features/mac/default_post.prf
|
||||
+++ b/mkspecs/features/mac/default_post.prf
|
||||
@@ -68,208 +68,6 @@ qt {
|
||||
@ -161,7 +148,7 @@ index 993f4d56a9..b80ec1e801 100644
|
||||
- -isysroot$$xcodeSDKInfo(Path, $$sdk)
|
||||
- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \
|
||||
- -Xarch_$${arch} \
|
||||
- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk)
|
||||
- -isysroot$$xcodeSDKInfo(Path, $$sdk)
|
||||
-
|
||||
- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})
|
||||
- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})
|
||||
@ -182,7 +169,7 @@ index 993f4d56a9..b80ec1e801 100644
|
||||
- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
|
||||
- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- }
|
||||
-
|
||||
- # Enable precompiled headers for multiple architectures
|
||||
@ -238,7 +225,7 @@ index 993f4d56a9..b80ec1e801 100644
|
||||
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
|
||||
generate_xcode_project.target = xcodeproj
|
||||
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
|
||||
index e3534561a5..3b01424e67 100644
|
||||
index e3534561..3b01424e 100644
|
||||
--- a/mkspecs/features/mac/default_pre.prf
|
||||
+++ b/mkspecs/features/mac/default_pre.prf
|
||||
@@ -1,60 +1,2 @@
|
||||
@ -303,7 +290,7 @@ index e3534561a5..3b01424e67 100644
|
||||
-xcode_copy_phase_strip_setting.value = NO
|
||||
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
|
||||
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
|
||||
index c40f58c987..e69de29bb2 100644
|
||||
index c40f58c9..e69de29b 100644
|
||||
--- a/mkspecs/features/mac/sdk.mk
|
||||
+++ b/mkspecs/features/mac/sdk.mk
|
||||
@@ -1,25 +0,0 @@
|
||||
@ -333,7 +320,7 @@ index c40f58c987..e69de29bb2 100644
|
||||
- endif
|
||||
-endif
|
||||
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
|
||||
index 3a9c2778bb..e69de29bb2 100644
|
||||
index 3a9c2778..e69de29b 100644
|
||||
--- a/mkspecs/features/mac/sdk.prf
|
||||
+++ b/mkspecs/features/mac/sdk.prf
|
||||
@@ -1,61 +0,0 @@
|
||||
@ -398,6 +385,3 @@ index 3a9c2778bb..e69de29bb2 100644
|
||||
- $$tool = $$sysrooted $$member(value, 1, -1)
|
||||
- cache($$tool_variable, set stash, $$tool)
|
||||
-}
|
||||
--
|
||||
2.23.GIT
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
diff --git a/configure.pri b/configure.pri
|
||||
index 897bea54..6f834c20 100644
|
||||
index 897bea540..6f834c202 100644
|
||||
--- a/configure.pri
|
||||
+++ b/configure.pri
|
||||
@@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) {
|
||||
@ -12,7 +12,7 @@ index 897bea54..6f834c20 100644
|
||||
}
|
||||
|
||||
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
|
||||
index 35eb6b89..7eed640a 100644
|
||||
index 35eb6b89c..7eed640a5 100644
|
||||
--- a/mkspecs/features/platform.prf
|
||||
+++ b/mkspecs/features/platform.prf
|
||||
@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) {
|
||||
@ -43,10 +43,10 @@ index 35eb6b89..7eed640a 100644
|
||||
isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) {
|
||||
skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.")
|
||||
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
|
||||
index 4426901c..3aa6057e 100644
|
||||
index 7b77a8bf7..0e1284ee4 100644
|
||||
--- a/src/core/config/mac_osx.pri
|
||||
+++ b/src/core/config/mac_osx.pri
|
||||
@@ -5,16 +5,16 @@ load(functions)
|
||||
@@ -5,7 +5,7 @@ load(functions)
|
||||
# otherwise query for it.
|
||||
QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
|
||||
isEmpty(QMAKE_MAC_SDK_VERSION) {
|
||||
@ -55,17 +55,15 @@ index 4426901c..3aa6057e 100644
|
||||
isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
|
||||
}
|
||||
|
||||
@@ -14,11 +14,6 @@ isEmpty(QMAKE_MAC_SDK_VERSION) {
|
||||
QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1)
|
||||
|
||||
QMAKE_CLANG_DIR = "/usr"
|
||||
-QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
|
||||
-!isEmpty(QMAKE_CLANG_PATH) {
|
||||
- clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
|
||||
- exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
|
||||
-}
|
||||
+# QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
|
||||
+# !isEmpty(QMAKE_CLANG_PATH) {
|
||||
+# clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
|
||||
+# exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
|
||||
+# }
|
||||
|
||||
QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++"
|
||||
message("Using clang++ from $${QMAKE_CLANG_PATH}")
|
||||
|
||||
@ -28,18 +28,3 @@ diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
||||
#define HAVE_SYS_TIMEB_H 1
|
||||
|
||||
#if !PLATFORM(GTK) && !PLATFORM(QT)
|
||||
diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake
|
||||
--- a/Source/WTF/wtf/PlatformMac.cmake
|
||||
+++ b/Source/WTF/wtf/PlatformMac.cmake
|
||||
@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED)
|
||||
|
||||
find_library(COCOA_LIBRARY Cocoa)
|
||||
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
|
||||
-find_library(READLINE_LIBRARY Readline)
|
||||
list(APPEND WTF_LIBRARIES
|
||||
${COREFOUNDATION_LIBRARY}
|
||||
${COCOA_LIBRARY}
|
||||
- ${READLINE_LIBRARY}
|
||||
libicucore.dylib
|
||||
)
|
||||
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
, "browserify"
|
||||
, "btc-rpc-explorer"
|
||||
, "castnow"
|
||||
, "cdktf-cli"
|
||||
, "clean-css-cli"
|
||||
, "clubhouse-cli"
|
||||
, "coc-css"
|
||||
|
||||
7883
pkgs/development/node-packages/node-packages.nix
generated
7883
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -3,7 +3,9 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "jingoo";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
|
||||
@ -11,7 +13,7 @@ buildDunePackage rec {
|
||||
owner = "tategakibunko";
|
||||
repo = "jingoo";
|
||||
rev = "v${version}";
|
||||
sha256 = "16wzggwi3ri13v93mjk8w7zxwp65qmi1rnng2kpk9vffx5g1kv6f";
|
||||
sha256 = "0q947aik4i4z5wjllhwlkxh60qczwgra21yyrrzwhi9y5bnf8346";
|
||||
};
|
||||
|
||||
buildInputs = [ menhir ];
|
||||
|
||||
@ -35,6 +35,6 @@ buildDunePackage rec {
|
||||
description = "Virtual network interface and software switch for Mirage";
|
||||
homepage = "https://github.com/mirage/${pname}";
|
||||
license = licenses.isc;
|
||||
mantainers = [ maintainers.sternenseemann ];
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,28 +14,33 @@ then throw "sedlex is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let
|
||||
unicodeVersion = "12.1.0";
|
||||
baseUrl = "https://www.unicode.org/Public/${unicodeVersion}";
|
||||
|
||||
DerivedCoreProperties = fetchurl {
|
||||
url = "https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt";
|
||||
url = "${baseUrl}/ucd/DerivedCoreProperties.txt";
|
||||
sha256 = "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6";
|
||||
};
|
||||
DerivedGeneralCategory = fetchurl {
|
||||
url = "https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt";
|
||||
url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt";
|
||||
sha256 = "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q";
|
||||
};
|
||||
PropList = fetchurl {
|
||||
url = "https://www.unicode.org/Public/12.1.0/ucd/PropList.txt";
|
||||
url = "${baseUrl}/ucd/PropList.txt";
|
||||
sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk";
|
||||
};
|
||||
in
|
||||
buildDunePackage rec {
|
||||
pname = "sedlex";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-community";
|
||||
repo = "sedlex";
|
||||
rev = "v${version}";
|
||||
sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26";
|
||||
sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -43,6 +48,7 @@ buildDunePackage rec {
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
rm src/generator/data/dune
|
||||
ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt
|
||||
ln -s ${DerivedGeneralCategory} src/generator/data/DerivedGeneralCategory.txt
|
||||
ln -s ${PropList} src/generator/data/PropList.txt
|
||||
|
||||
@ -6,9 +6,9 @@
|
||||
let source =
|
||||
if stdenv.lib.versionAtLeast ocaml.version "4.02"
|
||||
then {
|
||||
version = "1.10";
|
||||
url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz";
|
||||
sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb";
|
||||
version = "1.11";
|
||||
url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz";
|
||||
sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr";
|
||||
} else {
|
||||
version = "1.3";
|
||||
url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz";
|
||||
|
||||
37
pkgs/development/python-modules/aiopulse/default.nix
Normal file
37
pkgs/development/python-modules/aiopulse/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, async-timeout
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopulse";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fnscm27l77c8cd7jhbn35axyalq61kksy3fcqzv21fz55lklsm0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
];
|
||||
|
||||
# tests are not present
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aiopulse" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Rollease Acmeda Automate Pulse hub protocol implementation";
|
||||
longDescription = ''
|
||||
The Rollease Acmeda Pulse Hub is a WiFi hub that communicates with
|
||||
Rollease Acmeda Automate roller blinds via a proprietary RF protocol.
|
||||
This module communicates over a local area network using a propriatery
|
||||
binary protocol to issues commands to the Pulse Hub.
|
||||
'';
|
||||
homepage = "https://github.com/atmurray/aiopulse";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
34
pkgs/development/python-modules/ambiclimate/default.nix
Normal file
34
pkgs/development/python-modules/ambiclimate/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ambiclimate";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Ambiclimate";
|
||||
inherit version;
|
||||
sha256 = "0vhmpazc2n7qyyh7wqsz635w0f8afk2i5d592ikb84bgnfn83483";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
||||
# tests are not present
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "ambiclimate" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to communicate with ambiclimate";
|
||||
homepage = "https://github.com/Danielhiversen/pyAmbiclimate";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +1,31 @@
|
||||
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:
|
||||
{ stdenv
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.2.10";
|
||||
version = "3.3.1";
|
||||
pname = "asgiref";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
# PyPI tarball doesn't include tests directory
|
||||
src = fetchFromGitHub {
|
||||
owner = "django";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1sj4yy2injaskwfi5pkb542jl8s6ljijnyra81gpw0pgd3d0bgxv";
|
||||
sha256 = "00r4l9x425wkbac6b6c2ksm2yjinrvvdf0ajizrzq32h0jg82016";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ async-timeout ];
|
||||
|
||||
checkInputs = [ pytest pytest-asyncio ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Reference ASGI adapters and channel layers";
|
||||
|
||||
35
pkgs/development/python-modules/blockchain/default.nix
Normal file
35
pkgs/development/python-modules/blockchain/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, future
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blockchain";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1qpbmz6dk5gx1996dswpipwhj6sp5j0dlfap012l46zqnvmkxanv";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "enum-compat" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
];
|
||||
|
||||
# tests are interacting with the API and not mocking the calls
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "blockchain" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client Blockchain Bitcoin Developer API";
|
||||
homepage = "https://github.com/blockchain/api-v1-client-python";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.16.46"; # N.B: if you change this, change botocore too
|
||||
version = "1.16.47"; # N.B: if you change this, change botocore too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0qlcmzpgmcp9cwrwni750yw9jlhzm407fs428bwkpxnhsxpix6fn";
|
||||
sha256 = "sha256-BXlrpsZfeSFOphvsrlEm1ckk7tihGHS8VTbWEd6rvkc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.19.46"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
version = "1.19.47"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hcppFa1Ucef2zRsAYQt0YB0pcMv46bG/JVaXFUz2IaM=";
|
||||
sha256 = "sha256-FVhKhtbLH5TqeF6NPJj67/jd0BBTVuHBBhGNmsEvqJE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "branca";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1f7drarwiw8fh17hpq8b3p4mfqgjbh3k045dvpx5z12d3a0zg7ca";
|
||||
sha256 = "c111453617b17ab2bda60a4cd71787d6f2b59c85cdf71ab160a737606ac66c31";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest selenium ];
|
||||
|
||||
@ -14,25 +14,25 @@
|
||||
, requests
|
||||
, setuptools
|
||||
, six
|
||||
# Test inputs
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
, pydot
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cfn-lint";
|
||||
version = "0.35.1";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-cloudformation";
|
||||
repo = "cfn-python-lint";
|
||||
repo = "cfn-python-lint";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ajb0412hw9fg9m4b3xbpfbp8cixmnpjxrkaks6k749xinzsv7qk";
|
||||
sha256 = "0cqpq7pxpslpd7am6mp6nmwhsb2p2a5lq3hjjxi8imv3wv7zql98";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"'
|
||||
substituteInPlace setup.py \
|
||||
--replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -48,6 +48,21 @@ buildPythonPackage rec {
|
||||
six
|
||||
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pydot
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# requires git directory
|
||||
"test_update_docs"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cfnlint"
|
||||
"cfnlint.conditions"
|
||||
@ -64,9 +79,6 @@ buildPythonPackage rec {
|
||||
"cfnlint.transform"
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook mock pydot ];
|
||||
preCheck = "export PATH=$out/bin:$PATH";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Checks cloudformation for practices and behaviour that could potentially be improved";
|
||||
homepage = "https://github.com/aws-cloudformation/cfn-python-lint";
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "channels";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f50a6e79757a64c1e45e95e144a2ac5f1e99ee44a0718ab182c501f5e5abd268";
|
||||
sha256 = "056b72e51080a517a0f33a0a30003e03833b551d75394d6636c885d4edb8188f";
|
||||
};
|
||||
|
||||
# Files are missing in the distribution
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudflare";
|
||||
version = "2.8.14";
|
||||
version = "2.8.15";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5787892fdee3a6408b4290de0371426ab778a7ebf44decad9d843cab1ef0a1ac";
|
||||
sha256 = "1f47bd324f80e91487dea2c79be934b1dc612bcfa63e784dcf74c6a2f52a41cc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
27
pkgs/development/python-modules/confuse/default.nix
Normal file
27
pkgs/development/python-modules/confuse/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ buildPythonPackage
|
||||
, enum34
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, lib
|
||||
, pathlib
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "confuse";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kvwEUcbiwnMqw2PQ9Z1+pgir3b7QYt2o6Y6ajJhs5GQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Confuse is a configuration library for Python that uses YAML.";
|
||||
homepage = "https://github.com/beetbox/confuse";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
}
|
||||
42
pkgs/development/python-modules/connect_box/default.nix
Normal file
42
pkgs/development/python-modules/connect_box/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, attrs
|
||||
, defusedxml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "connect-box";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "connect_box";
|
||||
inherit version;
|
||||
sha256 = "1lvz7g2f0a9ifnjczmbavn105miirdgyayr4sixhzgdgadcdhz3l";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
attrs
|
||||
defusedxml
|
||||
];
|
||||
|
||||
# no tests are present
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "connect_box" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interact with a Compal CH7465LG cable modem/router";
|
||||
longDescription = ''
|
||||
Python Client for interacting with the cable modem/router Compal
|
||||
CH7465LG which is provided under different names by various ISP
|
||||
in Europe, e.g., UPC Connect Box (CH), Irish Virgin Media Super
|
||||
Hub 3.0 (IE), Ziggo Connectbox (NL) or Unitymedia Connect Box (DE).
|
||||
'';
|
||||
homepage = "https://github.com/home-assistant-ecosystem/python-connect-box";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
41
pkgs/development/python-modules/dnachisel/default.nix
Normal file
41
pkgs/development/python-modules/dnachisel/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, biopython
|
||||
, docopt
|
||||
, flametree
|
||||
, numpy
|
||||
, proglog
|
||||
, python-codon-tables
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dnachisel";
|
||||
version = "3.2.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "35301c5eda0baca5902403504e0b5a22eb65da92c2bbd23199d95c4a6bf0ef37";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
biopython
|
||||
docopt
|
||||
flametree
|
||||
numpy
|
||||
proglog
|
||||
python-codon-tables
|
||||
];
|
||||
|
||||
# no tests in tarball
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "dnachisel" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Edinburgh-Genome-Foundry/DnaChisel";
|
||||
description = "Optimize DNA sequences under constraints";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
||||
26
pkgs/development/python-modules/flametree/default.nix
Normal file
26
pkgs/development/python-modules/flametree/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flametree";
|
||||
version = "0.1.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c8eb81dea8c7f8261a2aa03d2bac98b1d21ebceec9c67efaac423f7c1b4fe061";
|
||||
};
|
||||
|
||||
# no tests in tarball
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "flametree" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Edinburgh-Genome-Foundry/Flametree";
|
||||
description = "Python file and zip operations made easy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
||||
33
pkgs/development/python-modules/hole/default.nix
Normal file
33
pkgs/development/python-modules/hole/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hole";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "065fxc0l16j8xkjd0y0qar9cmqmjyp8jcshakbakldkfscpx3s5m";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
||||
# no tests are present
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "hole" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for interacting with a Pihole instance.";
|
||||
homepage = "https://github.com/home-assistant-ecosystem/python-hole";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hstspreload";
|
||||
version = "2020.11.21";
|
||||
version = "2020.12.22";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sethmlarson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0z2bq51dw1zak13558s2vj7pdnwad402f3ia5j2an0r678rwhsij";
|
||||
sha256 = "1jzcw4clmpbyw67pzskms5rq5b7285iwh42jzc4ly6jz9amggdzc";
|
||||
};
|
||||
|
||||
# tests require network connection
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
{ buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.1.2";
|
||||
pname = "htmltreediff";
|
||||
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "christian-oudard";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lxml html5lib ];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = " Structure-aware diff for html and xml documents";
|
||||
homepage = "https://github.com/christian-oudard/htmltreediff";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
};
|
||||
}
|
||||
37
pkgs/development/python-modules/liquidctl/default.nix
Normal file
37
pkgs/development/python-modules/liquidctl/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, docopt
|
||||
, hidapi
|
||||
, pyusb
|
||||
, smbus-cffi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "liquidctl";
|
||||
version = "1.4.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1h5kqpvlx7xppd2wli986lkslqkcrlz1wixv7fvrppzjc2nfz5d4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
docopt
|
||||
hidapi
|
||||
pyusb
|
||||
smbus-cffi
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices";
|
||||
homepage = "https://github.com/liquidctl/liquidctl";
|
||||
changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ arturcygan ];
|
||||
};
|
||||
}
|
||||
44
pkgs/development/python-modules/mediafile/default.nix
Normal file
44
pkgs/development/python-modules/mediafile/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ buildPythonPackage
|
||||
, enum34
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, lib
|
||||
, mutagen
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mediafile";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-o/tSAHu8FTr6LZoMHvegr9uCZovNLHS9KkP2U9y4uko=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mutagen six ] ++ lib.optional isPy27 enum34;
|
||||
|
||||
# NB: Remove in the next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/beetbox/mediafile/commit/0ff753d493a1a7f406cb3378545ffe2c85a9afa3.patch";
|
||||
sha256 = "sha256-AQ7YedoYPmLqt4a/odgghIKOY61i9YfA0To0RVFqlk8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/beetbox/mediafile/commit/f0fb4e5111d9dfaa3b38d196ec41fcd237d97953.patch";
|
||||
sha256 = "sha256-5O6RiAqkQEz3Bvqjwwv/LOS33nSIBnT2H/vasGGVrpI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4.patch";
|
||||
sha256 = "sha256-SMH0XhCaKLDNB4M8VmZWfGuuelfY5xladZyQYtXtP18=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MediaFile is a simple interface to the metadata tags for many audio file formats.";
|
||||
homepage = "https://github.com/beetbox/mediafile";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
}
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msgpack";
|
||||
version = "1.0.0";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1h5mxh84rcw04dvxy1qbfn2hisavfqgilh9k09rgyjhd936dad4m";
|
||||
sha256 = "1109s2yynrahwi64ikax68hx0mbclz8p35afmpphw5dwynb49q7s";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
@ -22,6 +22,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/msgpack/msgpack-python";
|
||||
description = "MessagePack serializer implementation for Python";
|
||||
changelog = "https://github.com/msgpack/msgpack-python/blob/master/ChangeLog.rst";
|
||||
license = lib.licenses.asl20;
|
||||
# maintainers = ?? ;
|
||||
};
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mysqlclient";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
nativeBuildInputs = [
|
||||
libmysqlclient
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8df057b08fc27d8f7106bfa997d0a21e2acef017f905f06d6fb0aa6a20d4d2b2";
|
||||
sha256 = "f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
33
pkgs/development/python-modules/netdata/default.nix
Normal file
33
pkgs/development/python-modules/netdata/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netdata";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "14kyjp1q3clizs1bqx4rp31d2awjmi5v65z8sarr2ycgwqqmkrzw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
||||
# no tests are present
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "netdata" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for interacting with Netdata";
|
||||
homepage = "https://github.com/home-assistant-ecosystem/python-netdata";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user