JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-02-21 06:01:22 +00:00 committed by GitHub
commit 18a1f292c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 2440 additions and 3655 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -2903,6 +2903,12 @@
githubId = 19733;
name = "Moritz Heidkamp";
};
DerickEddington = {
email = "derick.eddington@pm.me";
github = "DerickEddington";
githubId = 4731128;
name = "Derick Eddington";
};
dermetfan = {
email = "serverkorken@gmail.com";
github = "dermetfan";

4
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
View File

@ -10,10 +10,10 @@ with lib;
isoImage.edition = "gnome";
services.xserver.desktopManager.gnome = {
# Add firefox to favorite-apps
# Add Firefox and other tools useful for installation to the launcher
favoriteAppsOverride = ''
[org.gnome.shell]
favorite-apps=[ 'firefox.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ]
favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop' ]
'';
enable = true;
};

164
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -21,10 +21,10 @@
"owner": "aiven",
"provider-source-address": "registry.terraform.io/aiven/aiven",
"repo": "terraform-provider-aiven",
"rev": "v2.6.0",
"sha256": "1vbphaxw6qskn7g4jah00cpw2w960x50rpvx5kq143d8b2vbiix4",
"vendorSha256": "1zxs0p2xwxgvxdx65h0yfvzl7qmqlw41ipw0gsf25g0mvs4jckwb",
"version": "2.6.0"
"rev": "v2.7.0",
"sha256": "12n97z3r5bz7hwgcz193x90n7ibk4fdph7pqxwwinrvlc6zb7hz6",
"vendorSha256": "12lj7p74mhiy30fhc12ihbf827axlbxhbfzr10iwwhb0nydsfiyl",
"version": "2.7.0"
},
"akamai": {
"owner": "akamai",
@ -40,10 +40,10 @@
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.155.0",
"sha256": "0gzgh9w564c29hkx2sbrfrw04qbgdswc3ppvaa6xsz1s7g0p902a",
"rev": "v1.157.0",
"sha256": "02zsp7kxvg6i7wzrx6qigjsvxmmz4rhpjb36qz1jwn3dzpx6dyv1",
"vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg",
"version": "1.155.0"
"version": "1.157.0"
},
"ansible": {
"owner": "nbering",
@ -94,10 +94,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v4.0.0",
"sha256": "03lsdkjahq9prqrnw3v9073bi9378cqyl0g16qaqns7wrhxcxzm2",
"vendorSha256": "1mzacd4bmr3743kvxcp1nyc0gkr2gh8gm0rhq887z62lafpnbhy1",
"version": "4.0.0"
"rev": "v4.2.0",
"sha256": "1ijspv7bf6qi4s3k58vbaz4gbk6y60h7jrml2wjn6mas6pchiy0f",
"vendorSha256": "09p029a5qqhf28afhcs5pk2px18x2q6kc16xzjzmzpisvnfl4hfb",
"version": "4.2.0"
},
"azuread": {
"owner": "hashicorp",
@ -112,10 +112,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v2.96.0",
"sha256": "18c164acz8l1s2d06af9v8rg09a5b1s0360974fpca8rfiw425lf",
"rev": "v2.97.0",
"sha256": "0a95xq2bk6a1yas2kxfq30s41s2jgv2rjvz4y7m34wlldd9qxfhg",
"vendorSha256": null,
"version": "2.96.0"
"version": "2.97.0"
},
"azurestack": {
"owner": "hashicorp",
@ -157,10 +157,10 @@
"owner": "brightbox",
"provider-source-address": "registry.terraform.io/brightbox/brightbox",
"repo": "terraform-provider-brightbox",
"rev": "v2.0.7",
"sha256": "0p2gg24yvzghhsa5g1dqd27vkj6p2wyr3wxd964r5kz0sl80xh1y",
"vendorSha256": "05min7zgl9q4qw8v5ivf352pg4i5jnv449jl129vdsqz7p2wrc6d",
"version": "2.0.7"
"rev": "v2.1.1",
"sha256": "0gscxy921h8wkr40pi86dfx62z2jl0kkvnkfw7ab7xswz63h1ilm",
"vendorSha256": "1ij21y7lx6599b87vlz31mwykj0qam62w7776d6ar99pc0zl8r8k",
"version": "2.1.1"
},
"checkly": {
"owner": "checkly",
@ -194,10 +194,10 @@
"owner": "cloudflare",
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v3.8.0",
"sha256": "1splgbfjwfjx9qv5f526jk7yzfh24crw0xasx42jfia639m6s49c",
"vendorSha256": "0cf96s4xgx2idx7g40qhk16fwhdfnk1pcl6dy3cl2zr4afz5sky1",
"version": "3.8.0"
"rev": "v3.9.1",
"sha256": "02kyjf2mizvxv1a2fkw2wsk0gmilj83sj3qv1d7g0wxxkxx00nd2",
"vendorSha256": "167jafxr4g43y9gvqjq5z7vd9cyf15d69wbrdvqsfzj8sszqfq5l",
"version": "3.9.1"
},
"cloudfoundry": {
"owner": "cloudfoundry-community",
@ -248,10 +248,10 @@
"owner": "poseidon",
"provider-source-address": "registry.terraform.io/poseidon/ct",
"repo": "terraform-provider-ct",
"rev": "v0.9.1",
"sha256": "1d8q6ffh64v46r80vmbpsgmjw1vg6y26hpq3nz2h5mvqm0fqya9r",
"vendorSha256": "0zi64rki932x343iavwb7w5h5ripca3c2534mb91liym37vgkykv",
"version": "0.9.1"
"rev": "v0.9.2",
"sha256": "104j34b1m110fdya21k4rz03j1yba4a9cpm7hq13i8hc2diqjqnc",
"vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk",
"version": "0.9.2"
},
"datadog": {
"owner": "DataDog",
@ -302,10 +302,10 @@
"owner": "dnsimple",
"provider-source-address": "registry.terraform.io/dnsimple/dnsimple",
"repo": "terraform-provider-dnsimple",
"rev": "v0.11.0",
"sha256": "0w5lz9lz5jfvpn87d7xzpjimvh6wnwqfwk6masrhiw88h10pgd7n",
"rev": "v0.11.1",
"sha256": "0jzw1kjykbka59kx30xm3qicjb6fdmm5l4f2dr8g7nxdaqnxri0s",
"vendorSha256": "06wggchs5khzyg6fd9s0qj76awnw28s7l278awanqimqgqajijkj",
"version": "0.11.0"
"version": "0.11.1"
},
"docker": {
"owner": "kreuzwerker",
@ -411,20 +411,20 @@
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.10.0",
"sha256": "19hxlvahjk0pfixykb4vfg2gyf85p6zrj0z6wfm1q3ddk35rka4z",
"vendorSha256": "0l6f0zi3abkz4hn23bbp009bp43mpwsz9sqk3d75jpxgxi7c7f33",
"version": "4.10.0"
"rev": "v4.11.0",
"sha256": "1n3d4qxy2x69ryphqwyih7iz6slx5z1plyyzdcd7pxlaw8x8hpgm",
"vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7",
"version": "4.11.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.10.0",
"sha256": "01w0p1b4q2h7rmyq7fmh1zr8h22gwlws8w58ggbnah2xvn3jzvk3",
"vendorSha256": "0l6f0zi3abkz4hn23bbp009bp43mpwsz9sqk3d75jpxgxi7c7f33",
"version": "4.10.0"
"rev": "v4.11.0",
"sha256": "0ylfx8ks5azicnckkx3lrawf1gpsq95qsng550p51gr1wna1aqmy",
"vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7",
"version": "4.11.0"
},
"grafana": {
"owner": "grafana",
@ -466,10 +466,10 @@
"owner": "heroku",
"provider-source-address": "registry.terraform.io/heroku/heroku",
"repo": "terraform-provider-heroku",
"rev": "v5.0.0-beta.1",
"rev": "v5.0.0",
"sha256": "1dskbwa10dmj5fdw0wplby6hhcvxri68jlg34966mqx8pas3zsxy",
"vendorSha256": "13f7841i14b5n5iabqky7694mbqg95f0cvaygapczki5lf2j7fqy",
"version": "5.0.0-beta.1"
"version": "5.0.0"
},
"http": {
"owner": "hashicorp",
@ -511,10 +511,10 @@
"owner": "IBM-Cloud",
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
"repo": "terraform-provider-ibm",
"rev": "v1.38.2",
"sha256": "1c6mm57apk93s18747h8ywvq5463qwapinr735ci2pmb2655cs85",
"vendorSha256": "034k4sjbd5b64v4xvxgrhg3n8dchv41fk5vbcmk29rppi6pjc0yg",
"version": "1.38.2"
"rev": "v1.39.0-beta0",
"sha256": "1ms6jr2f112qxslv2lapvngkmg2mlf0jfjnpx6rxqzclq0xcjqn1",
"vendorSha256": "0g6bm2pvdvj24yw26d2w8d7nr9izzqwrwzdz4y9dbr426xycrgy5",
"version": "1.39.0-beta0"
},
"icinga2": {
"owner": "Icinga",
@ -674,10 +674,10 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal",
"rev": "v3.2.1",
"sha256": "0j07rras4m6i668lkvvn3rq5l67qfzk9bmpijsfk3my0zsgv8nvw",
"rev": "v3.2.2",
"sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi",
"vendorSha256": null,
"version": "3.2.1"
"version": "3.2.2"
},
"minio": {
"owner": "aminueza",
@ -701,10 +701,10 @@
"owner": "NaverCloudPlatform",
"provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud",
"repo": "terraform-provider-ncloud",
"rev": "v2.2.2",
"sha256": "0f2q0k04bkkqw6qsjfpbmrqgxn504ys0ffg2ids82vzxjsmfpi1n",
"vendorSha256": "1799i4d32y22v6ywwklm3ncmzir5hg8cw23jzb8d28xiw8vswhs4",
"version": "2.2.2"
"rev": "v2.2.5",
"sha256": "0hspr6iv69izg1y8s1sj24kgy562jggn9nwqgprn4zca7vsrl29r",
"vendorSha256": "1hiz0pphl4jxfglxj28rm58ih7c5dabhd2gaig23hcqvczhf1wd2",
"version": "2.2.5"
},
"netlify": {
"owner": "AegirHealth",
@ -719,10 +719,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v2.36.2",
"sha256": "0gz6yynpmzv2hs85y6a6kfsci1hx25gikbmq35w9kvv91gn7vd22",
"vendorSha256": "1i7zgdh63q8m6267k51xn711vhjx5zyq2xgnfr7i38xczrw6rcsq",
"version": "2.36.2"
"rev": "v2.37.0",
"sha256": "1gx2sxm39ap84anaiffdacqqrgagymgxywxc0rnc7zkwvziazhw9",
"vendorSha256": "130ddc9qs6i8l2ka76n9rxwsz71h0wywbnjd3p2xbkkpqsg66lbz",
"version": "2.37.0"
},
"nomad": {
"owner": "hashicorp",
@ -765,19 +765,19 @@
"owner": "nutanix",
"provider-source-address": "registry.terraform.io/nutanix/nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.2.2",
"sha256": "08y5hxp28z5mhrbfs0mdwdj694k26gwl0qb80dggmmdil704ajwk",
"vendorSha256": "0s7yi00zskc4j7vnqjfd64pxk2bpk1cqmqgiyxfh7aqqzg22yqkz",
"version": "1.2.2"
"rev": "v1.3.0",
"sha256": "1q38f6a8d607sdhrr6xcqmdsvm625v7y36xma137bqv09g3xga0s",
"vendorSha256": "0qkd9pnidf4rhbk7p4jkpcdq36g8lp8pwpsf3hydy6xh072iy4id",
"version": "1.3.0"
},
"oci": {
"owner": "terraform-providers",
"provider-source-address": "registry.terraform.io/hashicorp/oci",
"repo": "terraform-provider-oci",
"rev": "v4.63.0",
"sha256": "03hdq6024ch3rx20vgqh3xix6dn0chwgiz1z68f22h4gqzj5p955",
"rev": "v4.64.0",
"sha256": "1x8lhyr356j2gihgfy8563n75aqb2prwvdlnkxmvlbqcp10rnggd",
"vendorSha256": null,
"version": "4.63.0"
"version": "4.64.0"
},
"okta": {
"owner": "okta",
@ -811,10 +811,10 @@
"owner": "OpenNebula",
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
"repo": "terraform-provider-opennebula",
"rev": "v0.4.0",
"sha256": "1r6v1ksis0h9mairvn9mwk49dkn6s6ixi8j0jaz9w173lx5si917",
"rev": "v0.4.1",
"sha256": "13z14p8zkrmffai5pdiwi33xsznan015nl9b9cfyxi1is4m5i41m",
"vendorSha256": "0qyzavig8wnnjzm63pny5azywqyrnjm978yg5y0sr6zw8wghjd15",
"version": "0.4.0"
"version": "0.4.1"
},
"openstack": {
"owner": "terraform-provider-openstack",
@ -829,19 +829,19 @@
"owner": "opentelekomcloud",
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.27.5-alpha.1",
"sha256": "17ws855280bi1ps6q0rdcylsbjmb1m4wvv7m9gxxlryq0gkjdsw2",
"vendorSha256": "1qxh3nf6c0ii6wm8vch1bks3gqi2gfzi97szspbcn0z8kdhic07s",
"version": "1.27.5-alpha.1"
"rev": "v1.27.5",
"sha256": "04kr3319xpzabajzav3hl2ibws2lj7x2naqfc9gpdy7j06rhhkaa",
"vendorSha256": "1lyz6lb4ciddr3d2zh5hfdfvhdacs13xynkpsjcjyqqfhayxqavg",
"version": "1.27.5"
},
"opsgenie": {
"owner": "opsgenie",
"provider-source-address": "registry.terraform.io/opsgenie/opsgenie",
"repo": "terraform-provider-opsgenie",
"rev": "v0.6.9",
"sha256": "1wi0wdz0xh8p1znbb545xyzhg191d0xb1pwqqrxl5gz5w009dcz6",
"rev": "v0.6.10",
"sha256": "1kxq66skal10nx5mgk8qj15chk01fi1pjamgakr1j56m1dgw03cw",
"vendorSha256": null,
"version": "0.6.9"
"version": "0.6.10"
},
"oraclepaas": {
"owner": "terraform-providers",
@ -1018,10 +1018,10 @@
"owner": "spotinst",
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.66.0",
"sha256": "0rkh9vf2k9iynvpkzavca23jxi96dz7b7yc0h9hlhi5bmp5b337a",
"vendorSha256": "19zhyib256sp1b6zv281lw5mry8g865n4nrxc6x9gkpwg1m0z87z",
"version": "1.66.0"
"rev": "v1.68.0",
"sha256": "0llyy4rskspw4cy8jdbk175rli9s53mabj4b9yarm7apg17ai399",
"vendorSha256": "0j0airkc1p0y9w1w40fbwxmymf8rbal2ycrkp31x1c06f8s4lhzm",
"version": "1.68.0"
},
"stackpath": {
"owner": "stackpath",
@ -1063,10 +1063,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.61.6",
"sha256": "10zx8gcvcadc184d3lfmx4ipi54z3a1xa48dki3wibwmvg5nw1mf",
"rev": "v1.61.8",
"sha256": "1a8p141m3kcr1irl9z3vpjs6zkgqp003z7m52yskapv4df8d6skz",
"vendorSha256": null,
"version": "1.61.6"
"version": "1.61.8"
},
"tfe": {
"owner": "hashicorp",
@ -1136,10 +1136,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/vault",
"repo": "terraform-provider-vault",
"rev": "v3.2.1",
"sha256": "0y8vvc5mckzjs24x36rihl1vdvh9k2kazn5lsqvq6apv36kg5vw4",
"vendorSha256": "0j5kz5jvyds701gq89v8dcsvm67kbfxxgzjvmn74ms3nrkx8hr84",
"version": "3.2.1"
"rev": "v3.3.0",
"sha256": "1b36c2f06fglf6bs6s4ly73vk1cm7zd1ci13df5wp0f2xxib3szk",
"vendorSha256": "0x9cyxnaqkfpzx9ml7qqhl98jslpy1v965kd11kgcvqpr9lmc77x",
"version": "3.3.0"
},
"vcd": {
"owner": "vmware",

2
pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
View File

@ -12,7 +12,7 @@
"emoji-js-clean": "^4.0.0",
"emoji-mart": "^3.0.0",
"emoji-regex": "^9.2.2",
"error-stack-parser": "^2.0.6",
"error-stack-parser": "2.0.6",
"filesize": "^8.0.6",
"mapbox-gl": "^1.12.0",
"mime-types": "^2.1.31",

6
pkgs/applications/virtualization/lima/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "lima";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kz+gyl7BuC0G97Lj3T1a859TYhwfAGB1hTiYXq66wwY=";
sha256 = "sha256-hzoc5zbdnHHTY04aGn+77lHvPh+KNOPoZmW19YIZHv8=";
};
vendorSha256 = "sha256-x0VmidGV9TsGOyL+OTUHXOxJ2cgvIqph56MrwfR2SP4=";
vendorSha256 = "sha256-eJnwXXYWMaIfM8SW4MtmG4wsPA/9sx4j2AkOd6GpnsY=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

125
pkgs/data/icons/comixcursors/default.nix Normal file
View File

@ -0,0 +1,125 @@
{ lib, stdenv, fetchFromGitLab, bc, librsvg, xcursorgen }:
let
dimensions = {
color = [ "Black" "Blue" "Green" "Orange" "Red" "White" ];
opacity = [ "" "Opaque_" ]; # Translucent or opaque.
thickness = [ "" "Slim_" ]; # Thick or slim edges.
handedness = [ "" "LH_" ]; # Right- or left-handed.
};
product = lib.cartesianProductOfSets dimensions;
variantName =
{ color, opacity, thickness, handedness }:
"${handedness}${opacity}${thickness}${color}";
variants =
# (The order of this list is already good looking enough to show in the
# meta.longDescription.)
map variantName product;
in
stdenv.mkDerivation rec {
pname = "comixcursors";
version = "0.9.2";
src = fetchFromGitLab {
owner = "limitland";
repo = "comixcursors";
# https://gitlab.com/limitland/comixcursors/-/issues/3
rev = "8c327c8514ab3a352583605c1ddcb7eb3d1d302b";
sha256 = "0bpxqw4izj7m0zb9lnxnmsjicfw60ppkdyv5nwrrz4x865wb296a";
};
nativeBuildInputs = [ bc librsvg xcursorgen ];
patches = [ ./makefile-shell-var.patch ];
postPatch = ''
patchShebangs ./install-all ./bin/
'';
# install-all is used instead of the directions in upstream's INSTALL file,
# because using its Makefile directly is broken. Upstream itself seems to use
# its build-distribution script instead, which also uses install-all, but we
# do not use it because it does extra things for other distros.
#
# When not all of the variants, i.e. only a smaller subset of them, are
# desired (i.e. when a subset of outputs are chosen), install-all will still
# build all of them. While upstream appears to provide old functionality for
# building only a subset, it is broken and we do not use it. With prebuilt
# substitutions, installers of this package will get only the outputs they
# chose.
buildPhase = ''
ICONSDIR=$TMP/staged ./install-all
'';
installPhase = ''
for outputName in $outputs ; do
if [ $outputName != out ]; then
local outputDir=''${!outputName};
local iconsDir=$outputDir/share/icons
local cursorName=$(tr _ - <<<"$outputName")
mkdir -p $iconsDir
cp -r -d $TMP/staged/ComixCursors-$cursorName $iconsDir
unset outputDir iconsDir cursorName
fi
done
# Need this directory (empty) to prevent the builder scripts from breaking.
mkdir -p $out
'';
outputs = let
default = "Opaque_Black";
in
# Have the most-traditional variant be the default output (as the first).
# Even with outputsToInstall=[], the default/first still has an effect on
# some Nix tools (e.g. nix-build).
[ default ] ++ (lib.remove default variants)
# Need a dummy "out" output to prevent the builder scripts from breaking.
++ [ "out" ];
# No default output (to the extent possible). Instead, the outputs'
# attributes are used to choose which variant(s) to have.
outputsToInstall = [];
meta = with lib; {
description = "The Comix Cursors mouse themes";
longDescription = ''
There are many (${toString ((length outputs) - 1)}) variants of color,
opacity, edge thickness, and right- or left-handedness, for this cursor
theme. This package's derivation has an output for each of these
variants, named following the upstream convention, and the attribute for
an output must be used to install a variant. E.g.:
<programlisting language="nix">
environment.systemPackages = [
comixcursors.Blue
comixcursors.Opaque_Orange
comixcursors.Slim_Red
comixcursors.Opaque_Slim_White
comixcursors.LH_Green
comixcursors.LH_Opaque_Black
comixcursors.LH_Slim_Orange
comixcursors.LH_Opaque_Slim_Blue
];
</programlisting>
Attempting to use just <literal>comixcursors</literal>, i.e. without an
output attribute, will not install any variants. To install all the
variants, use <literal>comixcursors.all</literal> (which is a list), e.g.:
<programlisting language="nix">
environment.systemPackages = comixcursors.all ++ [...];
</programlisting>
The complete list of output attributes is:
<programlisting>
${concatStringsSep "\n" variants}
</programlisting>
'';
homepage = "https://gitlab.com/limitland/comixcursors";
changelog = "https://gitlab.com/limitland/comixcursors/-/blob/HEAD/NEWS";
license = licenses.gpl3Plus;
maintainers = [ maintainers.DerickEddington ];
platforms = platforms.all;
};
}

11
pkgs/data/icons/comixcursors/makefile-shell-var.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,6 @@
# Makefile for ComixCursors project.
-SHELL = /bin/bash
-
CURSORSNAME = ComixCursors
PACKAGENAME ?= ${CURSORSNAME}
SUMMARY ?= The original Comix Cursors

4
pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
View File

@ -4,9 +4,9 @@
mkXfceDerivation {
category = "apps";
pname = "xfce4-notifyd";
version = "0.6.2";
version = "0.6.3";
sha256 = "sha256-Gomehef68+mOgGFDaH48jG51nbaV4ruN925h71w7FuE=";
sha256 = "sha256-JcHxqKLl4F4FQv7lE64gWUorCvl5g5mSD+jEmj1ORfY=";
buildInputs = [ gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qpdf";
version = "10.4.0";
version = "10.6.2";
src = fetchFromGitHub {
owner = "qpdf";
repo = "qpdf";
rev = "release-qpdf-${version}";
sha256 = "sha256-IYXH1Pcd0eRzlbRouAB17wsCUGNuIlJfwJLbXiaC5dk=";
hash = "sha256-+8bH7fKJ5uZRxKX/4nMkoZGFTxm2uJEXkb1wq5FrLWs=";
};
nativeBuildInputs = [ perl ];

5607
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.8.10";
version = "0.8.11";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = version;
hash = "sha256-xt21mcXcucUhJlqwDLrAHvQLg9++uc/cX5Sy+Sppsbo=";
hash = "sha256-Ufx9Tl0PmV3AEig3UvejJBVxhewzPN6IRsji5MzVxG8=";
};
nativeBuildInputs = [

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

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "ocrmypdf";
version = "13.3.0";
version = "13.4.0";
src = fetchFromGitHub {
owner = "jbarlow83";
@ -39,7 +39,7 @@ buildPythonPackage rec {
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
sha256 = "sha256-8QOxHka2kl/keYbsP1zOZ8hrZ+15ZGJaw91F+cpWvcA=";
sha256 = "sha256-LgHhF+vztXPCn71d87OMn0umLvps7We6vyjdRJZw+3E=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "4.4.1";
version = "5.0.1";
disabled = ! isPy3k;
src = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-8yYqyXz4ZqZxsk2Ka8S0rDsHaqO4l6cZTyNuVQuHkew=";
hash = "sha256-PlfVvCEutWaNQyhP4j44viAmjvBzUlZUvUbYQPcNL24=";
};
patches = [

34
pkgs/development/python-modules/pikepdf/paths.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py
index 9db6b49..4020bcf 100644
index 87e99fe..253a701 100644
--- a/src/pikepdf/_methods.py
+++ b/src/pikepdf/_methods.py
@@ -204,7 +204,7 @@ def _mudraw(buffer, fmt) -> bytes:
@ -12,15 +12,33 @@ index 9db6b49..4020bcf 100644
check=True,
)
diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py
index 80cc910..64f6d31 100644
index 04c762d..924727c 100644
--- a/src/pikepdf/jbig2.py
+++ b/src/pikepdf/jbig2.py
@@ -25,7 +25,7 @@ def extract_jbig2(
global_path = Path(tmpdir) / "global"
@@ -26,7 +26,7 @@ def extract_jbig2(
output_path = Path(tmpdir) / "outfile"
- args = ["jbig2dec", "-e", "-o", os.fspath(output_path)]
+ args = ["@jbig2dec@", "-e", "-o", os.fspath(output_path)]
args = [
- "jbig2dec",
+ "@jbig2dec@",
"--embedded",
"--format",
"png",
@@ -59,7 +59,7 @@ def extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
output_path = Path(tmpdir) / "outfile"
# Get the raw stream, because we can't decode im_obj - that is why we are here
# (Strictly speaking we should remove any non-JBIG2 filters if double encoded)
args = [
- "jbig2dec",
+ "@jbig2dec@",
"--embedded",
"--format",
"png",
@@ -84,7 +84,7 @@ def extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
def jbig2dec_available() -> bool:
try:
- proc = run(['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii')
+ proc = run(['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii')
except (CalledProcessError, FileNotFoundError):
return False
else:

9
pkgs/development/python-modules/pywlroots/default.nix
View File

@ -18,18 +18,13 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.8";
version = "0.15.9";
src = fetchPypi {
inherit pname version;
sha256 = "5oKeiNRO/5/6gWHPgatn0sHRtPL2B2Fa7S1A7LWr0qM=";
sha256 = "V6P5zAvr0L7p+yEjr6To2rKoMPqxIvSPrlLzf6yj3WA=";
};
# The XWayland detection uses some hard-coded FHS paths. Since we
# know wlroots was built with xwayland support, replace its
# detection with `return True`.
patches = [ ./xwayland.patch ];
nativeBuildInputs = [ pkg-config ];
propagatedNativeBuildInputs = [ cffi ];
buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ];

25
pkgs/development/python-modules/pywlroots/xwayland.patch
View File

@ -1,25 +0,0 @@
diff --git a/wlroots/ffi_build.py b/wlroots/ffi_build.py
index bb07ff8..f19efe3 100644
--- a/wlroots/ffi_build.py
+++ b/wlroots/ffi_build.py
@@ -55,19 +55,7 @@ def has_xwayland() -> bool:
Check for XWayland headers. If present, wlroots was built with XWayland support, so
pywlroots can be too.
"""
- try:
- FFI().verify(
- "#include <wlr/xwayland.h>",
- define_macros=[("WLR_USE_UNSTABLE", 1)],
- include_dirs=["/usr/include/pixman-1", include_dir.as_posix()],
- )
- return True
- except VerificationError:
- print("If XWayland support is not required, ignore the above error message.")
- print(
- "If support is required, ensure wlroots was built with -Dxwayland=enabled."
- )
- return False
+ return True
# backend.h

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.27.9";
version = "2.27.10";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-c2iXRTTSl5OUku/f2rIykwRAsR4iA/bfHwxA4yQqh+o=";
sha256 = "sha256-XcsIj8qneO/u5rf8RpZwN+mD+/uf7AJZRXi9M/115VU=";
};
propagatedBuildInputs = [

55
pkgs/tools/filesystems/ioztat/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
, python3
}:
stdenv.mkDerivation rec {
pname = "ioztat";
version = "1.1.0";
src = fetchFromGitHub {
owner = "jimsalterjrs";
repo = "ioztat";
rev = "v${version}";
sha256 = "wDRcFlXmXTc1J9MQZqILfPp5jUhX6wW4nOnqspIWVjQ=";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ python3 ];
prePatch = ''
patchShebangs .
'';
installPhase = ''
mkdir -p $out/bin
cp ioztat $out/bin
if [ -f ioztat.8 ]; then
installManPage ioztat.8
fi
'';
meta = with lib; {
inherit version;
inherit (src.meta) homepage;
description = "A storage load analysis tool for OpenZFS";
longDescription = ''
ioztat is a storage load analysis tool for OpenZFS. It provides
iostat-like statistics at an individual dataset/zvol level.
The statistics offered are read and write operations per second, read and
write throughput per second, and the average size of read and write
operations issued in the current reporting interval. Viewing these
statistics at the individual dataset level allows system administrators
to identify storage "hot spots" in larger multi-tenant
systems -- particularly those with many VMs or containers operating
essentially independent workloads.
'';
license = licenses.bsd2;
platforms = with platforms; linux ++ freebsd;
maintainers = with maintainers; [ numinit ];
};
}

13
pkgs/tools/misc/esphome/default.nix
View File

@ -16,16 +16,25 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
version = "2022.2.3";
version = "2022.2.4";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-Pt57wI1cYTqT65zGOk1/GyvK0BqITxCzWIyXSNZ9D/0=";
sha256 = "sha256-RG5wTWEpBEC4zTGJ7XTmnjnhSVAllqXjcr3qYbmhqP4=";
};
patches = [
(fetchpatch {
# Fix ESPHOME_USE_SUBPROCESS usage in the ESP32 post build script
# https://github.com/esphome/esphome/pull/3246
url = "https://github.com/esphome/esphome/commit/dcd3f42eda5828c42feadbaa04b703c63899be54.patch";
hash = "sha256-rF1YHRRHVHfoRs492zmIOmRGPUzxx3s673UVx5UJ3+M=";
})
];
postPatch = ''
# remove all version pinning (E.g tornado==5.1.1 -> tornado)
sed -i -e "s/==[0-9.]*//" requirements.txt

6
pkgs/tools/nix/alejandra/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "alejandra";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "kamadorueda";
repo = "alejandra";
rev = version;
sha256 = "sha256-Gtz+z8ESIqY/2V6X/rLMweqio66IGaUVGmIT/Y20+JY=";
sha256 = "sha256-IQ+hv/R6uRPEPr7+SRXyYol4/cQo1ZqcqJxy26CpOoY=";
};
cargoSha256 = "sha256-kydMIbx5Fu7+uwXn7KrrNd1fhXZQ5sabX4TBYpvmimk=";
cargoSha256 = "sha256-PIqdjtqbSVQoxLj5jGSbrzRQ3qddZvp1Y7tIuFs7UEg=";
passthru.tests = {
version = testVersion { package = alejandra; };

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

@ -6707,6 +6707,8 @@ with pkgs;
iouyap = callPackage ../tools/networking/iouyap { };
ioztat = callPackage ../tools/filesystems/ioztat { };
ip2location = callPackage ../tools/networking/ip2location { };
ip2unix = callPackage ../tools/networking/ip2unix { };
@ -23444,6 +23446,8 @@ with pkgs;
comic-relief = callPackage ../data/fonts/comic-relief {};
comixcursors = callPackage ../data/icons/comixcursors {};
coreclr = callPackage ../development/compilers/coreclr { };
corefonts = callPackage ../data/fonts/corefonts { };