cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into staging-next

Browse source 
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
This commit is contained in:
Jan Tojnar 2021-06-15 11:19:41 +02:00
commit 91171e2955
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
111 changed files with 1959 additions and 471 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
maintainers/maintainer-list.nix
View file

@ -2381,6 +2381,12 @@
github = "delan";
githubId = 465303;
};
deliciouslytyped = {
email = "47436522+deliciouslytyped@users.noreply.github.com";
github = "deliciouslytyped";
githubId = 47436522;
name = "deliciouslytyped";
};
delroth = {
email = "delroth@gmail.com";
github = "delroth";
@ -4281,6 +4287,12 @@
githubId = 3661115;
name = "Ingo Blechschmidt";
};
icy-thought = {
name = "Icy-Thought";
email = "gilganyx@pm.me";
github = "Icy-Thought";
githubId = 53710398;
};
idontgetoutmuch = {
email = "dominic@steinitz.org";
github = "idontgetoutmuch";
@ -7211,6 +7223,12 @@
githubId = 818502;
name = "Nathan Yong";
};
natto1784 = {
email = "natto@weirdnatto.in";
github = "natto1784";
githubId = 56316606;
name = "Amneesh Singh";
};
nbren12 = {
email = "nbren12@gmail.com";
github = "nbren12";
@ -11709,6 +11727,16 @@
github = "pulsation";
githubId = 1838397;
};
princemachiavelli = {
name = "Josh Hoffer";
email = "jhoffer@sansorgan.es";
github = "princemachiavelli";
githubId = 2730968;
keys = [{
longkeyid = "ed25519/0x83124F97A318EA18";
fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18";
}];
};
ydlr = {
name = "ydlr";
email = "ydlr@ydlr.io";

74
nixos/modules/services/audio/roon-bridge.nix Normal file
View file

@ -0,0 +1,74 @@
{ config, lib, pkgs, ... }:
with lib;
let
name = "roon-bridge";
cfg = config.services.roon-bridge;
in {
options = {
services.roon-bridge = {
enable = mkEnableOption "Roon Bridge";
openFirewall = mkOption {
type = types.bool;
default = false;
description = ''
Open ports in the firewall for the bridge.
UDP: 9003
TCP: 9100 - 9200
'';
};
user = mkOption {
type = types.str;
default = "roon-bridge";
description = ''
User to run the Roon bridge as.
'';
};
group = mkOption {
type = types.str;
default = "roon-bridge";
description = ''
Group to run the Roon Bridge as.
'';
};
};
};
config = mkIf cfg.enable {
systemd.services.roon-bridge = {
after = [ "network.target" ];
description = "Roon Bridge";
wantedBy = [ "multi-user.target" ];
environment.ROON_DATAROOT = "/var/lib/${name}";
serviceConfig = {
ExecStart = "${pkgs.roon-bridge}/start.sh";
LimitNOFILE = 8192;
User = cfg.user;
Group = cfg.group;
StateDirectory = name;
};
};
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPortRanges = [
{ from = 9100; to = 9200; }
];
allowedUDPPorts = [ 9003 ];
};
users.groups.${cfg.group} = {};
users.users.${cfg.user} =
if cfg.user == "roon-bridge" then {
isSystemUser = true;
description = "Roon Bridge user";
group = cfg.group;
extraGroups = [ "audio" ];
}
else {};
};
}

10
nixos/modules/services/hardware/auto-cpufreq.nix
View file

@ -12,7 +12,13 @@ in {
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.auto-cpufreq ];
systemd.packages = [ pkgs.auto-cpufreq ];
systemd.services.auto-cpufreq.path = with pkgs; [ bash coreutils ];
systemd = {
packages = [ pkgs.auto-cpufreq ];
services.auto-cpufreq = {
# Workaround for https://github.com/NixOS/nixpkgs/issues/81138
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ bash coreutils ];
};
};
};
}

30
pkgs/applications/audio/gbsplay/default.nix
View file

@ -1,28 +1,32 @@
{ lib, stdenv, fetchFromGitHub, libpulseaudio }:
{ lib, stdenv, fetchFromGitHub, installShellFiles, libpulseaudio, nas }:
stdenv.mkDerivation {
name = "gbsplay-2016-12-17";
stdenv.mkDerivation rec {
pname = "gbsplay";
version = "0.0.94";
src = fetchFromGitHub {
owner = "mmitch";
repo = "gbsplay";
rev = "2c4486e17fd4f4cdea8c3fd79ae898c892616b70";
sha256 = "1214j67sr87zfhvym41cw2g823fmqh4hr451r7y1s9ql3jpjqhpz";
rev = version;
sha256 = "VpaXbjotmc/Ref1geiKkBX9UhbPxfAGkFAdKVxP8Uxo=";
};
buildInputs = [ libpulseaudio ];
configureFlags = [
"--without-test" # See mmitch/gbsplay#62
"--without-contrib"
];
configureFlags =
[ "--without-test" "--without-contrib" "--disable-devdsp"
"--enable-pulse" "--disable-alsa" "--disable-midi"
"--disable-nas" "--disable-dsound" "--disable-i18n" ];
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ libpulseaudio nas ];
makeFlags = [ "tests=" ];
postInstall = ''
installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion
'';
meta = with lib; {
description = "gameboy sound player";
description = "Gameboy sound player";
license = licenses.gpl1;
platforms = ["i686-linux" "x86_64-linux"];
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with maintainers; [ dasuxullebt ];
};
}

9
pkgs/applications/audio/reaper/default.nix
View file

@ -17,11 +17,12 @@
stdenv.mkDerivation rec {
pname = "reaper";
version = "6.28";
version = "6.29";
src = fetchurl {
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
hash = "sha256-38HSjR+rQWPzMOjq1abLn/MP3DCz5YzBg0v2kBsQmR4=";
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.targetPlatform.qemuArch}.tar.xz";
hash = if stdenv.isx86_64 then "sha256-DOul6J2Y7szy4+Q4SeO0uG6PSuU+MELE7ky8W3mSpTQ="
else "sha256-67iTi6bFlbQtyCjnPIjK8K/3aV+zaCsWBRCWmgYonM4=";
};
nativeBuildInputs = [
@ -74,7 +75,7 @@ stdenv.mkDerivation rec {
description = "Digital audio workstation";
homepage = "https://www.reaper.fm/";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ jfrankenau ilian ];
};
}

27
pkgs/applications/misc/anup/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib, rustPlatform, fetchFromGitHub, sqlite, xdg-utils}:
rustPlatform.buildRustPackage rec {
pname = "anup";
version = "0.4.0";
src = fetchFromGitHub {
owner = "Acizza";
repo = "anup";
rev = version;
sha256 = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA=";
};
buildInputs = [
sqlite
xdg-utils
];
cargoSha256 = "sha256-1TA2HDHKA3twFtlAWaC2zcRzS8TJwcbBt1OTQ3hC3qM=";
meta = with lib; {
homepage = "https://github.com/Acizza/anup";
description = "An anime tracker for AniList featuring a TUI";
license = licenses.agpl3Only;
maintainers = with maintainers; [ natto1784 ];
};
}

4
pkgs/applications/misc/cheat/default.nix
View file

@ -3,13 +3,13 @@
buildGoModule rec {
pname = "cheat";
version = "4.2.1";
version = "4.2.2";
src = fetchFromGitHub {
owner = "cheat";
repo = "cheat";
rev = version;
sha256 = "sha256-wH0MTTwUmi/QZXo3vWgRYmlPxMxgfhghrTIZAwdVjQ0=";
sha256 = "sha256-YKGCZm0BaFLi+kujl04B4IU1qay15XNfvelxfUkCP8o=";
};
subPackages = [ "cmd/cheat" ];

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

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, wrapGAppsHook, python3Packages }:
{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "skytemple";
@ -11,7 +11,15 @@ python3Packages.buildPythonApplication rec {
sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9";
};
buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];
buildInputs = [
gobject-introspection
gtk3
gtksourceview3
# webkitgkt is used for rendering interactive statistics graph which
# can be seen by opening a ROM, entering Pokemon section, selecting
# any Pokemon, and clicking Stats and Moves tab.
webkitgtk
];
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
propagatedBuildInputs = with python3Packages; [
natsort

10
pkgs/applications/misc/subsurface/default.nix
View file

@ -5,13 +5,13 @@
}:
let
version = "4.9.10";
version = "5.0.1";
subsurfaceSrc = (fetchFromGitHub {
owner = "Subsurface";
repo = "subsurface";
rev = "v${version}";
sha256 = "12ndhjplz3cwndwzhfc959dc0i6rm2qf3v2d8n9kba8nj63iblfs";
sha256 = "01r836ckvrmgprjf4cqxn2n3w5w4pa2fjrhspjndsspic8nwlrwg";
fetchSubmodules = true;
});
@ -40,13 +40,13 @@ let
googlemaps = stdenv.mkDerivation rec {
pname = "googlemaps";
version = "2018-06-02";
version = "2021-03-19";
src = fetchFromGitHub {
owner = "vladest";
repo = "googlemaps";
rev = "54a357f9590d9cf011bf1713589f66bad65e00eb";
sha256 = "159kslp6rj0qznzxijppwvv8jnswlfgf2pw4x8ladi8vp6bzxnzi";
rev = "8f7def10c203fd3faa5ef96c5010a7294dca0759";
sha256 = "1irz398g45hk6xizwzd07qcx1ln8f7l6bhjh15f56yc20waqpx1x";
};
nativeBuildInputs = [ qmake ];

6
pkgs/applications/networking/cluster/helmfile/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmfile";
version = "0.139.7";
version = "0.139.8";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "sha256-mxnl5ALave2E61AqJAHlLHDLHOwA2wwjs3sb4WnG82A=";
sha256 = "sha256-4QNtjVc2/diJO92xn4J2ZJO7JYDHmPgOE4kGndU5RW0=";
};
vendorSha256 = "sha256-tdsQx2AvbRC8l7YZFBg2xVqo0CLrOOwA9Nmuei+1ozw=";
vendorSha256 = "sha256-GY2+oecRbI5hEVI5lCsTuU3WYIfUGceINyXGPjorisE=";
doCheck = false;

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kube3d";
version = "4.4.4";
version = "4.4.5";
src = fetchFromGitHub {
owner = "rancher";
repo = "k3d";
rev = "v${version}";
sha256 = "sha256-pfyU25MASKQMwd49IbNyyEiz3gmSOBmLdWtIKhYU2wg=";
sha256 = "sha256-nT/17R1Gky9509U077tgwS7iQKRMJUk8rwQiHSHcP+s=";
};
vendorSha256 = null;

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tanka";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aCgr56nXZCkG8k/ZGH2/cDOaqkznnyb6JLEcImqLH64=";
sha256 = "sha256-KvQIVJZD/VvLE5RocWLRVGbb8faLY2cBeFSE/6E7x50=";
};
vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw=";

