mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bc30d1eb34
32 changed files with 1788 additions and 2162 deletions
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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
'';
|
||||
})
|
||||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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
|
|
@ -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 ? ""
|
||||
|
|
|
|||
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 ];
|
||||
};
|
||||
}
|
||||
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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -32,10 +32,15 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# add testsupport.py to PATH
|
||||
preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH";
|
||||
|
||||
# ignore network related tests, which fail in sandbox
|
||||
pytestFlagsArray = [ "--ignore=tests/PyroTests/test_naming.py" ];
|
||||
pytestFlagsArray = [ "--ignore=tests/PyroTests/test_naming.py" ]
|
||||
# test hangs on darwin with sandbox enabled
|
||||
++ lib.optionals stdenv.isDarwin [ "--ignore=tests/PyroTests/test_daemon.py" ];
|
||||
|
||||
disabledTests = [
|
||||
"StartNSfunc"
|
||||
"Broadcast"
|
||||
|
|
@ -47,5 +52,5 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/irmen/Pyro4";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
33
pkgs/development/python-modules/reflink/default.nix
Normal file
33
pkgs/development/python-modules/reflink/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ buildPythonPackage
|
||||
, cffi
|
||||
, fetchPypi
|
||||
, lib
|
||||
, pytestCheckHook
|
||||
, pytestrunner
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reflink";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cffi pytestrunner ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# FIXME: These do not work, and I have been unable to figure out why.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "reflink" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python reflink wraps around platform specific reflink implementations";
|
||||
homepage = "https://gitlab.com/rubdos/pyreflink";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,22 +1,31 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "cadvisor";
|
||||
version = "0.36.0";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "cadvisor";
|
||||
rev = "v${version}";
|
||||
sha256 = "12hk2l82i7hawzbvj6imcfwn6v8pcfv0dbjfn259yi4b0jrlx6l8";
|
||||
sha256 = "15njzwvsl7jc2hgxlpsksmn7md3bqpavzaskfdlmzxnxp3biw3cj";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/google/cadvisor";
|
||||
modRoot = "./cmd";
|
||||
|
||||
subPackages = [ "." ];
|
||||
vendorSha256 = "1vbydwj3xrz2gimwfasiqiwzsdiplaq7imildzr4wspkk64dprf4";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{cmd,cadvisor}
|
||||
rm $out/bin/example
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
rm internal/container/mesos/handler_test.go
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Analyzes resource usage and performance characteristics of running docker containers";
|
||||
homepage = "https://github.com/google/cadvisor";
|
||||
|
|
|
|||
|
|
@ -1,22 +1,14 @@
|
|||
{ stdenv, buildPackages, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, pkgconfig
|
||||
, icu, libuuid, readline
|
||||
{ stdenv, buildPackages, fetchpatch, fetchurl, autoconf, automake, gettext, libtool, pkgconfig
|
||||
, icu, libuuid, readline, inih
|
||||
}:
|
||||
|
||||
let
|
||||
gentooPatch = name: sha256: fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=2517dd766cf84d251631f4324f7ec4bce912abb9";
|
||||
inherit sha256;
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfsprogs";
|
||||
version = "4.19.0";
|
||||
version = "5.10.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "18728hzfxr1bg4bdzqlxjs893ac1zwlfr7nmc2q4a1sxs0sphd1d";
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
|
||||
sha256 = "1schqzjx836jd54l10pqds7hyli2m77df3snk95xbr23dpj1fh70";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
|
@ -26,26 +18,24 @@ stdenv.mkDerivation rec {
|
|||
autoconf automake libtool gettext pkgconfig
|
||||
libuuid # codegen tool uses libuuid
|
||||
];
|
||||
buildInputs = [ readline icu ];
|
||||
buildInputs = [ readline icu inih ];
|
||||
propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h>
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Why is all this garbage needed? Why? Why?
|
||||
patches = [
|
||||
(gentooPatch "xfsprogs-4.15.0-sharedlibs.patch" "0bv2naxpiw7vcsg8p1v2i47wgfda91z1xy1kfwydbp4wmb4nbyyv")
|
||||
(gentooPatch "xfsprogs-4.15.0-docdir.patch" "1srgdidvq2ka0rmfdwpqp92fapgh53w1h7rajm4nnby5vp2v8dfr")
|
||||
(gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7")
|
||||
];
|
||||
|
||||
# @sbindir@ is replaced with /run/current-system/sw/bin to fix dependency cycles
|
||||
preConfigure = ''
|
||||
sed -i Makefile -e '/cp include.install-sh/d'
|
||||
for file in scrub/{xfs_scrub_all.cron.in,xfs_scrub@.service.in,xfs_scrub_all.service.in}; do
|
||||
substituteInPlace "$file" \
|
||||
--replace '@sbindir@' '/run/current-system/sw/bin'
|
||||
done
|
||||
make configure
|
||||
patchShebangs ./install-sh
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--disable-lib64"
|
||||
"--enable-readline"
|
||||
"--with-systemd-unit-dir=${placeholder "out"}/lib/systemd/system"
|
||||
];
|
||||
|
||||
installFlags = [ "install-dev" ];
|
||||
|
|
@ -60,6 +50,6 @@ stdenv.mkDerivation rec {
|
|||
description = "SGI XFS utilities";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dezgeg ];
|
||||
maintainers = with maintainers; [ dezgeg ajs124 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
|
||||
|
||||
let
|
||||
version = "4.12";
|
||||
version = "4.13";
|
||||
|
||||
commonMeta = with stdenv.lib; {
|
||||
description = "Various coreboot-related tools";
|
||||
|
|
@ -16,7 +16,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
|
||||
sha256 = "1qibds9lsk22wf1sxwg0jg32fgcvc9an39vf74y1hwwvxq0d1jpd";
|
||||
sha256 = "0sl50aajnah4a138sr3jjm3ydc8gfh5vvlhviz3ypp95b9jdlya7";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -89,7 +89,7 @@ let
|
|||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all";
|
||||
postFixup = let
|
||||
postFixup = let
|
||||
binPath = [ coreutils acpica-tools iasl gnugrep gnused file ];
|
||||
in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}";
|
||||
};
|
||||
|
|
|
|||
29
pkgs/tools/misc/ovh-ttyrec/default.nix
Normal file
29
pkgs/tools/misc/ovh-ttyrec/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, fetchFromGitHub, zstd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ovh-ttyrec";
|
||||
version = "1.1.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ovh";
|
||||
repo = "ovh-ttyrec";
|
||||
rev = "v${version}";
|
||||
sha256 = "176g3k2pzw6zpvmcc2f8idn6vhlygf7lfzxvrhysav2izc5dd130";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zstd ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,man}
|
||||
cp ttytime ttyplay ttyrec $out/bin
|
||||
cp docs/*.1 $out/man
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/ovh/ovh-ttyrec/";
|
||||
description = "Terminal interaction recorder and player";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ chaduffy zimbatm ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "trash-cli";
|
||||
version = "0.20.11.23";
|
||||
version = "0.20.12.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreafrancia";
|
||||
repo = "trash-cli";
|
||||
rev = version;
|
||||
sha256 = "1fjkmpnbpzxniypql68cpwc2rrnih8b34p8pzabrf55f49wcmcph";
|
||||
sha256 = "15iivl9xln1bw1zr2x5zvqyb6aj7mc8hfqi6dniq6xkp5m046ib7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.psutil ];
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
diff -ru ttyrec-1.0.8.orig/io.h ttyrec-1.0.8/io.h
|
||||
--- ttyrec-1.0.8.orig/io.h 2006-06-11 17:52:50.000000000 +0200
|
||||
+++ ttyrec-1.0.8/io.h 2015-11-15 09:59:54.000000000 +0100
|
||||
@@ -9,5 +9,6 @@
|
||||
int edup (int oldfd);
|
||||
int edup2 (int oldfd, int newfd);
|
||||
FILE* efdopen (int fd, const char *mode);
|
||||
+void set_progname (const char *name);
|
||||
|
||||
#endif
|
||||
diff -ru ttyrec-1.0.8.orig/ttyrec.c ttyrec-1.0.8/ttyrec.c
|
||||
--- ttyrec-1.0.8.orig/ttyrec.c 2006-06-11 17:52:50.000000000 +0200
|
||||
+++ ttyrec-1.0.8/ttyrec.c 2015-11-15 09:59:41.000000000 +0100
|
||||
@@ -54,6 +54,7 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
+#include <signal.h>
|
||||
|
||||
#if defined(SVR4)
|
||||
#include <fcntl.h>
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ttyrec";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://0xcc.net/ttyrec/${pname}-${version}.tar.gz";
|
||||
sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec";
|
||||
};
|
||||
|
||||
patches = [ ./clang-fixes.patch ];
|
||||
|
||||
makeFlags = stdenv.lib.optional stdenv.buildPlatform.isLinux "CFLAGS=-DSVR4"
|
||||
++ stdenv.lib.optional stdenv.cc.isClang "CC=clang";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,man}
|
||||
cp ttytime ttyplay ttyrec $out/bin
|
||||
cp *.1 $out/man
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://0xcc.net/ttyrec/";
|
||||
description = "Terminal interaction recorder and player";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
broken = true; # 2020-01-28
|
||||
};
|
||||
}
|
||||
|
|
@ -798,6 +798,9 @@ mapAliases ({
|
|||
|
||||
ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";
|
||||
|
||||
/* Added 2021-01-02 */
|
||||
ttyrec = ovh-ttyrec;
|
||||
|
||||
/* If these are in the scope of all-packages.nix, they cause collisions
|
||||
between mixed versions of qt. See:
|
||||
https://github.com/NixOS/nixpkgs/pull/101369 */
|
||||
|
|
|
|||
|
|
@ -5625,6 +5625,8 @@ in
|
|||
|
||||
linuxquota = callPackage ../tools/misc/linuxquota { };
|
||||
|
||||
liquidctl = with python3Packages; toPythonApplication liquidctl;
|
||||
|
||||
localtime = callPackage ../tools/system/localtime { };
|
||||
|
||||
logcheck = callPackage ../tools/system/logcheck { };
|
||||
|
|
@ -6462,6 +6464,8 @@ in
|
|||
|
||||
overmind = callPackage ../applications/misc/overmind { };
|
||||
|
||||
ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { };
|
||||
|
||||
owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { };
|
||||
|
||||
oxidized = callPackage ../tools/admin/oxidized { };
|
||||
|
|
@ -7996,8 +8000,6 @@ in
|
|||
|
||||
ttyplot = callPackage ../tools/misc/ttyplot { };
|
||||
|
||||
ttyrec = callPackage ../tools/misc/ttyrec { };
|
||||
|
||||
ttygif = callPackage ../tools/misc/ttygif { };
|
||||
|
||||
ttylog = callPackage ../tools/misc/ttylog { };
|
||||
|
|
@ -15602,6 +15604,8 @@ in
|
|||
gnupth = callPackage ../development/libraries/pth { };
|
||||
pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
|
||||
|
||||
pslib = callPackage ../development/libraries/pslib { };
|
||||
|
||||
pstreams = callPackage ../development/libraries/pstreams {};
|
||||
|
||||
pugixml = callPackage ../development/libraries/pugixml { };
|
||||
|
|
@ -18923,7 +18927,7 @@ in
|
|||
# Hardened Linux
|
||||
hardenedLinuxPackagesFor = kernel': overrides:
|
||||
let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
|
||||
linux_latest_for_hardened = pkgs.linux_5_9;
|
||||
linux_latest_for_hardened = pkgs.linux_5_10;
|
||||
kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
|
||||
in linuxPackagesFor (kernel.override {
|
||||
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
|
||||
|
|
|
|||
|
|
@ -3592,6 +3592,8 @@ in {
|
|||
|
||||
linuxfd = callPackage ../development/python-modules/linuxfd { };
|
||||
|
||||
liquidctl = callPackage ../development/python-modules/liquidctl { };
|
||||
|
||||
lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; }));
|
||||
|
||||
littleutils = callPackage ../development/python-modules/littleutils { };
|
||||
|
|
@ -6381,6 +6383,8 @@ in {
|
|||
|
||||
reedsolo = callPackage ../development/python-modules/reedsolo { };
|
||||
|
||||
reflink = callPackage ../development/python-modules/reflink { };
|
||||
|
||||
regex = callPackage ../development/python-modules/regex { };
|
||||
|
||||
regional = callPackage ../development/python-modules/regional { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue