b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-11-14 00:01:47 +00:00 committed by GitHub
parent 2774c726b4 08c9f103f5
commit 9b5a105856
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
110 changed files with 821 additions and 374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
maintainers/maintainer-list.nix
View file

@ -6507,6 +6507,10 @@
github = "legendofmiracles";
githubId = 30902201;
name = "legendofmiracles";
keys = [{
longkeyid = "rsa4096/0x19B082B3DEFE5451";
fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451";
}];
};
lejonet = {
email = "daniel@kuehn.se";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,40 +1,76 @@
{ fetchurl, stdenv, lib
, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkg-config
, libXxf86vm, libICE
{ fetchFromGitHub
, stdenv
, lib
, cmake
, libGLU
, libGL
, freetype
, freeimage
, zziplib
, xorgproto
, libXrandr
, libXaw
, freeglut
, libXt
, libpng
, boost
, ois
, libX11
, libXmu
, libSM
, pkg-config
, libXxf86vm
, libICE
, unzip
, libXrender
, SDL2
, withNvidiaCg ? false, nvidia_cg_toolkit
, withSamples ? false }:
, withNvidiaCg ? false
, nvidia_cg_toolkit
, withSamples ? false
}:
stdenv.mkDerivation rec {
pname = "ogre";
version = "1.12.1";
src = fetchurl {
url = "https://github.com/OGRECave/ogre/archive/v${version}.zip";
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
src = fetchFromGitHub {
owner = "OGRECave";
repo = "ogre";
rev = "v${version}";
sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM=";
};
cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
nativeBuildInputs = [ cmake unzip pkg-config ];
buildInputs =
[ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM
libXxf86vm libICE
libXrender
SDL2
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
[
cmake
libGLU
libGL
freetype
freeimage
zziplib
xorgproto
libXrandr
libXaw
freeglut
libXt
libpng
boost
ois
libX11
libXmu
libSM
libXxf86vm
libICE
libXrender
SDL2
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
meta = {
description = "A 3D engine";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

6
pkgs/development/python-modules/stestr/tests.nix
View file

@ -1,9 +1,5 @@
{ stdenv
, buildPythonPackage
, ddt
, sqlalchemy
{ buildPythonPackage
, stestr
, subunit2sql
}:
buildPythonPackage rec {

64
pkgs/development/python-modules/wavefile/default.nix Normal file
View file

@ -0,0 +1,64 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, setuptools
, pyaudio
, numpy
, libsndfile
, substituteAll
}:
buildPythonPackage rec {
pname = "wavefile";
version = "1.5";
src = fetchFromGitHub {
owner = "vokimon";
repo = "python-wavefile";
rev = "python-wavefile-${version}";
sha256 = "9sHj1gb93mCVpejRGSdLJzeFDCeTflZctE7kMWfqFrE=";
};
nativeBuildInputs = [
setuptools
];
buildInputs = [
pyaudio
libsndfile
];
propagatedBuildInputs = [
numpy
];
checkInputs = [
pyaudio
numpy
libsndfile
];
patches = [
# Fix check error
# OSError: libsndfile.so.1: cannot open shared object file: No such file or directory
(substituteAll {
src = ./libsndfile.py.patch;
libsndfile = "${lib.getLib libsndfile}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];
doCheck = false; # all test files (test/wavefileTest.py) are failing
pythonImportsCheck = [
"wavefile"
];
meta = with lib; {
description = "Pythonic libsndfile wrapper to read and write audio files";
homepage = "https://github.com/vokimon/python-wavefile";
changelog = "https://github.com/vokimon/python-wavefile#version-history";
maintainers = with maintainers; [ yuu ];
license = licenses.gpl3Plus;
};
}

18
pkgs/development/python-modules/wavefile/libsndfile.py.patch Normal file
View file

@ -0,0 +1,18 @@
diff --git a/wavefile/libsndfile.py b/wavefile/libsndfile.py
index 67f0a46..ce066ee 100644
--- a/wavefile/libsndfile.py
+++ b/wavefile/libsndfile.py
@@ -19,11 +19,11 @@ import numpy as np
if sys.platform == "win32":
dllName = 'libsndfile-1'
elif "linux" in sys.platform:
- dllName = 'libsndfile.so.1'
+ dllName = '@libsndfile@'
elif "cygwin" in sys.platform:
dllName = 'libsndfile-1.dll'
elif "darwin" in sys.platform:
- dllName = 'libsndfile.dylib'
+ dllName = '@libsndfile@'
else:
dllName = 'libsndfile'

4
pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
View file

@ -405,8 +405,8 @@ stdenv.mkDerivation rec {
substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|' \
src/BUILD
sed -i 's|/sbin/md5|md5sum|g' \
src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh
# replace initial value of pythonShebang variable in BazelPythonSemantics.java
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \

4
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
View file

@ -434,8 +434,8 @@ stdenv.mkDerivation rec {
substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|' \
src/BUILD
sed -i 's|/sbin/md5|md5sum|g' \
src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh
# replace initial value of pythonShebang variable in BazelPythonSemantics.java
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \

36
pkgs/development/tools/parsing/flex/2.6.1.nix
View file

@ -1,36 +0,0 @@
{ lib, stdenv, fetchurl, bison, m4 }:
stdenv.mkDerivation {
name = "flex-2.6.1";
src = fetchurl {
url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz";
sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw";
};
postPatch = ''
patchShebangs tests
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace Makefile.in --replace "tests" " ";
'';
buildInputs = [ bison ];
propagatedBuildInputs = [ m4 ];
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
ac_cv_func_malloc_0_nonnull=yes
ac_cv_func_realloc_0_nonnull=yes
'';
postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
sed -i Makefile -e 's/-no-undefined//;'
'';
meta = with lib; {
homepage = "https://github.com/westes/flex";
description = "A fast lexical analyser generator";
license = licenses.bsd2;
platforms = platforms.unix;
};
}

16
pkgs/games/domination/default.nix
View file

@ -6,6 +6,7 @@
, ant
, makeWrapper
, makeDesktopItem
, nixosTests
}:
let
@ -26,7 +27,7 @@ let
in stdenv.mkDerivation {
pname = "domination";
version = "1.2.3";
version = "1.2.4";
# The .zip releases do not contain the build.xml file
src = fetchsvn {
@ -34,8 +35,8 @@ in stdenv.mkDerivation {
# There are no tags in the repository.
# Look for commits like "new version x.y.z info on website"
# or "website update for x.y.z".
rev = "1964";
sha256 = "0718gns8d69a1dfq3ywc9kddl1khnrmxqyal7brckbjgay8dq42f";
rev = "2109";
sha256 = "sha256-awTaEkv0zUXgrKVKuFzi5sgHgrfiNmAFMODO5U0DL6I=";
};
nativeBuildInputs = [
@ -44,7 +45,10 @@ in stdenv.mkDerivation {
makeWrapper
];
buildPhase = "ant";
buildPhase = ''
cd swingUI
ant
'';
installPhase = ''
# Remove unnecessary files and launchers (they'd need to be wrapped anyway)
@ -76,6 +80,10 @@ in stdenv.mkDerivation {
install -Dm644 build/game/resources/icon.png $out/share/pixmaps/domination.png
'';
passthru.tests = {
domination-starts = nixosTests.domination;
};
meta = with lib; {
homepage = "http://domination.sourceforge.net/";
downloadPage = "http://domination.sourceforge.net/download.shtml";

2
pkgs/misc/arm-trusted-firmware/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, pkgsCross, buildPackages }:
{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages }:
let
buildArmTrustedFirmware = { filesToInstall

3
pkgs/misc/drivers/gutenprint/bin.nix
View file

@ -25,7 +25,8 @@ TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how
*/
stdenv.mkDerivation {
name = "cups-gutenprint-binary-5.0.1";
pname = "cups-gutenprint-binary";
version = "5.0.1";
src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
url = "https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb";

2
pkgs/misc/drivers/hplip/3.16.11.nix
View file

@ -2,7 +2,7 @@
, pkg-config
, cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils
, net-snmp, openssl, nettools
, bash, coreutils, util-linux
, bash, util-linux
, qtSupport ? true
, withPlugin ? false
}:

2
pkgs/misc/drivers/hplip/default.nix
View file

@ -3,7 +3,7 @@
, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends
, dbus, file, ghostscript, usbutils
, net-snmp, openssl, perl, nettools, avahi
, bash, coreutils, util-linux
, bash, util-linux
# To remove references to gcc-unwrapped
, removeReferencesTo, qt5
, withQt5 ? true

2
pkgs/misc/drivers/utsushi/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config
, autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends
, tesseract4, udev, libusb1, gnum4 }:
, tesseract4, udev, libusb1 }:
let

4
pkgs/misc/emulators/commanderx16/run.nix
View file

@ -1,6 +1,4 @@
{ lib
, stdenv
, runtimeShell
{ runtimeShell
, symlinkJoin
, writeTextFile
}:

1
pkgs/misc/emulators/dgen-sdl/default.nix
View file

@ -1,7 +1,6 @@
{ lib, stdenv
, fetchurl
, libarchive
, doxygen
, SDL
}:

1
pkgs/misc/emulators/mgba/default.nix
View file

@ -9,7 +9,6 @@
, libedit
, libelf
, libzip
, copyDesktopItems
, makeDesktopItem
, minizip
, pkg-config

6
pkgs/misc/emulators/retroarch/cores.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch
, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch
, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, portaudio, SDL, SDL2, libGL
, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
, buildPackages }:
let

1
pkgs/misc/emulators/retroarch/default.nix
View file

@ -14,7 +14,6 @@
, udev ? null
, enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
, withVulkan ? stdenv.isLinux, vulkan-loader ? null
, fetchurl
, wayland
, libxkbcommon
}:

3
pkgs/misc/ghostscript/test-corpus-render.nix
View file

@ -1,5 +1,4 @@
{ lib
, stdenv
{ stdenv
, fetchgit
, ghostscript
}:

1
pkgs/misc/scrcpy/default.nix
View file

@ -2,7 +2,6 @@
, meson
, ninja
, pkg-config
, fetchpatch
, platform-tools
, ffmpeg

3
pkgs/misc/vscode-extensions/cpptools/default.nix
View file

@ -1,6 +1,5 @@
{ lib, vscode-utils
, fetchurl, unzip
, mono, writeScript, runtimeShell
, fetchurl, mono, writeScript, runtimeShell
, jq, clang-tools
, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.
}:

1
pkgs/misc/vscode-extensions/default.nix
View file

@ -1,6 +1,5 @@
{ config
, lib
, buildEnv
, fetchurl
, callPackage
, vscode-utils

2
pkgs/misc/vscode-extensions/wakatime/default.nix
View file

@ -1,5 +1,5 @@
{ lib
, wakatime, vscode-utils }:
, vscode-utils }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;

5
pkgs/os-specific/darwin/DarwinTools/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "DarwinTools-1";
pname = "DarwinTools";
version = "1";
src = fetchurl {
url = "https://opensource.apple.com/tarballs/DarwinTools/${name}.tar.gz";
url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz";
sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp";
};

36
pkgs/os-specific/darwin/insert_dylib/default.nix
View file

@ -1,18 +1,22 @@
{ lib, stdenv, fetchFromGitHub, xcbuildHook }:
stdenv.mkDerivation
{ name = "insert_dylib-2016.08.28";
src = fetchFromGitHub
{ owner = "Tyilo";
repo = "insert_dylib";
rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9";
sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya";
};
nativeBuildInputs = [ xcbuildHook ];
installPhase =
''
mkdir -p $out/bin
install -m755 Products/Release/insert_dylib $out/bin
'';
meta.platforms = lib.platforms.darwin;
}
stdenv.mkDerivation {
pname = "insert_dylib";
version = "unstable-2016-08-28";
src = fetchFromGitHub {
owner = "Tyilo";
repo = "insert_dylib";
rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9";
sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya";
};
nativeBuildInputs = [ xcbuildHook ];
installPhase = ''
mkdir -p $out/bin
install -m755 Products/Release/insert_dylib $out/bin
'';
meta.platforms = lib.platforms.darwin;
}

3
pkgs/os-specific/darwin/maloader/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchgit, opencflite, clang, libcxx }:
stdenv.mkDerivation {
name = "maloader-0git";
pname = "maloader";
version = "unstable-2014-02-25";
src = fetchgit {
url = "git://github.com/shinh/maloader.git";

21
pkgs/os-specific/linux/fbterm/default.nix
View file

@ -1,19 +1,18 @@
{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}:
{ stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86 }:
let
s = # Generated upstream information
{
baseName="fbterm";
version="1.7.0";
name="fbterm-1.7.0";
hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz";
sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
};
buildInputs = [gpm freetype fontconfig ncurses]
{
version = "1.7.0";
pname = "fbterm";
hash = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz";
sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
};
buildInputs = [ gpm freetype fontconfig ncurses ]
++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86;
in
stdenv.mkDerivation {
inherit (s) name version;
inherit (s) pname version;
src = fetchurl {
inherit (s) url sha256;
};

2
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -862,6 +862,8 @@ let
LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ];
SCHED_CORE = whenAtLeast "5.14" yes;
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enable CPU/memory hotplug support
# Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot

4
pkgs/os-specific/linux/kernel/linux-zen.nix
View file

@ -2,7 +2,7 @@
let
# having the full version string here makes it easier to update
modDirVersion = "5.15.1-zen1";
modDirVersion = "5.15.2-zen1";
parts = lib.splitString "-" modDirVersion;
version = lib.elemAt parts 0;
suffix = lib.elemAt parts 1;
@ -19,7 +19,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${modDirVersion}";
sha256 = "sha256-mDAwsqLR55WFaPKO1SXZuxeuaFzprMY4ryeEUdCqKGU=";
sha256 = "sha256-6cYKlRAd8kbphIThmTdWieH322Rj1KSmCJCmYRt8o2w=";
};
structuredExtraConfig = with lib.kernel; {

14
pkgs/os-specific/linux/mwprocapture/default.nix
View file

@ -4,25 +4,25 @@ with lib;
let
bits =
if stdenv.is64bit then "64"
else "32";
if stdenv.is64bit then "64"
else "32";
libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ];
in
stdenv.mkDerivation rec {
name = "mwprocapture-1.3.0.${version}-${kernel.version}";
version = "4236";
pname = "mwprocapture";
subVersion = "4236";
version = "1.3.0.${subVersion}-${kernel.version}";
src = fetchurl {
url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz";
url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz";
sha256 = "1mfgj84km276sq5i8dny1vqp2ycqpvgplrmpbqwnk230d0w3qs74";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
preConfigure =
''
preConfigure = ''
cd ./src
export INSTALL_MOD_PATH="$out"
'';

2
pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:
{ lib, stdenv, fetchFromGitHub, kernel }:
let
rev = "307d694076b056588c652c2bdaa543a89eb255d9";

16
pkgs/os-specific/linux/seturgent/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, libX11, xorgproto, unzip }:
stdenv.mkDerivation {
name = "seturgent-2012-08-17";
pname = "seturgent";
version = "unstable-2012-08-17";
src = fetchurl {
url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip";
@ -10,7 +11,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ unzip ];
buildInputs = [
libX11 xorgproto
libX11
xorgproto
];
installPhase = ''
@ -19,10 +21,10 @@ stdenv.mkDerivation {
'';
meta = {
platforms = lib.platforms.linux;
description = "Set an application's urgency hint (or not)";
maintainers = [ lib.maintainers.yarr ];
homepage = "https://github.com/hiltjo/seturgent";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
description = "Set an application's urgency hint (or not)";
maintainers = [ lib.maintainers.yarr ];
homepage = "https://github.com/hiltjo/seturgent";
license = lib.licenses.mit;
};
}

11
pkgs/os-specific/linux/udisks-glue/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }:
stdenv.mkDerivation {
name = "udisks-glue-1.3.5";
stdenv.mkDerivation rec {
pname = "udisks-glue";
version = "1.3.5";
src = fetchurl {
url = "https://github.com/fernandotcl/udisks-glue/archive/release-1.3.5.tar.gz";
url = "https://github.com/fernandotcl/udisks-glue/archive/release-${version}.tar.gz";
sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176";
};
@ -17,9 +18,9 @@ stdenv.mkDerivation {
homepage = "https://github.com/fernandotcl/udisks-glue";
description = "A tool to associate udisks events to user-defined actions";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [pSub];
maintainers = with lib.maintainers; [ pSub ];
license = lib.licenses.bsd2;
broken = true;
hydraPlatforms = [];
hydraPlatforms = [ ];
};
}

48
pkgs/os-specific/linux/udisks/1-default.nix
View file

@ -1,12 +1,31 @@
{ lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib
, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
, libxslt, docbook_xsl, util-linux, libgudev }:
{ lib
, stdenv
, fetchurl
, pkg-config
, sg3_utils
, udev
, glib
, dbus
, dbus-glib
, polkit
, parted
, lvm2
, libatasmart
, intltool
, libuuid
, mdadm
, libxslt
, docbook_xsl
, util-linux
, libgudev
}:
stdenv.mkDerivation rec {
name = "udisks-1.0.5";
pname = "udisks";
version = "1.0.5";
src = fetchurl {
url = "https://hal.freedesktop.org/releases/${name}.tar.gz";
url = "https://hal.freedesktop.org/releases/udisks-${version}.tar.gz";
sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";
};
@ -27,8 +46,21 @@ stdenv.mkDerivation rec {
'';
buildInputs =
[ sg3_utils udev glib dbus dbus-glib polkit parted libgudev
lvm2 libatasmart intltool libuuid libxslt docbook_xsl
[
sg3_utils
udev
glib
dbus
dbus-glib
polkit
parted
libgudev
lvm2
libatasmart
intltool
libuuid
libxslt
docbook_xsl
];
nativeBuildInputs = [ pkg-config ];
@ -41,6 +73,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = with licenses; [ gpl2 lgpl2Plus ];
broken = true;
hydraPlatforms = [];
hydraPlatforms = [ ];
};
}

3
pkgs/os-specific/windows/jom/default.nix
View file

@ -4,7 +4,8 @@
# both mingw32 and mingw64.
stdenv.mkDerivation {
name = "jom-1.0.11";
pname = "jom";
version = "1.0.11";
src = fetchgit {
url = "git://gitorious.org/qt-labs/jom.git";

5
pkgs/os-specific/windows/mingwrt/default.nix
View file

@ -1,10 +1,11 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
name = "mingwrt-5.0.2";
pname = "mingwrt";
version = "5.0.2";
src = fetchurl {
url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/${name}/${name}-mingw32-src.tar.xz";
url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/mingwrt-${version}/mingwrt-${version}-mingw32-src.tar.xz";
sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp";
};

5
pkgs/os-specific/windows/w32api/default.nix
View file

@ -1,10 +1,11 @@
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "w32api-3.17-2";
pname = "w32api";
version = "3.17-2";
src = fetchurl {
url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";
url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-${lib.versions.majorMinor version}/w32api-${version}-mingw32-src.tar.lzma";
sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
};

9
pkgs/os-specific/windows/wxMSW-2.8/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:
stdenv.mkDerivation {
name = "wxMSW-2.8.11";
stdenv.mkDerivation rec {
pname = "wxMSW";
version = "2.8.11";
src = fetchurl {
url = "mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz";
url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.gz";
sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj";
};
@ -27,7 +28,7 @@ stdenv.mkDerivation {
(cd $out/include && ln -s wx-*/* .)
";
passthru = {inherit compat24 compat26 unicode;};
passthru = { inherit compat24 compat26 unicode; };
meta = {
platforms = lib.platforms.windows;

4
pkgs/servers/web-apps/wordpress/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
version = "5.8.1";
version = "5.8.2";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
sha256 = "sha256-kMqQxK+jfa3IpHQ7XLERsgzaX5g84HPCwL69zmT6gio=";
sha256 = "sha256-o9KeTmZXTHtqa/Z2KOo1n6gVCFuna42dFrvf9OBC8v8=";
};
installPhase = ''

26
pkgs/tools/X11/primus/lib.nix
View file

@ -1,5 +1,10 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, libX11, libGL, mesa
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, libX11
, libGL
, mesa
, nvidia_x11 ? null
, libglvnd
}:
@ -10,8 +15,10 @@ let
else if nvidia_x11.useGLVND then libglvnd
else nvidia_x11;
in stdenv.mkDerivation {
name = "primus-lib-2015-04-28";
in
stdenv.mkDerivation {
pname = "primus-lib";
version = "unstable-2015-04-28";
src = fetchFromGitHub {
owner = "amonakov";
@ -30,11 +37,12 @@ in stdenv.mkDerivation {
buildInputs = [ libX11 libGL ];
makeFlags = [ "LIBDIR=$(out)/lib"
"PRIMUS_libGLa=${aPackage}/lib/libGL.so"
"PRIMUS_libGLd=${libGL}/lib/libGL.so"
"PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so"
];
makeFlags = [
"LIBDIR=$(out)/lib"
"PRIMUS_libGLa=${aPackage}/lib/libGL.so"
"PRIMUS_libGLd=${libGL}/lib/libGL.so"
"PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so"
];
installPhase = ''
ln -s $out/lib/libGL.so.1 $out/lib/libGL.so

4
pkgs/tools/X11/xdotool/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xdotool";
version = "3.20210903.1";
version = "3.20211022.1";
src = fetchFromGitHub {
owner = "jordansissel";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fmz/CJm1GgNOYjOfC6uNwDa8jV+GczPw8m6Qb2jw3rE=";
sha256 = "sha256-XFiaiHHtUSNFw+xhUR29+2RUHOa+Eyj1HHfjCUjwd9k=";
};
nativeBuildInputs = [ pkg-config perl ];

6
pkgs/tools/filesystems/lfs/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "lfs";
version = "1.1.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "gez5q1niIhzWJpsEkbVRuQFILo3tTO8aJq7ewZArJ5M=";
sha256 = "sha256-Cf9W0LnlvMm0XZe6lvx8hQejcwyfxBC6VKltAAfRD5I=";
};
cargoSha256 = "2U1xDG4bTimtmjwZ1z9ErlaOcBNJdRcHlEWVaiGg01M=";
cargoSha256 = "sha256-skP9VJuRMCyA06YjGbyNIt/DljP3fQQOIQDy6k10zGI=";
meta = with lib; {
description = "Get information on your mounted disks";

22
pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
View file

@ -1,14 +1,24 @@
{ lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkg-config, popt
, enablePython ? true, python ? null
{ lib
, stdenv
, fetchurl
, fetchpatch
, lvm2
, libgcrypt
, libuuid
, pkg-config
, popt
, enablePython ? true
, python ? null
}:
assert enablePython -> python != null;
stdenv.mkDerivation rec {
name = "cryptsetup-1.6.3";
pname = "cryptsetup";
version = "1.6.3";
src = fetchurl {
url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2";
url = "http://cryptsetup.googlecode.com/files/cryptsetup-${version}.tar.bz2";
sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2";
};
@ -22,11 +32,11 @@ stdenv.mkDerivation rec {
];
configureFlags = [ "--enable-cryptsetup-reencrypt" ]
++ lib.optional enablePython "--enable-python";
++ lib.optional enablePython "--enable-python";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lvm2 libgcrypt libuuid popt ]
++ lib.optional enablePython python;
++ lib.optional enablePython python;
meta = with lib; {
homepage = "http://code.google.com/p/cryptsetup/";

5
pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, lvm2 }:
stdenv.mkDerivation rec {
name = "dmraid-1.0.0.rc15";
pname = "dmraid";
version = "1.0.0.rc15";
src = fetchurl {
url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2";
url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2";
sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";
};

5
pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
View file

@ -3,10 +3,11 @@
{ lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }:
stdenv.mkDerivation rec {
name = "multipath-tools-0.4.9";
pname = "multipath-tools";
version = "0.4.9";
src = fetchurl {
url = "http://christophe.varoqui.free.fr/multipath-tools/${name}.tar.bz2";
url = "http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-${version}.tar.bz2";
sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d";
};

23
pkgs/tools/filesystems/nixpart/0.4/parted.nix
View file

@ -1,13 +1,22 @@
{ lib,stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
, util-linux, check
{ lib
, stdenv
, fetchurl
, fetchpatch
, lvm2
, libuuid
, gettext
, readline
, util-linux
, check
, enableStatic ? stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {
name = "parted-3.1";
pname = "parted";
version = "3.1";
src = fetchurl {
url = "mirror://gnu/parted/${name}.tar.xz";
url = "mirror://gnu/parted/parted-${version}.tar.xz";
sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y";
};
@ -26,9 +35,9 @@ stdenv.mkDerivation rec {
++ lib.optional (lvm2 != null) lvm2;
configureFlags =
(if (readline != null)
then [ "--with-readline" ]
else [ "--without-readline" ])
(if (readline != null)
then [ "--with-readline" ]
else [ "--without-readline" ])
++ lib.optional (lvm2 == null) "--disable-device-mapper"
++ lib.optional enableStatic "--enable-static";

9
pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
View file

@ -1,17 +1,18 @@
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }:
stdenv.mkDerivation rec {
name = "fcitx-configtool-0.4.10";
pname = "fcitx-configtool";
version = "0.4.10";
meta = with lib; {
description = "GTK-based config tool for Fcitx";
license = licenses.gpl2;
platforms = platforms.linux;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ cdepillabout ];
};
src = fetchurl {
url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz";
url = "https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-${version}.tar.xz";
sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w";
};

6
pkgs/tools/misc/chezmoi/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.7.3";
version = "2.7.4";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-xn9DSbAqfSK7CokxVRrHuOO62oSXKGR0/HZYadLLd74=";
sha256 = "sha256-RX9Hgjl/i/FWXHFp+yYWQEYDiOQijU+eiBnREu4K1Mg=";
};
vendorSha256 = "sha256-e+LsFlF83OGbhajaGGyWARv7O6dI6ZKm3yhDqrgmMpk=";
vendorSha256 = "sha256-tz3Vcw/p7BKcgc3EsLsSPOKhwqN5kysOcmER7OoKQ+w=";
doCheck = false;

8
pkgs/tools/misc/ckb-next/default.nix
View file

@ -1,5 +1,7 @@
{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev
, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu }:
{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev, stdenv
, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu
, withPulseaudio ? stdenv.isLinux, libpulseaudio
}:
mkDerivation rec {
version = "0.4.4";
@ -20,7 +22,7 @@ mkDerivation rec {
qttools
qtx11extras
libdbusmenu
];
] ++ lib.optional withPulseaudio libpulseaudio;
nativeBuildInputs = [
pkg-config

19
pkgs/tools/misc/tty-clock/default.nix
View file

@ -1,16 +1,27 @@
{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config }:
stdenv.mkDerivation rec {
pname = "tty-clock";
version = "2.3";
version = "2.3+unstable=2021-04-07";
src = fetchFromGitHub {
owner = "xorg62";
repo = "tty-clock";
rev = "v${version}";
sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp";
# Use unreleased version to pull in fix for ncurses-6.3
rev = "9e00c32098524c30dac4dab701f7e33f8bc7c880";
sha256 = "14jrzz06jr29887bxgad1x6kd26c2fnqrc26864wqm3838fpcqw0";
};
patches = [
# Pull upstream patch pending inclusion fir more ncurses-6.3 fixes:
# https://github.com/xorg62/tty-clock/pull/100
(fetchpatch {
name = "ncurses-6.2.patch";
url = "https://github.com/xorg62/tty-clock/commit/4cfd73080da1964557484da620c401745d73881c.patch";
sha256 = "13pj1v6yrfc4vynsa746974kixfxxsy2jzzpl73c8bp7msr9d3md";
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ];

17
pkgs/tools/networking/easyrsa/2.x.nix
View file

@ -1,11 +1,18 @@
{ lib, stdenv, fetchurl, autoreconfHook, makeWrapper
, gnugrep, openssl }:
{ lib
, stdenv
, fetchurl
, autoreconfHook
, makeWrapper
, gnugrep
, openssl
}:
stdenv.mkDerivation {
name = "easyrsa-2.2.0";
stdenv.mkDerivation rec {
pname = "easyrsa";
version = "2.2.0";
src = fetchurl {
url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz";
url = "https://github.com/OpenVPN/easy-rsa/archive/v${version}.tar.gz";
sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk";
};

12
pkgs/tools/networking/nethogs/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }:
stdenv.mkDerivation rec {
pname = "nethogs";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9";
};
patches = [
# Pull upstream patch for ncurses-6.3 support:
# https://github.com/raboof/nethogs/pull/210
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/raboof/nethogs/commit/455daf357da7f394763e5b93b11b3defe1f82ed1.patch";
sha256 = "0wkp0yr6qg1asgvmsn7blf7rq48sh5k4n3w0nxf5869hxvkhnnzs";
})
];
buildInputs = [ ncurses libpcap ];
makeFlags = [ "VERSION=${version}" "nethogs" ];

5
pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
stdenv.mkDerivation {
name = "openvpn-learnaddress-19b03c3";
pname = "openvpn-learnaddress";
version = "unstable-2013-10-21";
src = fetchgit {
url = "https://gist.github.com/4058733.git";

6
pkgs/tools/networking/openvpn/update-resolv-conf.nix
View file

@ -3,8 +3,10 @@
let
binPath = lib.makeBinPath [ coreutils openresolv systemd ];
in stdenv.mkDerivation {
name = "update-resolv-conf-2017-06-21";
in
stdenv.mkDerivation {
pname = "update-resolv-conf";
version = "unstable-2017-06-21";
src = fetchFromGitHub {
owner = "masterkorp";

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