5
pkgs/applications/networking/instant-messengers/teams/default.nix
View file

@ -12,7 +12,8 @@
, coreutils
, gawk
, xdg-utils
, systemd }:
, systemd
, enableRectOverlay ? false }:
stdenv.mkDerivation rec {
pname = "teams";
@ -57,9 +58,11 @@ stdenv.mkDerivation rec {
ln -s $out/opt/teams/teams $out/bin/
${lib.optionalString (!enableRectOverlay) ''
# Work-around screen sharing bug
# https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html
rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay
''}
runHook postInstall
'';

33
pkgs/applications/networking/mailreaders/electron-mail/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ appimageTools, lib, fetchurl }:
let
pname = "electron-mail";
version = "4.12.2";
name = "ElectronMail-${version}";
src = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
sha256 = "D+0qoIb0EwUVbgKOiKQpqoLDgm8l/UKDWm/BjhW4MYU=";
};
appimageContents = appimageTools.extract { inherit name src; };
in appimageTools.wrapType2 {
inherit name src;
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail";
homepage = "https://github.com/vladimiry/ElectronMail";
license = licenses.mit;
maintainers = [ maintainers.princemachiavelli ];
platforms = [ "x86_64-linux" ];
};
}

28
pkgs/applications/networking/sync/onedrive/default.nix
View file

@ -1,22 +1,34 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkg-config
, curl, sqlite, libnotify
, withSystemd ? stdenv.isLinux, systemd ? null }:
{ stdenv
, lib
, fetchFromGitHub
, autoreconfHook
, ldc
, installShellFiles
, pkg-config
, curl
, sqlite
, libnotify
, withSystemd ? stdenv.isLinux
, systemd
}:
stdenv.mkDerivation rec {
pname = "onedrive";
version = "2.4.11";
version = "2.4.12";
src = fetchFromGitHub {
owner = "abraunegg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ioOrkhVeHHqIjoEXcYo8ATJW+2+nZOehf3XbAJUEXpY=";
sha256 = "sha256-rG9W90+wGLnhnfhqJjUIFGP6ZcmaxGkrdhPxQVRyxoc=";
};
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];
buildInputs = [
curl sqlite libnotify
curl
sqlite
libnotify
] ++ lib.optional withSystemd systemd;
configureFlags = [
@ -36,8 +48,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A complete tool to interact with OneDrive on Linux";
homepage = "https://github.com/abraunegg/onedrive";
license = licenses.gpl3;
maintainers = with maintainers; [ srgom ianmjones ];
license = licenses.gpl3Only;
maintainers = with maintainers; [ srgom peterhoeg ];
platforms = platforms.linux;
};
}

4
pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost169, flatbuffers, fmt, rapidjson, spdlog, zlib }:
{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }:
stdenv.mkDerivation rec {
pname = "vowpal-wabbit";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
boost169
boost
flatbuffers
fmt
rapidjson

4
pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gitstatus";
version = "1.4.4";
version = "1.5.1";
src = fetchFromGitHub {
owner = "romkatv";
repo = "gitstatus";
rev = "v${version}";
sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs";
sha256 = "1ffgh5826985phc8amvzl9iydvsnij5brh4gczfh201vfmw9d4hh";
};
buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];

6
pkgs/applications/virtualization/docker/default.nix
View file

@ -11,7 +11,7 @@ rec {
, tiniRev, tiniSha256, buildxSupport ? false
# package dependencies
, stdenv, fetchFromGitHub, buildGoPackage
, makeWrapper, installShellFiles, pkg-config
, makeWrapper, installShellFiles, pkg-config, glibc
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute2, lvm2, systemd, docker-buildx
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
@ -56,7 +56,9 @@ rec {
};
# Do not remove static from make files as we want a static binary
patchPhase = "";
postPatch = "";
buildInputs = [ glibc glibc.static ];
NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
});

5
pkgs/applications/virtualization/tini/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, glibc }:
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
version = "0.19.0";
@ -11,12 +11,11 @@ stdenv.mkDerivation rec {
sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4";
};
patchPhase = "sed -i /tini-static/d CMakeLists.txt";
postPatch = "sed -i /tini-static/d CMakeLists.txt";
NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37";
nativeBuildInputs = [ cmake ];
buildInputs = [ glibc glibc.static ];
meta = with lib; {
description = "A tiny but valid init for containers";

16
pkgs/data/fonts/google-fonts/default.nix
View file

@ -1,22 +1,18 @@
{ lib
, stdenv
, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "google-fonts";
version = "unstable-2021-01-19";
version = "unstable-2021-06-12";
outputs = [ "out" "adobeBlank" ];
src = fetchFromGitHub {
owner = "google";
repo = "fonts";
rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d";
sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix";
rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc";
sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM=";
};
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
patchPhase = ''
# These directories need to be removed because they contain
# older or duplicate versions of fonts also present in other
@ -33,6 +29,8 @@ stdenv.mkDerivation {
fi
'';
dontBuild = true;
installPhase = ''
adobeBlankDest=$adobeBlank/share/fonts/truetype
install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf

4
pkgs/data/fonts/ricty/default.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "4.1.1";
src = fetchurl {
url = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty/ricty_generator-${version}.sh";
url = "https://rictyfonts.github.io/files/ricty_generator-${version}.sh";
sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6";
};
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A high-quality Japanese font based on Inconsolata and Migu 1M";
homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html";
homepage = "https://rictyfonts.github.io";
license = licenses.unfree;
maintainers = [ maintainers.mikoim ];
};

4
pkgs/data/icons/kora-icon-theme/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kora-icon-theme";
version = "1.4.2";
version = "1.4.3";
src = fetchFromGitHub {
owner = "bikass";
repo = "kora";
rev = "v${version}";
sha256 = "1qnqz0h2c5kilch3308l8nfshgsrkllyysvqn0mxy70iziw895rv";
sha256 = "sha256-tSkTwhhugvDTzzcxIln1xq3ZY6boHJR0LRGy20ONO5U=";
};
nativeBuildInputs = [

63
pkgs/data/icons/whitesur-icon-theme/default.nix Normal file
View file

@ -0,0 +1,63 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, gtk3
, gnome
, gnome-icon-theme
, hicolor-icon-theme
}:
stdenvNoCC.mkDerivation rec {
pname = "Whitesur-icon-theme";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "KboUYozTleOBKNun66g2oj7u/36hyQsPtRSk/x/LAWo=";
};
nativeBuildInputs = [ gtk3 ];
buildInputs = [
gnome-icon-theme
gnome.adwaita-icon-theme
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons/WhiteSur{,-dark}/status
echo "$out/share/icons/WhiteSur/status $out/share/icons/WhiteSur-dark/status" | xargs -n 1 cp -r src/status/{16,22,24,32,symbolic}
echo "$out/share/icons/WhiteSur $out/share/icons/WhiteSur-dark" | xargs -n 1 cp -r ./{COPYING,AUTHORS} src/index.theme src/{actions,animations,apps,categories,devices,emblems,mimes,places} links/{actions,apps,categories,devices,emblems,mimes,places,status}
# Change icon color for dark theme
sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,devices,places,status}/{16,22,24}/*
sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/actions/32/*
sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/*
for f in actions animations apps categories devices emblems mimes places status; do
ln -sf $out/share/icons/WhiteSur/$f $out/share/icons/WhiteSur/$f@2x
ln -sf $out/share/icons/WhiteSur-dark/$f $out/share/icons/WhiteSur-dark/$f@2x
done
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
runHook postInstall
'';
meta = with lib; {
description = "MacOS Big Sur style icon theme for Linux desktops";
homepage = "https://github.com/vinceliuice/WhiteSur-icon-theme";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ icy-thought ];
};
}

4
pkgs/desktops/cinnamon/bulky/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "bulky";
version = "1.1";
version = "1.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "bulky";
rev = version;
sha256 = "NBlP10IM/+u8IRds4bdFyGWg3pJLRmlSLsdlndMVQqg=";
sha256 = "sha256-jBGrfE8jYQStIs9h/b/1yBu8OEQdPOMHZ/U/KczfX+4=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome/games/aisleriot/default.nix
View file

@ -19,14 +19,14 @@
stdenv.mkDerivation rec {
pname = "aisleriot";
version = "3.22.16";
version = "3.22.17";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = version;
sha256 = "0arjnm5kgnb4pir53hlm94iym80d0srs256sm2hwhwwc5fr1w79i";
sha256 = "sha256-14z/EdEz1XFDrQZlpoeHW73G187XuZX/uQXp+bAUsmI=";
};
nativeBuildInputs = [

31
pkgs/development/compilers/armips/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "armips";
version = "0.11.0";
src = fetchFromGitHub {
owner = "Kingcom";
repo = "armips";
rev = "v${version}";
sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA=";
};
nativeBuildInputs = [ cmake ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp armips $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/Kingcom/armips";
description = "Assembler for various ARM and MIPS platforms.";
license = licenses.mit;
maintainers = with maintainers; [ marius851000 ];
};
}

125
pkgs/development/compilers/compcert/default.nix
View file

@ -1,125 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper
, coqPackages, ocamlPackages, coq2html
, tools ? stdenv.cc
, version ? "3.9"
}:
let
ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir menhirLib ];
ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux";
inherit (coqPackages) coq flocq;
inherit (lib) optional optionalString;
in
let param = {
"3.7" = {
sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr";
patches = [
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/0a2db0269809539ccc66f8ec73637c37fbd23580.patch";
sha256 = "0n8qrba70x8f422jdvq9ddgsx6avf2dkg892g4ldh3jiiidyhspy";
})
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/5e29f8b5ba9582ecf2a1d0baeaef195873640607.patch";
sha256 = "184nfdgxrkci880lkaj5pgnify3plka7xfgqrgv16275sqppc5hc";
})
];
};
"3.8" = {
sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7";
patches = [
# Support for Coq 8.12.2
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch";
sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl";
})
# Support for Coq 8.13.0
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch";
sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd";
})
# Support for Coq 8.13.1
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch";
sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5";
})
# Drop support for Coq < 8.9
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch";
sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb";
})
# Support for Coq 8.13.2
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch";
sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1";
})
];
useExternalFlocq = true;
};
"3.9" = {
sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb";
useExternalFlocq = true;
};
}."${version}"; in
stdenv.mkDerivation rec {
pname = "compcert";
inherit version;
src = fetchFromGitHub {
owner = "AbsInt";
repo = "CompCert";
rev = "v${version}";
inherit (param) sha256;
};
patches = param.patches or [];
nativeBuildInputs = [ makeWrapper ];
buildInputs = ocaml-pkgs ++ [ coq coq2html ];
propagatedBuildInputs = optional (param.useExternalFlocq or false) flocq;
enableParallelBuilding = true;
postPatch = ''
substituteInPlace ./configure \
--replace \$\{toolprefix\}ar 'ar' \
--replace '{toolprefix}gcc' '{toolprefix}cc'
'';
configurePhase = ''
./configure -clightgen \
-prefix $out \
-coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \
-toolprefix ${tools}/bin/ \
${optionalString (param.useExternalFlocq or false) "-use-external-Flocq"} \
${ccomp-platform}
'';
installTargets = "documentation install";
postInstall = ''
# move man into place
mkdir -p $man/share
mv $out/share/man/ $man/share/
# move docs into place
mkdir -p $doc/share/doc/compcert
mv doc/html $doc/share/doc/compcert/
# wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets
# _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should),
# which causes a warning in libc. this suppresses it.
for x in ccomp clightgen; do
wrapProgram $out/bin/$x --add-flags "-U_FORTIFY_SOURCE"
done
'';
outputs = [ "out" "lib" "doc" "man" ];
meta = with lib; {
description = "Formally verified C compiler";
homepage = "https://compcert.org";
license = licenses.inria-compcert;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ];
};
}

5
pkgs/development/compilers/llvm/git/libcxx/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, llvm_meta, src, cmake, python3, libcxxabi, fixDarwinDylibNames, version
{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version
, enableShared ? !stdenv.hostPlatform.isStatic
}:
@ -24,10 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libcxxabi ];
cmakeFlags = [
"-DLIBCXX_CXX_ABI=libcxxabi"
] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
++ lib.optional stdenv.hostPlatform.isWasm [

91
pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch
View file

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bf1a02f0908..612cd4aab76c 100644
index 06ee1d74a03e..6c3c6f8f8d47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")
@ -9,92 +9,73 @@ index 9bf1a02f0908..612cd4aab76c 100644
+ include(GNUInstallDirs)
+
set(PACKAGE_NAME libcxx)
set(PACKAGE_VERSION 12.0.0)
set(PACKAGE_VERSION 13.0.0git)
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
@@ -402,7 +404,7 @@ endif ()
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)
set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR})
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)
+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)
@@ -409,7 +411,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1")
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1")
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE})
+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE})
set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1")
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1")
if(LIBCXX_LIBDIR_SUBDIR)
string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR})
string(APPEND LIBCXX_INSTALL_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR})
@@ -410,11 +412,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
@@ -420,14 +422,14 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR})
set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1")
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}")
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX})
+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX})
set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1")
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}")
else()
set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX})
set(LIBCXX_HEADER_DIR ${CMAKE_BINARY_DIR})
set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1")
set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}")
- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX})
+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX})
set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1")
set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}")
endif()
file(MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR}")
diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake
index 5d2764e870e9..bb1ec5de6ca2 100644
index 5a8a4a270a1a..c06bae0001aa 100644
--- a/cmake/Modules/HandleLibCXXABI.cmake
+++ b/cmake/Modules/HandleLibCXXABI.cmake
@@ -63,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs)
if (LIBCXX_INSTALL_HEADERS)
install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}"
- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir}
+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}
- DESTINATION include/c++/v1/${dstdir}
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}
COMPONENT cxx-headers
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 29a317b8ae9a..4747263cfd1b 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -252,7 +252,7 @@ if (LIBCXX_INSTALL_HEADERS)
foreach(file ${files})
get_filename_component(dir ${file} DIRECTORY)
install(FILES ${file}
- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir}
+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir}
COMPONENT cxx-headers
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
@@ -260,7 +260,7 @@ if (LIBCXX_INSTALL_HEADERS)
# Install the generated header as __config.
install(FILES ${LIBCXX_BINARY_DIR}/__generated_config
- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1
+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
RENAME __config
COMPONENT cxx-headers)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9965104cb5b2..9b55dbb1d822 100644
index 87b71f7ba334..d20a783079b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -352,21 +352,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY)
@@ -369,21 +369,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY)
install(TARGETS cxx_shared
ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx)
+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx)
ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
- RUNTIME DESTINATION bin COMPONENT cxx)
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx)
endif()
if (LIBCXX_INSTALL_STATIC_LIBRARY)
install(TARGETS cxx_static
ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx)
+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx)
ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
- RUNTIME DESTINATION bin COMPONENT cxx)
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx)
endif()
if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY)
install(TARGETS cxx_experimental
LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx)
+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx)
LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
- RUNTIME DESTINATION bin COMPONENT cxx)
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx)
endif()
# NOTE: This install command must go after the cxx install command otherwise

5
pkgs/development/compilers/llvm/git/libcxxabi/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version
, enableShared ? !stdenv.hostPlatform.isStatic
, libcxx
}:
stdenv.mkDerivation rec {
@ -26,7 +27,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 ];
buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
cmakeFlags = [
"-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1"
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals stdenv.hostPlatform.isWasm [

20
pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch
View file

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 426c855288fc..a9812a994f53 100644
index 1e8b73aa38cc..6f7b2a25d205 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH
@ -9,26 +9,28 @@ index 426c855288fc..a9812a994f53 100644
+ include(GNUInstallDirs)
+
set(PACKAGE_NAME libcxxabi)
set(PACKAGE_VERSION 11.0.0)
set(PACKAGE_VERSION 11.0.0git)
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
@@ -180,17 +182,17 @@ set(CMAKE_MODULE_PATH
@@ -196,7 +198,7 @@ set(CMAKE_MODULE_PATH
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)
set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE})
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE})
if(LIBCXX_LIBDIR_SUBDIR)
string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR})
string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR})
endif()
@@ -204,11 +206,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX})
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX})
else()
set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR})
set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX})
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX})
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX})
endif()
set(LIBCXXABI_INSTALL_PREFIX "" CACHE STRING "Define libc++abi destination prefix.")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR})

9
pkgs/development/compilers/zig/default.nix
View file

@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
export HOME=$TMPDIR;
'';
doCheck = true;
checkPhase = ''
runHook preCheck
./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig
runHook postCheck
'';
meta = with lib; {
homepage = "https://ziglang.org/";
description =
@ -48,4 +55,4 @@ stdenv.mkDerivation rec {
broken = stdenv.isDarwin;
};
}
# TODO: checkPhase

2
pkgs/development/coq-modules/VST/default.nix
View file

@ -9,10 +9,8 @@ with lib; mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.12" "8.13"; out = "2.7.1"; }
{ case = "8.11"; out = "2.6"; }
] null;
release."2.7.1".sha256 = "1674j7bkvihiv19vizm99dp6gj3lryb00zx6a87jz214f3ydcvnj";
release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk";
releaseRev = v: "v${v}";
propagatedBuildInputs = [ compcert ];

109
pkgs/development/coq-modules/compcert/default.nix Normal file
View file

@ -0,0 +1,109 @@
{ lib, fetchzip, mkCoqDerivation, coq, flocq, compcert
, ocamlPackages, fetchpatch, makeWrapper, coq2html
, stdenv, tools ? stdenv.cc
, version ? null
}:
with lib;
let compcert = mkCoqDerivation rec {
pname = "compcert";
owner = "AbsInt";
inherit version;
releaseRev = v: "v${v}";
defaultVersion = with versions; switch coq.version [
{ case = range "8.8" "8.13"; out = "3.8"; }
] null;
release = {
"3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7";
"3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ];
propagatedBuildInputs = [ flocq ];
enableParallelBuilding = true;
postPatch = ''
substituteInPlace ./configure \
--replace \$\{toolprefix\}ar 'ar' \
--replace '{toolprefix}gcc' '{toolprefix}cc'
'';
configurePhase = ''
./configure -clightgen \
-prefix $out \
-coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \
-toolprefix ${tools}/bin/ \
-use-external-Flocq \
${if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"}
'';
installTargets = "documentation install";
postInstall = ''
# move man into place
mkdir -p $man/share
mv $out/share/man/ $man/share/
# move docs into place
mkdir -p $doc/share/doc/compcert
mv doc/html $doc/share/doc/compcert/
# wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets
# _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should),
# which causes a warning in libc. this suppresses it.
for x in ccomp clightgen; do
wrapProgram $out/bin/$x --add-flags "-U_FORTIFY_SOURCE"
done
'';
outputs = [ "out" "lib" "doc" "man" ];
meta = with lib; {
description = "Formally verified C compiler";
homepage = "https://compcert.org";
license = licenses.inria-compcert;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ];
};
}; in
compcert.overrideAttrs (o:
{
patches = with versions; switch [ coq.version o.version ] [
{ cases = [ (range "8.12.2" "8.13.2") "3.8" ];
out = [
# Support for Coq 8.12.2
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch";
sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl";
})
# Support for Coq 8.13.0
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch";
sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd";
})
# Support for Coq 8.13.1
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch";
sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5";
})
# Drop support for Coq < 8.9
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch";
sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb";
})
# Support for Coq 8.13.2
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch";
sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1";
})
];
}
] [];
}
)

6
pkgs/development/interpreters/php/generic.nix
View file

@ -124,15 +124,15 @@ let
ln -s ${extraInit} $out/lib/php.ini
if test -e $out/bin/php; then
wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
wrapProgram $out/bin/php --prefix PHP_INI_SCAN_DIR : $out/lib
fi
if test -e $out/bin/php-fpm; then
wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
wrapProgram $out/bin/php-fpm --prefix PHP_INI_SCAN_DIR : $out/lib
fi
if test -e $out/bin/phpdbg; then
wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib
wrapProgram $out/bin/phpdbg --prefix PHP_INI_SCAN_DIR : $out/lib
fi
'';
};

4
pkgs/development/libraries/armadillo/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
version = "10.5.1";
version = "10.5.2";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "sha256-lq1uHLzyjz0cH/ly3ixA2t3b12gyVrrVAtPEY9L2TN8=";
sha256 = "sha256-Y/I87cVIpelASBblDPj4/MSSqxqtxsDO8wv8Kvzq2V8=";
};
nativeBuildInputs = [ cmake ];

27
pkgs/development/libraries/cglm/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "cglm";
version = "0.8.3";
src = fetchFromGitHub {
owner = "recp";
repo = "cglm";
rev = "v${version}";
sha256 = "0crzkxan3kivyah225md5c65zglg5c1cgrsmwhvp51hmrpmxss5v";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
homepage = "https://github.com/recp/cglm";
description = "Highly Optimized Graphics Math (glm) for C";
license = licenses.mit;
maintainers = [ maintainers.ivar ];
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/libquotient/default.nix
View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "libquotient";
version = "0.6.6";
version = "0.6.7";
src = fetchFromGitHub {
owner = "quotient-im";
repo = "libQuotient";
rev = version;
sha256 = "sha256-QSpkcQEDTMsFbQBa7dTuL/5HraVChUHqUuJdNMty/4s=";
sha256 = "sha256-fAzYv9OsanXqocEvbSB3OA9OVicwcZ0xT9uYbrFPEHc=";
};
buildInputs = [ qtbase qtmultimedia ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libusbmuxd";
version = "2.0.2";
version = "unstable-2021-02-06";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = version;
sha256 = "139pzsnixkck6ly1q6p0diqr0hgd0mx0pr4xx1jamm3f3656kpf9";
rev = "3eb50a07bad4c2222e76df93b23a0161922150d1";
sha256 = "sha256-pBPBgE6s8JYKJYEV8CcumNki+6jD5r7HzQ0nZ8yQLdM=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

5
pkgs/development/libraries/openssl/default.nix
View file

@ -54,7 +54,10 @@ let
outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
setOutputFlags = false;
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
separateDebugInfo =
!stdenv.hostPlatform.isDarwin &&
!(stdenv.hostPlatform.useLLVM or false) &&
stdenv.cc.isGNU;
nativeBuildInputs = [ perl ];
buildInputs = lib.optional withCryptodev cryptodev

8
pkgs/development/misc/newlib/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, buildPackages }:
let version = "3.3.0";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "newlib";
inherit version;
version = "4.1.0";
src = fetchurl {
url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
sha256 = "0ricyx792ig2cb2x31b653yb7w7f7mf2111dv5h96lfzmqz9xpaq";
sha256 = "0m01sjjyj0ib7bwlcrvmk1qkkgd66zf1dhbw716j490kymrf75pj";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

45
pkgs/development/python-modules/aio-geojson-client/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib
, aiohttp
, aresponses
, asynctest
, buildPythonPackage
, fetchFromGitHub
, geojson
, haversine
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aio-geojson-client";
version = "0.14";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-geojson-client";
rev = "v${version}";
sha256 = "1nk0mas71n1bn4wc7pcv279i1b5mxy9phyc8ppxlb16kbjnjj0h8";
};
propagatedBuildInputs = [
aiohttp
geojson
haversine
];
checkInputs = [
aresponses
asynctest
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "aio_geojson_client" ];
meta = with lib; {
description = "Python module for accessing GeoJSON feeds";
homepage = "https://github.com/exxamalte/python-aio-geojson-client";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

43
pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ lib
, aio-geojson-client
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pytz
}:
buildPythonPackage rec {
pname = "aio-geojson-geonetnz-quakes";
version = "0.12";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-geojson-geonetnz-quakes";
rev = "v${version}";
sha256 = "166gvcc1rzigb822k1373y18k54x5aklikr8sc7hyml5vz937xr7";
};
propagatedBuildInputs = [
aio-geojson-client
aiohttp
pytz
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ];
meta = with lib; {
description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds";
homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-quakes";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

45
pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib
, aio-geojson-client
, aiohttp
, aresponses
, asynctest
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pytz
}:
buildPythonPackage rec {
pname = "aio-geojson-geonetnz-volcano";
version = "0.5";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-geojson-geonetnz-volcano";
rev = "v${version}";
sha256 = "0x4i9gjwb2j788aw4j47bxin0d2ma3khssprq4ga3cjzx2qjwjvn";
};
propagatedBuildInputs = [
aio-geojson-client
aiohttp
pytz
];
checkInputs = [
aresponses
asynctest
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ];
meta = with lib; {
description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds";
homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

45
pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib
, aio-geojson-client
, aiohttp
, aresponses
, asynctest
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pytz
}:
buildPythonPackage rec {
pname = "aio-geojson-nsw-rfs-incidents";
version = "0.4";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-geojson-nsw-rfs-incidents";
rev = "v${version}";
sha256 = "sha256-o9tuoJ7VZ6bg0rYeRWClKxdbxxj6wPgkSF7ZdOfmJew=";
};
propagatedBuildInputs = [
aio-geojson-client
aiohttp
pytz
];
checkInputs = [
aresponses
asynctest
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ];
meta = with lib; {
description = "Python module for accessing the NSW Rural Fire Service incidents feeds";
homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

37
pkgs/development/python-modules/aiotractive/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, yarl
}:
buildPythonPackage rec {
pname = "aiotractive";
version = "0.5.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "zhulik";
repo = pname;
rev = "v${version}";
sha256 = "09zbca84dn1sprwqpfanmxxnmaknbzjz98xa87agpgy8xb3wpw7j";
};
propagatedBuildInputs = [
aiohttp
yarl
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "aiotractive" ];
meta = with lib; {
description = "Python client for the Tractive REST API";
homepage = "https://github.com/zhulik/aiotractive";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

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

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "androidtv";
version = "0.0.59";
version = "0.0.60";
# pypi does not contain tests, using github sources instead
src = fetchFromGitHub {
owner = "JeffLIrion";
repo = "python-androidtv";
rev = "v${version}";
sha256 = "sha256-QuKWOo+QMBpVJglwvaSMbKKYMN/MW31E7BgIMchESG8=";
sha256 = "sha256-GWCiRxZ6pHrcVkOKNGxSK8lUD0RohtED8czXIWUoVaM=";
};
propagatedBuildInputs = [ adb-shell pure-python-adb ]

46
pkgs/development/python-modules/async-lru/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, pytestCheckHook
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "async-lru";
version = "unstable-2020-10-24";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = "async-lru";
rev = "ae252508f9c5aecf9c02ddeb879d06c28dbffc42";
sha256 = "1gk5qzdvhl2j1mw7xzchbw7bcgk9mzhvqa62nwwmvlbnx88pkwnc";
};
postPatch = ''
sed -i '/^addopts/d' setup.cfg
'';
checkInputs = [
pytestCheckHook
pytest-asyncio
];
disabledTests = [
# https://github.com/aio-libs/async-lru/issues/341
"test_alru_cache_deco"
"test_alru_cache_fn_called"
"test_close"
];
pythonImportsCheck = [ "async_lru" ];
meta = with lib; {
description = "Simple lru cache for asyncio";
homepage = "https://github.com/wikibusiness/async_lru";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

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

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "click-threading";
version = "0.4.4";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7";
sha256 = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk=";
};
checkInputs = [ pytest ];

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

@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "codespell";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "codespell-project";
repo = "codespell";
rev = "v${version}";
sha256 = "187g26s3wzjmvdx9vjabbnajpbg0s9klixyv6baymmgz9lrcv4ln";
sha256 = "sha256-BhYVztSr2MalILEcOcvMl07CObYa73o3kW8S/idqAO8=";
};
checkInputs = [ aspell-python chardet pytestCheckHook pytest-cov pytest-dependency ];

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

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "configargparse";
version = "1.4";
version = "1.4.1";
src = fetchFromGitHub {
owner = "bw2";
repo = "ConfigArgParse";
rev = "v${version}";
sha256 = "0x6ar7d8qhr7gb1s8asbhqymg9jd635h7cyczqrbmvm8689zhj1d";
sha256 = "sha256-hzhjrdrXxjksvbHlTnQVsT350g0yuG1F21fElv6bLSA=";
};
checkInputs = [

7
pkgs/development/python-modules/fastjsonschema/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "fastjsonschema";
version = "2.14.5";
version = "2.15.1";
disabled = pythonOlder "3.3";
@ -17,19 +17,20 @@ buildPythonPackage rec {
repo = "python-fastjsonschema";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1hgzafswdw5zqrd8qhdxa43crzfy7lrlifdn90133a0h3psr7qs1";
sha256 = "sha256-ltxFJ3V5/bckusspQ5o0F4reMoB4KpYWPHF8ZNXGqVQ=";
};
checkInputs = [ pytestCheckHook ];
dontUseSetuptoolsCheck = true;
disabledTests = [
"benchmark"
# these tests require network access
"remote ref"
"definitions"
];
pythonImportsCheck = [ "fastjsonschema" ];
meta = with lib; {
description = "Fast JSON schema validator for Python.";
homepage = "https://horejsek.github.io/python-fastjsonschema/";

37
pkgs/development/python-modules/garminconnect-aio/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, aiohttp
, brotlipy
, buildPythonPackage
, fetchFromGitHub
, yarl
}:
buildPythonPackage rec {
pname = "garminconnect-aio";
version = "0.1.4";
src = fetchFromGitHub {
owner = "cyberjunky";
repo = "python-garminconnect-aio";
rev = version;
sha256 = "0s2gpy5hciv9akqqhxy0d2ywp6jp9mmdngx34q7fq3xn668kcrhr";
};
propagatedBuildInputs = [
aiohttp
brotlipy
yarl
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "garminconnect_aio" ];
meta = with lib; {
description = "Python module to interact with Garmin Connect";
homepage = "https://github.com/cyberjunky/python-garminconnect-aio";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

12
pkgs/development/python-modules/hass-nabucasa/default.nix
View file

@ -24,10 +24,6 @@ buildPythonPackage rec {
sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY=";
};
postPatch = ''
sed -i 's/"acme.*"/"acme"/' setup.py
'';
propagatedBuildInputs = [
acme
aiohttp
@ -44,11 +40,17 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
sed -i 's/"acme.*"/"acme"/' setup.py
substituteInPlace setup.py \
--replace "snitun==" "snitun>="
'';
pythonImportsCheck = [ "hass_nabucasa" ];
meta = with lib; {
homepage = "https://github.com/NabuCasa/hass-nabucasa";
description = "Home Assistant cloud integration by Nabu Casa, inc.";
description = "Python module for the Home Assistant cloud integration";
license = licenses.gpl3Only;
maintainers = with maintainers; [ Scriptkiddi ];
};

36
pkgs/development/python-modules/ms-cv/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, isPy27
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "ms-cv";
version = "0.1.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "OpenXbox";
repo = "ms_cv";
rev = "v${version}";
sha256 = "0pkna0kvmq1cp4rx3dnzxsvvlxxngryp77k42wkyw2phv19a2mjd";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
'';
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Correlation vector implementation in python";
homepage = "https://github.com/OpenXbox/ms_cv";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

50
pkgs/development/python-modules/nettigo-air-monitor/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ lib
, aiohttp
, aioresponses
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytest-error-for-skips
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "nettigo-air-monitor";
version = "0.2.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
sha256 = "0zs14g02m1ahyrhl2ihk74fp390g4672r1jjiaawmkxrvib07dvp";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aioresponses
pytest-asyncio
pytest-error-for-skips
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
substituteInPlace setup.cfg \
--replace "--cov --cov-report term-missing " ""
'';
pythonImportsCheck = [ "nettigo_air_monitor" ];
meta = with lib; {
description = "Python module to get air quality data from Nettigo Air Monitor devices";
homepage = "https://github.com/bieniu/nettigo-air-monitor";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

26
pkgs/development/python-modules/pyads/default.nix
View file

@ -1,25 +1,37 @@
{ adslib, buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, pytest
, pytestcov, pythonOlder }:
{ lib
, adslib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyads";
version = "3.2.2";
version = "3.3.7";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "stlehmann";
repo = pname;
rev = version;
sha256 = "1jd727pw0z73y4xhrykqkfcz1acrpy3rks58lr1y4yilfv11p6jb";
sha256 = "sha256-h3c6z+dmrOc1Q7E8YVJZJD2FsxoxqQX5J92SEweIpto=";
};
buildInputs = [ adslib ];
buildInputs = [
adslib
];
patchPhase = ''
substituteInPlace pyads/pyads_ex.py \
--replace "ctypes.CDLL(adslib)" "ctypes.CDLL(\"${adslib}/lib/adslib.so\")"
'';
checkInputs = [ pytestCheckHook pytest pytestcov ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "pyads" ];
meta = with lib; {
description = "Python wrapper for TwinCAT ADS library";

39
pkgs/development/python-modules/pyathena/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, sqlalchemy
, boto3
, botocore
, pandas
, tenacity
}:
buildPythonPackage rec {
pname = "pyathena";
version = "2.3.0";
src = fetchPypi {
pname = "PyAthena";
inherit version;
sha256 = "08fl653yayvqi991zvcai5ifcxwy9ip6xh0cr3lbimggjnjgwsl5";
};
# Nearly all tests depend on a working AWS Athena instance,
# therefore deactivating them.
# https://github.com/laughingman7743/PyAthena/#testing
doCheck = false;
propagatedBuildInputs = [
boto3
botocore
pandas
tenacity
];
meta = with lib; {
homepage = "https://github.com/laughingman7743/PyAthena/";
license = licenses.mit;
description = "Python DB API 2.0 (PEP 249) client for Amazon Athena";
maintainers = with maintainers; [ turion ];
};
}

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

@ -0,0 +1,43 @@
{ lib
, bleak
, buildPythonPackage
, click
, fetchFromGitHub
, pytest-asyncio
, pytest-mock
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pykulersky";
version = "0.5.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "emlove";
repo = pname;
rev = version;
sha256 = "1fzfixnl28rny7c3wr6gcdpqhyrz7z2aqq6qfwkxnkq2kqdbpmmg";
};
propagatedBuildInputs = [
bleak
click
];
checkInputs = [
pytest-asyncio
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [ "pykulersky" ];
meta = with lib; {
description = "Python module to control Brightech Kuler Sky Bluetooth LED devices";
homepage = "https://github.com/emlove/pykulersky";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

48
pkgs/development/python-modules/pyrogram/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, pyaes
, pysocks
, async-lru
, pytestCheckHook
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "pyrogram";
version = "1.2.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pyrogram";
repo = "pyrogram";
rev = "v${version}";
sha256 = "0clbnhk1icr4vl29693r6r28f5by5n6pjxjqih21g3yd64q55q3q";
};
propagatedBuildInputs = [
pyaes
pysocks
async-lru
];
checkInputs = [
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [
"pyrogram"
"pyrogram.errors"
"pyrogram.types"
];
meta = with lib; {
description = "Telegram MTProto API Client Library and Framework for Python";
homepage = "https://github.com/pyrogram/pyrogram";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

23
pkgs/development/python-modules/skytemple-files/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant }:
{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips, fetchpatch }:
buildPythonPackage rec {
pname = "skytemple-files";
@ -8,9 +8,26 @@ buildPythonPackage rec {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "1vklg4kcj3kb9ryrzrcmywn131b2bp3vy94cd4x4y4s7hkhgwg74";
sha256 = "sha256-/S0otBujwO/IMiLKgA2o8wlD6xk1/DpwOAfemojV9NU=";
fetchSubmodules = true;
};
patches = [
# fix patching https://github.com/SkyTemple/skytemple-files/pull/128
# merged, remove for next update
(fetchpatch {
url = "http://github.com/SkyTemple/skytemple-files/commit/71dd71e6abb7435405e30225e8a37592b990d692.patch";
sha256 = "sha256-CSBaT+LVP9J0C1FlUCduTJroq9z2EAJG6lruvlHlQLI=";
})
];
postPatch = ''
substituteInPlace skytemple_files/patch/arm_patcher.py \
--replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\""
'';
buildInputs = [ armips ];
propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ];
doCheck = false; # requires Pokémon Mystery Dungeon ROM
@ -20,6 +37,6 @@ buildPythonPackage rec {
homepage = "https://github.com/SkyTemple/skytemple-files";
description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ xfix ];
maintainers = with maintainers; [ xfix marius851000 ];
};
}

31
pkgs/development/python-modules/snitun/default.nix
View file

@ -1,21 +1,35 @@
{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub
, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook
{ lib
, stdenv
, async-timeout
, attrs
, buildPythonPackage
, cryptography
, fetchFromGitHub
, pytest-aiohttp
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "snitun";
version = "0.21.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "NabuCasa";
repo = pname;
rev = version;
sha256 = "sha256-oZHi/H9HOqGTFuhqPSZXntMzVJ3ZT4zNejezo0cDtqg=";
sha256 = "sha256-vx9F+Nat69Yadd+YpsnBCstnxCEICFJI14TdG6PvstI=";
};
propagatedBuildInputs = [ attrs cryptography async-timeout ];
propagatedBuildInputs = [
async-timeout
attrs
cryptography
];
checkInputs = [ pytestCheckHook pytest-aiohttp ];
checkInputs = [
pytest-aiohttp
pytestCheckHook
];
disabledTests = lib.optionals stdenv.isDarwin [
"test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61
@ -26,10 +40,13 @@ buildPythonPackage rec {
"test_peer_listener_timeout"
];
pythonImportsCheck = [ "snitun" ];
meta = with lib; {
homepage = "https://github.com/nabucasa/snitun";
description = "SNI proxy with TCP multiplexer";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ Scriptkiddi ];
platforms = platforms.linux;
};
}

10
pkgs/development/python-modules/staticjinja/default.nix
View file

@ -8,11 +8,13 @@
, pytestCheckHook
, pytest-check
, markdown
, testVersion
, staticjinja
}:
buildPythonPackage rec {
pname = "staticjinja";
version = "2.0.1";
version = "2.1.0";
format = "pyproject";
# No tests in pypi
@ -20,7 +22,7 @@ buildPythonPackage rec {
owner = "staticjinja";
repo = pname;
rev = version;
sha256 = "sha256-sGon3+So4EuVRTUqcP9omfJ91wBzJSm7CSkuefX3S+8=";
sha256 = "sha256-VKsDvWEurBdckWbPG5hQLK3dzdM7XVbrp23fR5wp1xk=";
};
nativeBuildInputs = [
@ -44,6 +46,10 @@ buildPythonPackage rec {
export PATH="$PATH:$out/bin";
'';
passthru.tests.version = testVersion {
package = staticjinja;
};
meta = with lib; {
description = "A library and cli tool that makes it easy to build static sites using Jinja2";
homepage = "https://staticjinja.readthedocs.io/en/latest/";

33
pkgs/development/python-modules/tgcrypto/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "tgcrypto";
version = "1.2.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pyrogram";
repo = "tgcrypto";
rev = "v${version}";
sha256 = "1vyjycjb2n790371kf47qc0mkvd4bxmhh65cfxjsrcjpiri7shjf";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "tgcrypto" ];
meta = with lib; {
description = "Fast and Portable Telegram Crypto Library for Python";
homepage = "https://github.com/pyrogram/tgcrypto";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

29
pkgs/development/python-modules/vdirsyncer/default.nix
View file

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, fetchpatch
, isPy27
, pythonOlder
, click
, click-log
, click-threading
@ -18,21 +18,23 @@
}:
buildPythonPackage rec {
version = "0.16.8";
version = "0.18.0";
pname = "vdirsyncer";
disabled = isPy27;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5";
sha256 = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE=";
};
propagatedBuildInputs = [
click click-log click-threading
requests_toolbelt
atomicwrites
click
click-log
click-threading
requests
requests_oauthlib # required for google oauth sync
atomicwrites
requests_toolbelt
];
nativeBuildInputs = [
@ -46,16 +48,8 @@ buildPythonPackage rec {
pytest-subtesthack
];
patches = [
(fetchpatch {
name = "update-usage-deprecated-method.patch";
url = "https://github.com/pimutils/vdirsyncer/commit/7577fa21177442aacc2d86640ef28cebf1c4aaef.patch";
sha256 = "0inkr1wfal20kssij8l5myhpjivxg8wlvhppqc3lvml9d1i75qbh";
})
];
postPatch = ''
substituteInPlace setup.py --replace "click>=5.0,<6.0" "click"
sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg
'';
preCheck = ''
@ -63,8 +57,9 @@ buildPythonPackage rec {
'';
disabledTests = [
"test_verbosity"
"test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837
"test_request_ssl"
"test_verbosity"
];
meta = with lib; {

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

@ -1,7 +1,9 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, buildPythonPackage
, libiconv
}:
let
pname = "wasmer";
@ -26,6 +28,8 @@ in buildPythonPackage rec {
nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
buildAndTestSubdir = "packages/api";
doCheck = false;

19
pkgs/development/python-modules/wled/default.nix
View file

@ -4,6 +4,7 @@
, fetchFromGitHub
, aiohttp
, backoff
, poetry-core
, packaging
, yarl
, aresponses
@ -13,16 +14,21 @@
buildPythonPackage rec {
pname = "wled";
version = "0.4.4";
disabled = pythonOlder "3.7";
version = "0.5.0";
disabled = pythonOlder "3.8";
format = "pyproject";
src = fetchFromGitHub {
owner = "frenck";
repo = "python-wled";
rev = "v${version}";
sha256 = "1adh23v4c9kia3ddqdq0brksd5rhgh4ff7l5hil8klx4dmkrjfz3";
sha256 = "123806fmdihdf9y8dqp5rli5c4i9a74j9rmhay8m68igm1326d5f";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
backoff
@ -36,6 +42,13 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
# Upstream doesn't set a version for the pyproject.toml
substituteInPlace pyproject.toml \
--replace "0.0.0" "${version}" \
--replace "--cov" ""
'';
pythonImportsCheck = [ "wled" ];
meta = with lib; {

53
pkgs/development/python-modules/xbox-webapi/default.nix Normal file
View file

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, aiohttp
, appdirs
, ecdsa
, ms-cv
, pydantic
, aresponses
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "xbox-webapi";
version = "2.0.11";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "OpenXbox";
repo = "xbox-webapi-python";
rev = "v${version}";
sha256 = "0li0bq914xizx9fj49s1iwfrv4bpzvl74bwsi5a34r9yizw02cvz";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
'';
propagatedBuildInputs = [
aiohttp
appdirs
ecdsa
ms-cv
pydantic
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
meta = with lib; {
description = "Library to authenticate with Windows Live/Xbox Live and use their API";
homepage = "https://github.com/OpenXbox/xbox-webapi-python";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

40
pkgs/development/tools/sentry-cli/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ rustPlatform
, fetchFromGitHub
, lib
, openssl
, file
, rpm
, pkg-config
, stdenv
, curl
, Security
, runCommand
}:
rustPlatform.buildRustPackage rec {
pname = "sentry-cli";
version = "1.66.0";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-cli";
rev = version;
sha256 = "sha256-ivQBn5GGb64Jq0gpywAg20309QQMpasg/Bu5sHKj02Y=";
};
doCheck = false;
# Needed to get openssl-sys to use pkgconfig.
OPENSSL_NO_VENDOR = 1;
buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-xS88KZWYkg3v8TJZUVVgQhR++CrZGD0DQnLPktSUJQk=";
meta = with lib; {
homepage = "https://docs.sentry.io/cli/";
license = licenses.bsd3;
description = "A command line utility to work with Sentry.";
maintainers = with maintainers; [ rizary ];
platforms = platforms.unix;
};
}

35
pkgs/development/tools/stylua/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ fetchFromGitHub
, lib
, rustPlatform
, stdenvNoCC
, lua52Support ? true
, luauSupport ? false
}:
rustPlatform.buildRustPackage rec {
pname = "stylua";
version = "0.8.1";
src = fetchFromGitHub {
owner = "johnnymorganz";
repo = pname;
rev = "v${version}";
sha256 = "0gjm9pvwfbwhd49pm5sw5plwhlhvbfkms44h67zgvy7xzqv8h3dw";
};
cargoSha256 = "117m78naldp6yvwcccvsrbnx6x6287cvq0saa06pmiqv1rqm50m3";
cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ]
++ lib.optionals luauSupport [ "--features" "luau" ];
# test_standard fails on darwin
doCheck = !stdenvNoCC.isDarwin;
meta = with lib; {
description = "An opinionated Lua code formatter";
homepage = "https://github.com/johnnymorganz/stylua";
changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = with maintainers; [ figsoda ];
};
}

4
pkgs/development/web/flyctl/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.222";
version = "0.0.223";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-yFcsbk5CAOqnT1ljOe+lGfEj1sCBsaFNZnfcQOfezs4=";
sha256 = "sha256-HDxFjEXQ33U2SiRz/e6vurZo710ibArdGLZcLoou17I=";
};
preBuild = ''

6
pkgs/games/rpg-cli/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rpg-cli";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "facundoolano";
repo = pname;
rev = version;
sha256 = "0rbj27zd7ydkvnyszd56hazj64aqqrwn34fsy4jymk50lvicwxjg";
sha256 = "07ar7almaz005jch7zm63kxyxvk3bphi2gl88xsb2rk5srkbb2s2";
};
cargoSha256 = "sha256-VftJgRqrFwTElp2/e+zQYZOLZPjbc9C8SZ4DlBEtRvQ=";
cargoSha256 = "sha256-wJPRI3jfV+v/XpIU9+j1jXlyfjkFCEHZdFJx/KMNT9o=";
# tests assume the authors macbook, and thus fail
doCheck = false;

9
pkgs/games/unvanquished/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchzip, fetchurl, fetchFromGitHub, buildFHSUserEnv
, runCommandNoCC, makeDesktopItem, copyDesktopItems, gcc, cmake, gmp
, libGL, zlib, ncurses, geoip, lua5, nettle, curl, SDL2, freetype, glew
, openal, libopus, opusfile, libogg, libvorbis, libjpeg, libwebp, libpng
{ lib, stdenv, fetchzip, fetchFromGitHub, buildFHSUserEnv, makeDesktopItem
, copyDesktopItems, gcc, cmake, gmp , libGL, zlib, ncurses, geoip, lua5
, nettle, curl, SDL2, freetype, glew , openal, libopus, opusfile, libogg
, libvorbis, libjpeg, libwebp, libpng
, cacert, aria2 # to download assets
}:
@ -127,6 +127,7 @@ in stdenv.mkDerivation rec {
"-DBUILD_SGAME=NO"
"-DUSE_HARDENING=TRUE"
"-DUSE_LTO=TRUE"
"-DOpenGL_GL_PREFERENCE=LEGACY" # https://github.com/DaemonEngine/Daemon/issues/474
];
desktopItems = [

29
pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ stdenv
, lib
, fetchzip
# can either be "EU" or "Global"; it's unclear what the difference is
, region ? "Global"
}:
stdenv.mkDerivation rec {
pname = "cups-kyocera-ecosys-m552x-p502x";
version = "8.1602";
src = fetchzip {
url = "https://www.kyoceradocumentsolutions.de/content/download-center/de/drivers/all/Linux_8_1602_ECOSYS_M5521_5526_P5021_5026_zip.download.zip";
sha256 = "sha256-XDH5deZmWNghfoO7JaYYvnVq++mbQ8RwLY57L2CKYaY=";
};
installPhase = ''
mkdir -p $out/share/cups/model/Kyocera
cp ${region}/English/*.PPD $out/share/cups/model/Kyocera/
'';
meta = with lib; {
description = "PPD files for Kyocera ECOSYS M5521cdn/M5521cdw/M5526cdn/M5526cdw/P5021cdn/P5021cdw/P5026cdn/P5026cdw";
homepage = "https://www.kyoceradocumentsolutions.com";
license = licenses.unfree;
maintainers = [ maintainers.mbrgm ];
platforms = platforms.linux;
};
}

2
pkgs/os-specific/darwin/mas/default.nix
View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
bsdtar -xf Payload~
'';
doBuild = false;
dontBuild = true;
installPhase = ''
mkdir -p $out

9
pkgs/os-specific/linux/kernel/linux-xanmod.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.12.8";
version = "5.12.10";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@ -12,16 +12,13 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-i3exBrEKyTHM2Iq8AJEIHwaw6KJarfcahlm/pPxAhmo=";
extraPostFetch = ''
rm $out/.config
'';
sha256 = "sha256-DxWkknL8kgFmdI+jb5chVnWCz6oDKOw6iuT69zDaDNs=";
};
extraMeta = {
branch = "5.12-cacule";
maintainers = with lib.maintainers; [ fortuneteller2k ];
description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
broken = stdenv.hostPlatform.isAarch64;
broken = stdenv.isAarch64;
};
} // (args.argsOverride or { }))

4
pkgs/servers/corosync/default.nix
View file

@ -10,11 +10,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "corosync";
version = "3.1.3";
version = "3.1.4";
src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz";
sha256 = "sha256-UlwF1DmWh52yJ4c9SbpaoVaV/L65r4dQ238M3/+Esps=";
sha256 = "sha256-sxoYlAi5RJCQcg0bSqO23t9nTkuuzOeLWPa/dLZZzuo=";
};
nativeBuildInputs = [ makeWrapper pkg-config ];

14
pkgs/servers/home-assistant/component-packages.nix
View file

@ -293,7 +293,7 @@
"futurenow" = ps: with ps; [ pyfnip ];
"garadget" = ps: with ps; [ ];
"garages_amsterdam" = ps: with ps; [ garages-amsterdam ];
"garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect_aio
"garmin_connect" = ps: with ps; [ garminconnect-aio ];
"gc100" = ps: with ps; [ ]; # missing inputs: python-gc100
"gdacs" = ps: with ps; [ aio-georss-gdacs ];
"generic" = ps: with ps; [ ];
@ -303,8 +303,8 @@
"geo_location" = ps: with ps; [ ];
"geo_rss_events" = ps: with ps; [ georss-generic-client ];
"geofency" = ps: with ps; [ aiohttp-cors ];
"geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes
"geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano
"geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes ];
"geonetnz_volcano" = ps: with ps; [ aio-geojson-geonetnz-volcano ];
"gios" = ps: with ps; [ gios ];
"github" = ps: with ps; [ PyGithub ];
"gitlab_ci" = ps: with ps; [ python-gitlab ];
@ -433,7 +433,7 @@
"konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected
"kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore
"kraken" = ps: with ps; [ ]; # missing inputs: krakenex pykrakenapi
"kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky
"kulersky" = ps: with ps; [ pykulersky ];
"kwb" = ps: with ps; [ ]; # missing inputs: pykwb
"lacrosse" = ps: with ps; [ pylacrosse ];
"lametric" = ps: with ps; [ ]; # missing inputs: lmnotify
@ -544,7 +544,7 @@
"mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ];
"mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns
"nad" = ps: with ps; [ nad-receiver ];
"nam" = ps: with ps; [ ]; # missing inputs: nettigo-air-monitor
"nam" = ps: with ps; [ nettigo-air-monitor ];
"namecheapdns" = ps: with ps; [ defusedxml ];
"nanoleaf" = ps: with ps; [ pynanoleaf ];
"neato" = ps: with ps; [ aiohttp-cors pybotvac ];
@ -576,7 +576,7 @@
"notify_events" = ps: with ps; [ ]; # missing inputs: notify-events
"notion" = ps: with ps; [ aionotion ];
"nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client
"nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents
"nsw_rural_fire_service_feed" = ps: with ps; [ aio-geojson-nsw-rfs-incidents ];
"nuheat" = ps: with ps; [ ]; # missing inputs: nuheat
"nuki" = ps: with ps; [ pynuki ];
"numato" = ps: with ps; [ ]; # missing inputs: numato-gpio
@ -967,7 +967,7 @@
"wunderground" = ps: with ps; [ ];
"x10" = ps: with ps; [ ];
"xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper
"xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi
"xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ];
"xbox_live" = ps: with ps; [ xboxapi ];
"xeoma" = ps: with ps; [ pyxeoma ];
"xiaomi" = ps: with ps; [ ha-ffmpeg ];

8
pkgs/servers/home-assistant/default.nix
View file

@ -387,11 +387,15 @@ in with py.pkgs; buildPythonApplication rec {
"fritzbox"
"fritzbox_callmonitor"
"frontend"
"garmin_connect"
"generic"
"generic_thermostat"
"geo_json_events"
"geo_location"
"geo_rss_events"
"geofency"
"geonetnz_quakes"
"geonetnz_volcano"
"glances"
"gios"
"gogogate2"
@ -450,6 +454,7 @@ in with py.pkgs; buildPythonApplication rec {
"kmtronic"
"knx"
"kodi"
"kulersky"
"lastfm"
"lcn"
"light"
@ -498,6 +503,7 @@ in with py.pkgs; buildPythonApplication rec {
"my"
"myq"
"mysensors"
"nam"
"namecheapdns"
"neato"
"netatmo"
@ -505,6 +511,7 @@ in with py.pkgs; buildPythonApplication rec {
"no_ip"
"notify"
"notion"
"nsw_rural_fire_service_feed"
"nuki"
"number"
"nws"
@ -673,6 +680,7 @@ in with py.pkgs; buildPythonApplication rec {
"worldclock"
"wsdot"
"wunderground"
"xbox"
"xiaomi"
"xiaomi_aqara"
"xiaomi_miio"

4
pkgs/servers/monitoring/alertmanager-irc-relay/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "alertmanager-irc-relay";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "google";
repo = "alertmanager-irc-relay";
rev = "v${version}";
sha256 = "sha256-02uEvcxT5+0OJtqOyuQjgkqL0fZnN7umCSxBqAVPT9U=";
sha256 = "sha256-/gZeIJN7xkDe7f+Q7zh16KG6RC+G/9MIPm3KQManVZ0=";
};
vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4=";

66
pkgs/servers/roon-bridge/default.nix Normal file
View file

@ -0,0 +1,66 @@
{ alsa-lib
, alsa-utils
, autoPatchelfHook
, fetchurl
, lib
, makeWrapper
, stdenv
, zlib
}:
stdenv.mkDerivation rec {
pname = "roon-bridge";
version = "1.8-795";
# N.B. The URL is unstable. I've asked for them to provide a stable URL but
# they have ignored me. If this package fails to build for you, you may need
# to update the version and sha256.
# c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129
src = fetchurl {
url = "https://web.archive.org/web/20210610172810/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2";
sha256 = "sha256-ahdy0/TBOyMfCt4VTkcDTZGAFmwQJT2KvZuMtFcAY3w=";
};
buildInputs = [
alsa-lib
alsa-utils
zlib
];
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out
mv * $out
runHook postInstall
'';
postFixup =
let
linkFix = bin: ''
sed -i '/ulimit/d' ${bin}
sed -i '/ln -sf/d' ${bin}
ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin}
'';
wrapFix = bin: ''
wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils ]}
'';
in
''
${linkFix "$out/Bridge/RAATServer"}
${linkFix "$out/Bridge/RoonBridge"}
${linkFix "$out/Bridge/RoonBridgeHelper"}
${wrapFix "$out/check.sh"}
${wrapFix "$out/start.sh"}
'';
meta = with lib; {
description = "The music player for music lovers";
homepage = "https://roonlabs.com";
license = licenses.unfree;
maintainers = with maintainers; [ lovesegfault ];
platforms = platforms.linux;
};
}

221
pkgs/servers/x11/xorg/default.nix
View file

File diff suppressed because it is too large Load diff

1
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View file

@ -301,6 +301,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
}
print OUT <<EOF
# THIS IS A GENERATED FILE. DO NOT EDIT!
$pkg = callPackage ({ $argumentsStr }: stdenv.mkDerivation {
name = "$pkgNames{$pkg}";
builder = ./builder.sh;

4
pkgs/shells/zsh/zsh-powerlevel10k/default.nix
View file

@ -19,13 +19,13 @@ let
in
stdenv.mkDerivation rec {
pname = "powerlevel10k";
version = "1.14.6";
version = "1.15.0";
src = fetchFromGitHub {
owner = "romkatv";
repo = "powerlevel10k";
rev = "v${version}";
sha256 = "1z6xipd7bgq7fc03x9j2dmg3yv59xyjf4ic5f1l6l6pw7w3q4sq7";
sha256 = "1b3j2riainx3zz4irww72z0pb8l8ymnh1903zpsy5wmjgb0wkcwq";
};
patches = [

6
pkgs/stdenv/darwin/default.nix
View file

@ -4,6 +4,7 @@
, config
, overlays
, crossOverlays ? [ ]
, bootstrapLlvmVersion ? if localSystem.isAarch64 then "11.1.0" else "7.1.0"
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
, bootstrapFiles ? if localSystem.isAarch64 then
let
@ -40,14 +41,11 @@ assert crossSystem == localSystem;
let
inherit (localSystem) system;
# Bootstrap version needs to be known to reference headers included in the bootstrap tools
bootstrapLlvmVersion = if localSystem.isAarch64 then "11.1.0" else "7.1.0";
useAppleSDKLibs = localSystem.isAarch64;
haveKRB5 = localSystem.isx86_64;
# final toolchain is injected into llvmPackages_${finalLlvmVersion}
finalLlvmVersion = if localSystem.isAarch64 then "11" else "7";
finalLlvmVersion = lib.versions.major bootstrapLlvmVersion;
finalLlvmPackages = "llvmPackages_${finalLlvmVersion}";
commonImpureHostDeps = [

4
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View file

@ -254,6 +254,8 @@ in rec {
'';
};
bootstrapLlvmVersion = llvmPackages.llvm.version;
bootstrapFiles = {
sh = "${build}/on-server/sh";
bzip2 = "${build}/on-server/bzip2";
@ -408,7 +410,7 @@ in rec {
system = if crossSystem != null then crossSystem else system;
stdenvStages = args: let
args' = args // { inherit bootstrapFiles; };
args' = args // { inherit bootstrapLlvmVersion bootstrapFiles; };
in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stagesDarwin;
};
}

6
pkgs/tools/admin/eksctl/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.52.0";
version = "0.53.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-P8v8XliY8XbfdiqSUTUhI4HYBKzAk/LHVSF0OLS8Vag=";
sha256 = "sha256-CWoRkx3OPlIeyUuGCyaGTlJ0zgcgsxlebSG0Zljr0zg=";
};
vendorSha256 = "sha256-4aZVQjcrZ6NKXr0ZFMWEcf6jMtp6TlRlinZ6ZZvLDyE=";
vendorSha256 = "sha256-499c3Y9IUV8lc+O9qcEeFKQDT4QDvOPmu0rmps7M47w=";
doCheck = false;

4
pkgs/tools/bluetooth/blueberry/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "blueberry";
version = "1.4.2";
version = "1.4.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-YwJQryIK92/Tc1s49jM3pCs7dmO3l+RbbFBtuXvhYbQ=";
sha256 = "sha256-UkF50AIFKkvjUHJiemR0Hj5ECZeHQU6beIw2TGrOlbk=";
};
nativeBuildInputs = [

7
pkgs/tools/cd-dvd/bootiso/default.nix
View file

@ -5,6 +5,8 @@
, makeWrapper
, bc
, jq
, coreutils
, util-linux
, wimlib
, file
, syslinux
@ -26,15 +28,12 @@ stdenvNoCC.mkDerivation rec {
strictDeps = true;
buildInputs = [ bash ];
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
patchShebangs --host bootiso
'';
makeFlags = [ "prefix=${placeholder "out"}" ];
postInstall = ''
wrapProgram $out/bin/bootiso \
--prefix PATH : ${lib.makeBinPath [ bc jq wimlib file syslinux gnugrep busybox ]} \
--prefix PATH : ${lib.makeBinPath [ bc jq coreutils util-linux wimlib file syslinux gnugrep busybox ]} \
--prefix BOOTISO_SYSLINUX_LIB_ROOT : ${syslinux}/share/syslinux
'';

38
pkgs/tools/filesystems/apfsprogs/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation {
pname = "apfsprogs";
version = "unstable-2021-05-07";
src = fetchFromGitHub {
owner = "linux-apfs";
repo = "apfsprogs";
rev = "d360211a30608a907e3ee8ad4468d606c40ec2d7";
sha256 = "sha256-SeFs/GQfIEvnxERyww+mnynjR7E02DdtBA6JsknEM+Q=";
};
buildPhase = ''
runHook preBuild
make -C apfsck $makeFlags
make -C mkapfs $makeFlags
runHook postBuild
'';
installPhase = ''
runHook preInstall
make -C apfsck install BINDIR="$out/bin" MANDIR="$out/share/man8" $installFlags
make -C mkapfs install BINDIR="$out/bin" MANDIR="$out/share/man8" $installFlags
runHook postInstall
'';
meta = with lib; {
description = "Experimental APFS tools for linux";
homepage = "https://github.com/linux-apfs/apfsprogs";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ Luflosi ];
};
}

7
pkgs/tools/inputmethods/interception-tools/caps2esc.nix
View file

@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "caps2esc";
version = "0.1.3";
version = "0.3.2";
src = fetchFromGitLab {
owner = "interception/linux/plugins";
group = "interception";
owner = "linux/plugins";
repo = pname;
rev = "v${version}";
sha256 = "10xv56vh5h3lxyii3ni166ddv1sz2pylrjmdwxhb4gd2p5zgl1ji";
sha256 = "sha256-gPFElAixiDTTwcl2XKM7MbTkpRrg8ToO5K7H8kz3DHk=";
};
nativeBuildInputs = [ cmake ];

8
pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix
View file

@ -2,16 +2,18 @@
stdenv.mkDerivation rec {
pname = "dual-function-keys";
version = "1.1.0";
version = "1.4.0";
src = fetchFromGitLab {
owner = "interception/linux/plugins";
group = "interception";
owner = "linux/plugins";
repo = pname;
rev = version;
sha256 = "07hksca4g7v4zsvhmhc9j725j3n63fzrkx9sb4a0wrd7rwgr25rz";
sha256 = "sha256-xlplbkeptXMBlRnSsc5NgGJfT8aoZxTRgTwTOd7aiWg=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libevdev libyamlcpp ];
prePatch = ''

10
pkgs/tools/misc/flashrom/default.nix
View file

@ -7,6 +7,7 @@
, libftdi1
, libusb1
, pciutils
, installShellFiles
}:
stdenv.mkDerivation rec {
@ -18,8 +19,15 @@ stdenv.mkDerivation rec {
sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
};
# Meson build doesn't build and install manpage. Only Makefile can.
# Build manpage from source directory. Here we're inside the ./build subdirectory
postInstall = ''
make flashrom.8 -C ..
installManPage ../flashrom.8
'';
mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ];
nativeBuildInputs = [ meson pkg-config ninja ];
nativeBuildInputs = [ meson pkg-config ninja installShellFiles ];
buildInputs = [ libftdi1 libusb1 pciutils ];
meta = with lib; {

45
pkgs/tools/misc/markdown-anki-decks/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "markdown-anki-decks";
version = "1.0.0";
format = "pyproject";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "R6T8KOHMb1Neg/RG5JQl9+7LxOkAoZL0L5wvVaqm9O0=";
};
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
genanki
typer
colorama
shellingham
beautifulsoup4
markdown
python-frontmatter
];
postPatch = ''
# No API changes.
substituteInPlace pyproject.toml --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"'
'';
# No tests available on Pypi and there is only a failing version assertion test in the repo.
doCheck = false;
meta = with lib; {
description = "Simple program to convert markdown files into anki decks";
maintainers = with maintainers; [ jtojnar ];
homepage = "https://github.com/lukesmurray/markdown-anki-decks";
license = licenses.mit;
platforms = platforms.unix;
};
}

4
pkgs/tools/misc/thefuck/default.nix
View file

@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "thefuck";
version = "3.30";
version = "3.31";
src = fetchFromGitHub {
owner = "nvbn";
repo = pname;
rev = version;
sha256 = "0fnf78956pwhb9cgv1jmgypnkma5xzflkivfrkfiadbgin848yfg";
sha256 = "sha256-eKKUUJr00sUtT4u91MUgJjyPOXp3NigYVfYUP/sDBhY=";
};
propagatedBuildInputs = [ colorama decorator psutil pyte six ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "usbmuxd";
version = "1.1.1";
version = "unstable-2021-05-08";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = version;
sha256 = "0a2xgrb4b3ndam448z74wh1267nmrz1wcbpx4xz86pwbdc93snab";
rev = "5e484e18f1383b5a0bd6c353ab1d668b03e4ffab";
sha256 = "sha256-hhbfRmLEhVVuJNnw65PakPnvjSCrN3oSMK6D7Zwnw60=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

20
pkgs/tools/networking/croc/default.nix
View file

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, callPackage}:
{ lib, buildGoModule, fetchFromGitHub, callPackage }:
buildGoModule rec {
pname = "croc";
version = "9.1.4";
version = "9.1.5";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "16HmRluhqCr6Gt+x8PSCU4W9pUJp89l4GO29uI+ZzkI=";
sha256 = "sha256-NjKj1m1g3F+YLNhFLDeO5DXtHIxPRwfSpunhRnSHRFc=";
};
vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4=";
vendorSha256 = "sha256-cBf4UV9jBKvmcBG2XLPpPgO05GRB1SV1W3lJCuoQJQ4=";
doCheck = false;
@ -19,16 +19,11 @@ buildGoModule rec {
passthru = {
tests = {
local-relay = callPackage ./test-local-relay.nix {};
local-relay = callPackage ./test-local-relay.nix { };
};
};
meta = with lib; {
description =
"Easily and securely send things from one computer to another";
homepage = "https://github.com/schollz/croc";
license = licenses.mit;
maintainers = with maintainers; [ hugoreeves equirosa ];
description = "Easily and securely send things from one computer to another";
longDescription = ''
Croc is a command line tool written in Go that allows any two computers to
simply and securely transfer files and folders.
@ -41,5 +36,8 @@ buildGoModule rec {
- Allows resuming transfers that are interrupted
- Does not require a server or port-forwarding
'';
homepage = "https://github.com/schollz/croc";
license = licenses.mit;
maintainers = with maintainers; [ hugoreeves equirosa SuperSandro2000 ];
};
}

4
pkgs/tools/networking/dnsproxy/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.37.5";
version = "0.37.6";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-j+8PA5kYHaRWbugcBjUIeos6488rw8lCOjCyz7IAcQg=";
sha256 = "sha256-NP3d2ZTvC4qKYOklUcPCvkhPsV/tU9JOCPp9s8m1CwQ=";
};
vendorSha256 = null;

4
pkgs/tools/networking/radsecproxy/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "radsecproxy";
version = "1.8.2";
version = "1.9.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1g7q128cip1dac9jad58rd96afx4xz7x7vsiv0af8iyq2ivqvs2m";
sha256 = "0ppgnvmzk5j42zvz74mwaz6767lzf9vpl8y57w612fvqpg65g4bv";
};
nativeBuildInputs = [ autoreconfHook ];

4
pkgs/tools/package-management/nixpkgs-review/default.nix
View file

@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "nixpkgs-review";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "Mic92";
repo = "nixpkgs-review";
rev = version;
sha256 = "sha256-096oSvc9DidURGKE0FNEBOQz82+RGg6aJo8o9HhaSp0=";
sha256 = "sha256-wDGmkydBLb3Wij1hjWExgHxva/03vJFqAK5zGH9yUn4=";
};
makeWrapperArgs = [

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