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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-06-15 06:01:39 +00:00 committed by GitHub
commit a5a4b79b0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 442 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -71,7 +71,7 @@ in
package = mkDefault pkgs.cinnamon.mint-themes;
};
iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
name = mkDefault "Mint-Y-Aqua";
name = mkDefault "Mint-Y-Sand";
package = mkDefault pkgs.cinnamon.mint-y-icons;
};
cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
@ -113,6 +113,8 @@ in
services.gnome.glib-networking.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gvfs.enable = true;
services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper
services.touchegg.enable = mkDefault true;
services.udisks2.enable = true;
services.upower.enable = mkDefault config.powerManagement.enable;
services.xserver.libinput.enable = mkDefault true;
@ -178,6 +180,8 @@ in
nixos-artwork.wallpapers.simple-dark-gray
mint-artwork
mint-cursor-themes
mint-l-icons
mint-l-theme
mint-themes
mint-x-icons
mint-y-icons

193
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
View File

@ -1283,10 +1283,10 @@
elpaBuild {
pname = "denote";
ename = "denote";
version = "1.2.0.0.20230605.73117";
version = "1.2.0.0.20230611.160303";
src = fetchurl {
url = "https://elpa.gnu.org/devel/denote-1.2.0.0.20230605.73117.tar";
sha256 = "1rj7gaqxliyah72q485hx1gm474xs391zi34hdpdz3l87bd57n6a";
url = "https://elpa.gnu.org/devel/denote-1.2.0.0.20230611.160303.tar";
sha256 = "13xb6h6ww12j301zkjvw8kb702cxz3xj7blj6qhw6bs5i7qs90vy";
};
packageRequires = [ emacs ];
meta = {
@ -1809,10 +1809,10 @@
elpaBuild {
pname = "emacs-gc-stats";
ename = "emacs-gc-stats";
version = "1.0.0.20230414.170313";
version = "1.1.0.20230611.93624";
src = fetchurl {
url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.0.0.20230414.170313.tar";
sha256 = "17jmxhxym6n3n61vf0my7c98pzx6d7gxfc8qb7k0yhac1b8s9fg3";
url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.1.0.20230611.93624.tar";
sha256 = "0ybipxwdzfzmx6k2a20q9gb8ymb4pwbkk0qxic34g2czq8kba79k";
};
packageRequires = [ emacs ];
meta = {
@ -1820,18 +1820,14 @@
license = lib.licenses.free;
};
}) {};
embark = callPackage ({ compat
, elpaBuild
, emacs
, fetchurl
, lib }:
embark = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "embark";
ename = "embark";
version = "0.22.1.0.20230604.235020";
version = "0.22.1.0.20230613.15430";
src = fetchurl {
url = "https://elpa.gnu.org/devel/embark-0.22.1.0.20230604.235020.tar";
sha256 = "0yb3g3yp4vd9w6bclmff1qgqryj1hz9xf187yfrnqv3viv924454";
url = "https://elpa.gnu.org/devel/embark-0.22.1.0.20230613.15430.tar";
sha256 = "099ja8d1h7282vwbijagh7n0fign6i21i8mz90wcw4ykwqqij5i5";
};
packageRequires = [ compat emacs ];
meta = {
@ -1848,10 +1844,10 @@
elpaBuild {
pname = "embark-consult";
ename = "embark-consult";
version = "0.7.0.20230604.235020";
version = "0.7.0.20230613.15430";
src = fetchurl {
url = "https://elpa.gnu.org/devel/embark-consult-0.7.0.20230604.235020.tar";
sha256 = "1982pcvf2crwmind8ykx5i30dvyd63pfljnrsjgnb4ws7nglbrbi";
url = "https://elpa.gnu.org/devel/embark-consult-0.7.0.20230613.15430.tar";
sha256 = "0nv4wd2r2v7a8i7mn3pp70hba1664vp7ccix6ws2h8aflmqxc405";
};
packageRequires = [ consult emacs embark ];
meta = {
@ -1859,6 +1855,40 @@
license = lib.licenses.free;
};
}) {};
ement = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, map
, persist
, plz
, svg-lib
, taxy
, taxy-magit-section
, transient }:
elpaBuild {
pname = "ement";
ename = "ement";
version = "0.10pre0.20230609.233956";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ement-0.10pre0.20230609.233956.tar";
sha256 = "110hj66w821fdb8fbqsmzxy4ypz14g55c6qvy6mkad39qbync1nw";
};
packageRequires = [
emacs
map
persist
plz
svg-lib
taxy
taxy-magit-section
transient
];
meta = {
homepage = "https://elpa.gnu.org/packages/ement.html";
license = lib.licenses.free;
};
}) {};
emms = callPackage ({ cl-lib ? null
, elpaBuild
, fetchurl
@ -1929,6 +1959,25 @@
license = lib.licenses.free;
};
}) {};
erc = callPackage ({ compat
, elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "erc";
ename = "erc";
version = "5.6snapshot0.20230611.202407";
src = fetchurl {
url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20230611.202407.tar";
sha256 = "195ywapyvw79x8mbs45dc9mkskwy7l3qvrinw0jw0lj081ql4n6d";
};
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/erc.html";
license = lib.licenses.free;
};
}) {};
ergoemacs-mode = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -1949,6 +1998,24 @@
license = lib.licenses.free;
};
}) {};
ess = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "ess";
ename = "ess";
version = "18.10.3snapshot0.20230419.152710";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ess-18.10.3snapshot0.20230419.152710.tar";
sha256 = "04mbnx6mlkpkdh700x0xdfyw31idgypcmag2sdk29dgqza761b9r";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/ess.html";
license = lib.licenses.free;
};
}) {};
excorporate = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -2676,6 +2743,24 @@
license = lib.licenses.free;
};
}) {};
hyperbole = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
version = "8.0.1pre0.20230611.151720";
src = fetchurl {
url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20230611.151720.tar";
sha256 = "126kzbyky9qjp5lplygkxb53dxq3wis9b1pyl0xfhmvwipbs31s0";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/hyperbole.html";
license = lib.licenses.free;
};
}) {};
ilist = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "ilist";
@ -3914,6 +3999,21 @@
license = lib.licenses.free;
};
}) {};
org = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "org";
ename = "org";
version = "9.7pre0.20230613.100848";
src = fetchurl {
url = "https://elpa.gnu.org/devel/org-9.7pre0.20230613.100848.tar";
sha256 = "164ndywr9rgls1yzn1p1gkmszqr3rqzd10k9rjqairvsl2i1r68w";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/org.html";
license = lib.licenses.free;
};
}) {};
org-contacts = callPackage ({ elpaBuild
, emacs
, fetchurl
@ -4308,6 +4408,21 @@
license = lib.licenses.free;
};
}) {};
plz = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "plz";
ename = "plz";
version = "0.6pre0.20230530.113949";
src = fetchurl {
url = "https://elpa.gnu.org/devel/plz-0.6pre0.20230530.113949.tar";
sha256 = "1k96pibm5c5sl6b8cw5w4n8x33dhf1zc8ik64y0m03sj70h20j9l";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/plz.html";
license = lib.licenses.free;
};
}) {};
poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "poke";
@ -4831,10 +4946,10 @@
elpaBuild {
pname = "relint";
ename = "relint";
version = "1.22.0.20230326.142643";
version = "1.22.0.20230612.102749";
src = fetchurl {
url = "https://elpa.gnu.org/devel/relint-1.22.0.20230326.142643.tar";
sha256 = "0ac7rckvvccvnlm52dw5dl83g5ywzziwkw6mnkgs27017mn3dlfh";
url = "https://elpa.gnu.org/devel/relint-1.22.0.20230612.102749.tar";
sha256 = "08q5y03lf9r5an6sw4gw6fkn0vcy0yhy43bfx1pag8d55x1h42ny";
};
packageRequires = [ emacs xr ];
meta = {
@ -5970,14 +6085,18 @@
license = lib.licenses.free;
};
}) {};
triples = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
triples = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, seq }:
elpaBuild {
pname = "triples";
ename = "triples";
version = "0.3.0.20230610.100448";
version = "0.3.2.0.20230613.212718";
src = fetchurl {
url = "https://elpa.gnu.org/devel/triples-0.3.0.20230610.100448.tar";
sha256 = "08bz6ypg6grp9vz12kr0bp7m8v3vc22klc0x1aiv3f7wgy451snk";
url = "https://elpa.gnu.org/devel/triples-0.3.2.0.20230613.212718.tar";
sha256 = "0c5kv3phzxf56v7gzgarpymj2y8qz9y2f9bzy7fxifg4921y02np";
};
packageRequires = [ emacs seq ];
meta = {
@ -6072,6 +6191,26 @@
license = lib.licenses.free;
};
}) {};
urgrep = callPackage ({ compat
, elpaBuild
, emacs
, fetchurl
, lib
, project }:
elpaBuild {
pname = "urgrep";
ename = "urgrep";
version = "0.2.0snapshot0.20230610.165543";
src = fetchurl {
url = "https://elpa.gnu.org/devel/urgrep-0.2.0snapshot0.20230610.165543.tar";
sha256 = "09j6wkr77xl87jjpjs9msjad1fmdag77dkqgz1ad3z5f02sav0nn";
};
packageRequires = [ compat emacs project ];
meta = {
homepage = "https://elpa.gnu.org/packages/urgrep.html";
license = lib.licenses.free;
};
}) {};
url-http-ntlm = callPackage ({ cl-lib ? null
, elpaBuild
, fetchurl
@ -6395,10 +6534,10 @@
elpaBuild {
pname = "vundo";
ename = "vundo";
version = "2.1.0.0.20230510.170718";
version = "2.1.0.0.20230612.40515";
src = fetchurl {
url = "https://elpa.gnu.org/devel/vundo-2.1.0.0.20230510.170718.tar";
sha256 = "0q48bwaxz39w8gppsmr32rk04zh50cfz4g2rlxf5bkziqgja0yyl";
url = "https://elpa.gnu.org/devel/vundo-2.1.0.0.20230612.40515.tar";
sha256 = "1dbzf9dnvyjikn5z256yrqy5i215vxby3ndg7i0i0pdzg3pjkj39";
};
packageRequires = [ emacs ];
meta = {

4
pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
View File

@ -4,8 +4,8 @@ let
src = pkgs.fetchFromGitHub {
owner = "nix-community";
repo = "emacs2nix";
rev = "7f07ac3c3f175630de68153d98a93b9fa24d1eb3";
sha256 = "sha256-Mh9G8LH3n1ccg+shBoWQRk67yAA+GEYGkk8tjM7W02Y=";
rev = "e5389c3d7be9c3af135f022d86c61767d41c364f";
sha256 = "sha256-mueyrGXgbjvmXQqPRuLUJdJuB5dqiGGdzCQ74Ud+Z9Y=";
fetchSubmodules = true;
};
in

5
pkgs/applications/editors/kakoune/plugins/update.py
View File

@ -55,11 +55,6 @@ packages = ( self:
{"""
)
for pluginDesc, plugin in sorted_plugins:
if plugin.has_submodules:
submodule_attr = "\n fetchSubmodules = true;"
else:
submodule_attr = ""
f.write(
f"""
{plugin.normalized_name} = buildKakounePluginFrom2Nix {{

4
pkgs/applications/editors/xed-editor/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "xed-editor";
version = "3.2.8";
version = "3.4.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "xed";
rev = version;
sha256 = "sha256-ax769qjV0oZ6tnEE5FsXNbHETI6KNgvh0WviBsPs9j8=";
sha256 = "sha256-fBwxc6n4sNNRiKcax96Tl3cFD+Ryvmj+XizB3z2s4+Q=";
};
nativeBuildInputs = [

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

@ -28,13 +28,13 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"aiven": {
"hash": "sha256-kHCgl4osr0L9GR9Fv3u8dUs+ko82vxjE6dmJ9QZoQsE=",
"hash": "sha256-wXNCEaLfZAEX1ExnUjUkkGwwD/YDSD6dzj2unNWVZbU=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
"rev": "v4.4.1",
"rev": "v4.5.0",
"spdx": "MIT",
"vendorHash": "sha256-phcV7ZQ/7umtJMp0ozGV0jpYizlvmNq3Eo/wZ7tfNec="
"vendorHash": "sha256-9DCu0qqQl4qnnyp+KvuAuJMRjtiejpkyiBxkKUBpoGg="
},
"akamai": {
"hash": "sha256-RIJarmJZHDl5XhXLnr1igiBq9Uu9/2N+vhosPFTs2tg=",
@ -82,13 +82,13 @@
"vendorHash": "sha256-4b96zHSdokE/MiVtdRCNosFhJJ6L5sOlHRRMBqJ4n4M="
},
"auth0": {
"hash": "sha256-6wJvBwZ7PY1Jqx/r5YrZ0P4uHLiMvrFvsm3OEByrYyQ=",
"hash": "sha256-+zhlIL/se0TWiZrpNs7kEgVZtwBSI5G0r3edWn9LeUw=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v0.48.0",
"rev": "v0.49.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-bFnvZARj2WfZpftus2PTlrxAFdrrgk9N0UZfzhQ6DmI="
"vendorHash": "sha256-qm8rFZZtltC9IV47QzmoQa0kpKp4vn3eHj5kKMIEb+4="
},
"avi": {
"hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=",
@ -218,13 +218,13 @@
"vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q="
},
"cloudflare": {
"hash": "sha256-+tTBNPTZjzvI1XYo8sPQumSJftvRkh+CRCr+S+Z4HNM=",
"hash": "sha256-bunkrh9m7w47704G8Pq6S7bmhhcVIVP1yk+/AGG28Wg=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v4.7.1",
"rev": "v4.8.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jAdeCVr1hWVPwWFbxiaVP1aF8LeJFi2ua2vM9r65mKI="
"vendorHash": "sha256-xqVaZj0NEtcT64TThkFh2AJ03wiXCAhgYSddaUBlGAc="
},
"cloudfoundry": {
"hash": "sha256-SFA0rG80BWaJHwvAWEugdVd3nR+YGflyYONOuoS++P8=",
@ -801,20 +801,20 @@
},
"nutanix": {
"deleteVendor": true,
"hash": "sha256-kxLsQeseSncGRJCeh/1yD7oouS5OYwo5N5YorzwQdBs=",
"hash": "sha256-c2+3nAwbFL3DWQW6OqAweTMmg8nZER4CaHGeGrh1/Tg=",
"homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
"owner": "nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.9.0",
"rev": "v1.9.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-Sd8okjpxx1rQRmlql5HQ1wjWligZTArJ2unT3Tv02m8=",
"hash": "sha256-fUAPXCxE6Xovsnrz0RY2MyJFxozxjpNBCduPMJNkQBQ=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v5.0.0",
"rev": "v5.1.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1044,11 +1044,11 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
"hash": "sha256-NFmyz5CdZoSucKib5SUVNc+m5yXUUNxO7LSMXJtFRJk=",
"hash": "sha256-0FoSfllKpv+k3s9g4z4vd/mBMpsC94YTzbvOvqI8qDc=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.122.1",
"rev": "v1.122.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-hfg3XyBf5V+NJTzCoHbnTU4HkEdQsllqcH2NjeTmlf0="
},
@ -1098,11 +1098,11 @@
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
},
"tencentcloud": {
"hash": "sha256-vnUPxI3H3bD3kQgNXapOaNPZxn6+1O+LcW41REbaC3k=",
"hash": "sha256-cxVBEpKyYxwuuLqStB1ffOuloqqkAx7bQlEqEES8sPQ=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.81.6",
"rev": "v1.81.7",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1253,13 +1253,13 @@
"vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs="
},
"yandex": {
"hash": "sha256-vBTHtVmQxImTNkS2KVVIoPadYsPK3PL8ADx4L4Vyah8=",
"hash": "sha256-qB+Jc8oO4Hr1gqBV/jRriWJ/qFpBAs1IpwrCpAf7+wk=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"proxyVendor": true,
"repo": "terraform-provider-yandex",
"rev": "v0.92.0",
"rev": "v0.93.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-2KaVZ1k1IEUFWakh16DXFyorqg1PqBQapWUay49LPMk="
"vendorHash": "sha256-shdf+al8BKfdvlVYPLqTAapa8A3V3DGYIhfyPv8zkVI="
}
}

4
pkgs/applications/video/hypnotix/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "hypnotix";
version = "3.2";
version = "3.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "hypnotix";
rev = version;
hash = "sha256-R9bp1RQHHCrIE/3rIAHzWHXpXBUDUpJTkO53n+xZw3Q=";
hash = "sha256-Oxv70bFheKhlYyLdGcn0Hja+LAmn6RHfAh5FIjghD9o=";
};
patches = [

8
pkgs/data/themes/flat-remix-gnome/default.nix
View File

@ -7,25 +7,25 @@
let
# make install will use dconf to find desktop background file uri.
# consider adding an args to allow specify pictures manually.
# https://github.com/daniruiz/flat-remix-gnome/blob/20221107/Makefile#L38
# https://github.com/daniruiz/flat-remix-gnome/blob/20230508/Makefile#L38
fake-dconf = writeScriptBin "dconf" "echo -n";
in
stdenv.mkDerivation rec {
pname = "flat-remix-gnome";
version = "20221107";
version = "20230508";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
hash = "sha256-5V3ECbQe3/5bhHnMR1pzvehs1eh0u9U7E1voDiqo9cY=";
hash = "sha256-MMWLSpGMvHFu3gZzU3IlfNxLY6ItMtxGLZltTJZXYaw=";
};
nativeBuildInputs = [ glib fake-dconf ];
makeFlags = [ "PREFIX=$(out)" ];
# make install will back up this file, it will fail if the file doesn't exist.
# https://github.com/daniruiz/flat-remix-gnome/blob/20221107/Makefile#L56
# https://github.com/daniruiz/flat-remix-gnome/blob/20230508/Makefile#L56
preInstall = ''
mkdir -p $out/share/gnome-shell/
touch $out/share/gnome-shell/gnome-shell-theme.gresource

5
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View File

@ -72,13 +72,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "5.6.8";
version = "5.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-qL8GaEH/0d4yEwwdaR55fTp0RitbyptoxKOBO3nmbic=";
hash = "sha256-KY5ctByMYKxigiZ0X/blaHJuyiAUNB6B2gpGtC/k100=";
};
patches = [
@ -166,6 +166,7 @@ stdenv.mkDerivation rec {
substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds"
substituteInPlace ./bin/Spices.py --replace "msgfmt" "${gettext}/bin/msgfmt"
substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci"
substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d"
popd
sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}

1
pkgs/desktops/cinnamon/cinnamon-common/libdir.patch
View File

@ -17,6 +17,7 @@ index 3c1e9a4f..a77d9b3c 100644
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
-pkglibdir = join_paths(libdir, meson.project_name().to_lower())
+pkglibdir = libdir
girdir = join_paths(datadir, 'gir-1.0')
servicedir = join_paths(datadir, 'dbus-1', 'services')
pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
po_dir = join_paths(meson.source_root(), 'po')

4
pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
View File

@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-control-center";
version = "5.6.1";
version = "5.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-rp3K7SqGw8da2U61VjKiqUyT5vCUVk4XZdRYtLwRtfQ=";
hash = "sha256-tRLUdwEptLNngVq+qOPilGQipVXNeDlzohgu3VlVciI=";
};
buildInputs = [

4
pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-desktop";
version = "5.6.2";
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-X4jf7+QFjoev1K6ywxN0n9MYUv7xI1/su+hHeesG02Y=";
hash = "sha256-rYTWtdYfMow3cIPhJdcmhyaIIU7fgVecWigbsCW0Piw=";
};
outputs = [ "out" "dev" ];

4
pkgs/desktops/cinnamon/cinnamon-menus/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-menus";
version = "5.6.0";
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-6IOlXQhAy6YrSqybfGFUyn3Q2COvzwpj67y/k/YLNhU=";
hash = "sha256-AgA/DA7I9/0AJhlmgk0yAOJaZzpiQV1vM949Y6EOWVg=";
};
buildInputs = [

6
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
View File

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-screensaver";
version = "5.6.3";
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-S4+9ZTpDwwvYTc3gz0YQBYjgygp8KP94azkiJcH6xCk=";
hash = "sha256-Y1veBgWTCs7HRBuMwN+eHu4oygGYIanaQigMGVfkSuI=";
};
nativeBuildInputs = [
@ -89,8 +89,6 @@ stdenv.mkDerivation rec {
-e s,/usr/share/cinnamon-screensaver,$out/share,g \
-e s,/usr/share/iso-flag-png,${iso-flags-png-320x420}/share/iso-flags-png,g \
{} +
sed "s|/usr/share/locale|/run/current-system/sw/share/locale|g" -i ./src/cinnamon-screensaver-main.py
'';
preFixup = ''

4
pkgs/desktops/cinnamon/cinnamon-session/default.nix
View File

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-session";
version = "5.6.0";
version = "5.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-lyASp0jFwaPLPQ3Jnow6eTpUBybwhSEmQUK/20fsh7I=";
hash = "sha256-NVoP1KYh/z96NKMi9LjL4RgkjJg32oSy5WHJ91+70DI=";
};
patches = [

5
pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
View File

@ -32,18 +32,17 @@
stdenv.mkDerivation rec {
pname = "cinnamon-settings-daemon";
version = "5.6.2";
version = "5.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-IqYfHMjKe7gVsM6HgihQMNkcXSYBOft1lamXOLa1Y8k=";
hash = "sha256-2ObfUdrCuvyhtpoxNzoH8tsFQLxNkMLQPFfJajXEsXU=";
};
patches = [
./csd-backlight-helper-fix.patch
./use-sane-install-dir.patch
];
buildInputs = [

27
pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch
View File

@ -1,27 +0,0 @@
From be57c01e6595a8e08ecc17de298e30640b532f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 6 Feb 2021 13:55:03 +0100
Subject: [PATCH] use sane install-dir
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 0e11d50..54f4637 100644
--- a/meson.build
+++ b/meson.build
@@ -156,8 +156,8 @@ subdir('cinnamon-settings-daemon')
subdir('plugins')
install_subdir(
- 'files',
- install_dir: '/',
+ 'files/usr',
+ install_dir: get_option('prefix'),
strip_directory: true,
)
--
2.30.0

4
pkgs/desktops/cinnamon/cinnamon-translations/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-translations";
version = "5.6.1";
version = "5.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-567xkQGLLhZtjAWXzW/MRiD14rrWeg0yvx97jtukRvc=";
hash = "sha256-QwLb8dxyub3W5KlYP1HinC07bTJ6f+/t07k3OWX9Qlg=";
};
nativeBuildInputs = [

8
pkgs/desktops/cinnamon/cjs/default.nix
View File

@ -6,7 +6,7 @@
, cairo
, glib
, readline
, spidermonkey_78
, spidermonkey_102
, meson
, dbus
, ninja
@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "cjs";
version = "5.6.1";
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cjs";
rev = version;
hash = "sha256-f9esbQi5WWSMAGlEs9HJFToOvmOrbP2lDW1gGh/48gw=";
hash = "sha256-DKCe8dKdYfdeWQ9Iqr0AmDU7YDN9QrQGdTkrBV/ywV0=";
};
outputs = [ "out" "dev" ];
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
gobject-introspection
cairo
readline
spidermonkey_78
spidermonkey_102
dbus # for dbus-run-session
];

22
pkgs/desktops/cinnamon/folder-color-switcher/default.nix
View File

@ -2,27 +2,34 @@
, lib
, fetchFromGitHub
, gettext
, python3
}:
stdenvNoCC.mkDerivation rec {
pname = "folder-color-switcher";
version = "1.5.5";
version = "1.5.7";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
# They don't really do tags, this is just a named commit.
rev = "5e0b768b3a5bf88a828a2489b9428997b797c1ed";
sha256 = "sha256-DU75LM5v2/E/ZmqQgyiPsOOEUw9QQ/NXNtGDFzzYvyY=";
rev = "03311d62a62e2cd7d0592b241c287091161ec6b6";
sha256 = "sha256-HQv9vSpRSBjqbncGFv+O5XQtRJ+4Cq0aWZHoj5BhKYE=";
};
nativeBuildInputs = [
gettext
python3.pkgs.wrapPython
];
postPatch = ''
substituteInPlace usr/share/nemo-python/extensions/nemo-folder-color-switcher.py \
--replace "/usr/share" "$out/share"
--replace "/usr/share/locale" "$out/share" \
--replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d" \
--replace "/usr/share/folder-color-switcher/color.svg" "$out/share/folder-color-switcher/color.svg"
substituteInPlace usr/share/caja-python/extensions/caja-folder-color-switcher.py \
--replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d"
'';
installPhase = ''
@ -34,6 +41,13 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
preFixup = ''
# For Gdk.cairo_surface_create_from_pixbuf()
# TypeError: Couldn't find foreign struct converter for 'cairo.Surface'
buildPythonPath ${python3.pkgs.pycairo}
patchPythonScript $out/share/nemo-python/extensions/nemo-folder-color-switcher.py
'';
meta = with lib; {
homepage = "https://github.com/linuxmint/folder-color-switcher";
description = "Change folder colors for Nemo and Caja";

6
pkgs/desktops/cinnamon/mint-artwork/default.nix
View File

@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "mint-artwork";
version = "1.7.3";
version = "1.7.5";
src = fetchurl {
urls = [
"http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
"https://web.archive.org/web/20221206154838/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
"https://web.archive.org/web/20230601120342/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
];
hash = "sha256-lusYlmTL71VTGSJFssuIZVu7xJMuZQ7wj2rMtO1lhZ8=";
hash = "sha256-yd2FyGAznXGnHJLkMsSNqIx0sbKHl3cNMr7tpue7BlA=";
};
nativeBuildInputs = [

4
pkgs/desktops/cinnamon/mint-themes/default.nix
View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-themes";
version = "2.0.9";
version = "2.1.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-FvX4r7AZgSq52T9CKE9RagsKgQXExTYPptQBXadA3eI=";
hash = "sha256-Y+KmSKuREn2E3FySsScjL+oSpSFnyEqhoXQfU++86JY=";
};
nativeBuildInputs = [

4
pkgs/desktops/cinnamon/mint-x-icons/default.nix
View File

@ -11,13 +11,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-x-icons";
version = "1.6.4";
version = "1.6.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-cPRae3EjzVtAL1Ei2LB4UNUU/m87mFT94xY/NnNR6JM=";
hash = "sha256-Z07475Uiv4GKCOrKhDBXPZVBGpxdjN7vn2y0rRAZVm0=";
};
propagatedBuildInputs = [

4
pkgs/desktops/cinnamon/mint-y-icons/default.nix
View File

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-y-icons";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-XnQcVlN4xtZQDjijNV09m2m0ODYfFbrQaNd8ZQVToIw=";
hash = "sha256-yLsFEd4QyeEBA4IrYiy0sgNv0kG9WxjFsJQteoJc+YM=";
};
propagatedBuildInputs = [

4
pkgs/desktops/cinnamon/muffin/default.nix
View File

@ -35,7 +35,7 @@
stdenv.mkDerivation rec {
pname = "muffin";
version = "5.6.4";
version = "5.8.0";
outputs = [ "out" "dev" "man" ];
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-NnQ7KF979HnsEc4X/Wf1YOfUvByHvVIdTAcJyUjhsp8=";
hash = "sha256-2pF6mKSSW4S0mfb4iBfZKBIVXKzrVyPeftcVrWSWzhc=";
};
patches = [

12
pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
View File

@ -3,19 +3,15 @@
, fetchFromGitHub
}:
let
srcs = import ../srcs.nix { inherit fetchFromGitHub; };
in
python3.pkgs.buildPythonApplication rec {
pname = "nemo-emblems";
version = "5.6.0";
inherit (srcs) version src;
format = "setuptools";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
sha256 = "sha256-cxutiz5bc/dZ9D7XzvMWodWNYvNJPj+5IhJDPJwnb5I=";
};
sourceRoot = "${src.name}/nemo-emblems";
postPatch = ''

12
pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
View File

@ -10,16 +10,12 @@
, gnome
}:
let
srcs = import ../srcs.nix { inherit fetchFromGitHub; };
in
stdenv.mkDerivation rec {
pname = "nemo-fileroller";
version = "5.6.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = "nemo-fileroller-${version}";
sha256 = "sha256-dPmAHuJ0ZRTAwhnMMZEu1e9+qZRYCnlaaoCdUP45W+s=";
};
inherit (srcs) version src;
sourceRoot = "${src.name}/nemo-fileroller";

12
pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
View File

@ -11,16 +11,12 @@
, substituteAll
}:
let
srcs = import ../srcs.nix { inherit fetchFromGitHub; };
in
stdenv.mkDerivation rec {
pname = "nemo-python";
version = "5.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
sha256 = "sha256-cxutiz5bc/dZ9D7XzvMWodWNYvNJPj+5IhJDPJwnb5I=";
};
inherit (srcs) version src;
sourceRoot = "${src.name}/nemo-python";

15
pkgs/desktops/cinnamon/nemo-extensions/srcs.nix Normal file
View File

@ -0,0 +1,15 @@
{ fetchFromGitHub }:
rec {
# When you bump this, you should make sure all nemo-extensions
# are actually using this file since we try to deal with tags
# like nemo-fileroller-5.6.1 according to upstream's wishes.
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY=";
};
}

4
pkgs/desktops/cinnamon/nemo/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "5.6.5";
version = "5.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-HdDe2VE9LQqiwFrUSIctOi/ffNOmLy6SyG30EL8UA5Q=";
sha256 = "sha256-Be67TOA1gLwSYx8y2iyfvY0QCpWOFutpXMDaPiTRQGg=";
};
patches = [

105
pkgs/desktops/cinnamon/pix/default.nix
View File

@ -1,70 +1,99 @@
{ stdenv
, lib
, fetchurl
, fetchFromGitHub
, autoreconfHook
, cinnamon-desktop
, file
, gdk-pixbuf
, glib
, gobject-introspection
, gtk-doc
, gtk3
, intltool
, itstool
, libtool
, libxml2
, pkg-config
, shared-mime-info
, wrapGAppsHook
, xapp
, yelp-tools
, meson
, ninja
, exiv2
, libheif
, libjpeg
, libtiff
, gst_all_1
, libraw
, libsoup
, libsecret
, webkitgtk
, libwebp
, glib
, gtk3
, gsettings-desktop-schemas
, librsvg
, libwebp
, json-glib
, gnome
, clutter
, webkitgtk
, lcms2
, bison
, flex
, clutter-gtk
, wrapGAppsHook
, shared-mime-info
, python3
, desktop-file-utils
, itstool
, xapp
}:
stdenv.mkDerivation rec {
pname = "pix";
version = "2.8.9";
version = "3.0.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-7g0j1cWgNtWlqKWzBnngUA2WNr8Zh8YO/jJ8OdTII7Y=";
sha256 = "sha256-sKmdJOuT4Ioy5DmWN9ly+9bqSn4frcVPD5qMTKtxtiQ=";
};
nativeBuildInputs = [
wrapGAppsHook
autoreconfHook
cinnamon-desktop
gdk-pixbuf
gnome.gnome-common
gobject-introspection
gtk-doc
intltool
bison
desktop-file-utils
flex
itstool
libtool
meson
ninja
pkg-config
yelp-tools
python3
wrapGAppsHook
];
buildInputs = [
clutter-gtk
exiv2
glib
gsettings-desktop-schemas
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-libav
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
gtk3
xapp
libsecret
webkitgtk
libwebp
librsvg
json-glib
clutter
lcms2
libheif
libjpeg
libraw
librsvg
libsecret
libsoup
libtiff
libwebp
webkitgtk
xapp
];
postPatch = ''
chmod +x pix/make-pix-h.py
patchShebangs data/gschemas/make-enums.py \
pix/make-pix-h.py \
po/make-potfiles-in.py \
postinstall.py \
pix/make-authors-tab.py
'';
preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
'';
meta = with lib; {
description = "A generic image viewer from Linux Mint";
homepage = "https://github.com/linuxmint/pix";

14
pkgs/desktops/cinnamon/xapp/default.nix
View File

@ -22,7 +22,7 @@
stdenv.mkDerivation rec {
pname = "xapp";
version = "2.4.3";
version = "2.6.1";
outputs = [ "out" "dev" ];
@ -30,9 +30,13 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-j04vy/uVWY08Xdxqfo2MMUAlqsUMJTsAt67+XjkdhFg=";
hash = "sha256-ZxIPiDLcMHEmlnrImctI2ZfH3AIOjB4m/RPGipJ7koM=";
};
# Recommended by upstream, which enables the build of xapp-debug.
# https://github.com/linuxmint/xapp/issues/169#issuecomment-1574962071
mesonBuildType = "debugoptimized";
nativeBuildInputs = [
meson
ninja
@ -70,11 +74,7 @@ stdenv.mkDerivation rec {
postPatch = ''
chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file
patchShebangs \
libxapp/g-codegen.py \
meson-scripts/g-codegen.py \
schemas/meson_install_schemas.py
patchShebangs schemas/meson_install_schemas.py
# Patch pastebin & inxi location
sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info

8
pkgs/desktops/cinnamon/xreader/default.nix
View File

@ -16,7 +16,7 @@
, poppler
, libspectre
, libgxps
, webkitgtk
, webkitgtk_4_1
, nodePackages
, ninja
, gsettings-desktop-schemas
@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "xreader";
version = "3.6.3";
version = "3.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-KuCcOnhM8AzKC8hfBpdcnC/ubDVsElKMZuxEnTcJLn0=";
sha256 = "sha256-ZmaY9FlDIJNQ9jYkUJDnKAgwn5wlQY89eWx3/RJZA7E=";
};
nativeBuildInputs = [
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
poppler
libspectre
libgxps
webkitgtk
webkitgtk_4_1
nodePackages.mathjax
djvulibre
];

4
pkgs/desktops/cinnamon/xviewer/default.nix
View File

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "xviewer";
version = "3.2.12";
version = "3.4.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-tiZeC862gHbZt76sbxseUu9vWN+1huftXpE7lQLkGKU=";
sha256 = "sha256-HVxCBqaKtsEGhGAB+dBCOnjAjLZHv0XqTifPrvoYdj8=";
};
nativeBuildInputs = [

13
pkgs/development/coq-modules/itauto/default.nix
View File

@ -1,16 +1,18 @@
{ lib, mkCoqDerivation, coq, version ? null }:
{ lib, callPackage, mkCoqDerivation, coq, version ? null }:
mkCoqDerivation rec {
(mkCoqDerivation rec {
pname = "itauto";
owner = "fbesson";
domain = "gitlab.inria.fr";
release."8.17.0".sha256 = "sha256-fgdnKchNT1Hyrq14gU8KWYnlSfg3qlsSw5A4+RoA26w=";
release."8.16.0".sha256 = "sha256-4zAUYGlw/pBcLPv2GroIduIlvbfi1+Vy+TdY8KLCqO4=";
release."8.15.0".sha256 = "sha256:10qpv4nx1p0wm9sas47yzsg9z22dhvizszfa21yff08a8fr0igya";
release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9";
release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A=";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isEq "8.17"; out = "8.17.0"; }
{ case = isEq "8.16"; out = "8.16.0"; }
{ case = isEq "8.15"; out = "8.15.0"; }
{ case = isEq "8.14"; out = "8.14.0"; }
@ -21,9 +23,14 @@ mkCoqDerivation rec {
nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
enableParallelBuilding = false;
passthru.tests.suite = callPackage ./test.nix {};
meta = with lib; {
description = "A reflexive SAT solver parameterised by a leaf tactic and Nelson-Oppen support";
maintainers = with maintainers; [ siraben ];
license = licenses.gpl3Plus;
};
}
}).overrideAttrs (o: lib.optionalAttrs
(o.version == "dev" || lib.versionAtLeast o.version "8.16") {
propagatedBuildInputs = [ coq.ocamlPackages.findlib ];
})

27
pkgs/development/coq-modules/itauto/test.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, lib, coq, itauto }:
let excluded =
lib.optionals (lib.versions.isEq "8.16" itauto.version) [ "arith.v" "refl_bool.v" ]
; in
stdenv.mkDerivation {
pname = "coq${coq.coq-version}-itauto-test";
inherit (itauto) src version;
nativeCheckInputs = [ coq itauto ];
dontConfigure = true;
dontBuild = true;
doCheck = true;
checkPhase = ''
cd test-suite
for m in *.v
do
echo -n ${lib.concatStringsSep " " excluded} | grep --silent $m && continue
echo $m && coqc $m
done
'';
installPhase = "touch $out";
}

3
pkgs/development/libraries/libsciter/default.nix
View File

@ -3,14 +3,13 @@
, cairo
, libuuid
, pango
, gdk-pixbuf
, gtk3
, stdenv
, fetchurl
, autoPatchelfHook
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libsciter";
version = "4.4.8.23-bis"; # Version specified in GitHub commit title

11
pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
View File

@ -4,7 +4,6 @@
, meson
, ninja
, pkg-config
, python3
, wrapGAppsHook
, cinnamon
, glib
@ -16,20 +15,19 @@
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-xapp";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "xdg-desktop-portal-xapp";
rev = version;
hash = "sha256-oXV4u/w4MWhKHf5vNbUNcyEJpKVFWcyEs1HEqo6eCyU=";
hash = "sha256-N0LVgk3VT0Fax1GTB7jzFhwzNEeAuyFHAuxXNCo2o3Y=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
python3
wrapGAppsHook
];
@ -46,11 +44,6 @@ stdenv.mkDerivation rec {
"-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
];
postPatch = ''
chmod +x data/meson_install_schemas.py
patchShebangs data/meson_install_schemas.py
'';
meta = with lib; {
description = "Backend implementation for xdg-desktop-portal for Cinnamon, MATE, Xfce";
homepage = "https://github.com/linuxmint/xdg-desktop-portal-xapp";

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.54";
version = "9.2.55";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Wm8LV0R41muvhBNDsnoywI57ZRO022IaPFMZfVS4cPA=";
hash = "sha256-qv6u8QGJ31+BRqYIS2D7zedZPXhjSq8ATi48t63hTko=";
};
nativeBuildInputs = [

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

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.54";
version = "9.2.55";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-5EDVJN8o6Dkb3/QzJJ072RN1kYoMxDhrFnSVAzHzdNc=";
hash = "sha256-Kg3kBE+Ra8efYTdovLnI+xG6sxoUeXetBPR3dF6qvEc=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.54";
version = "9.2.55";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-oAthM9ekGfMnkvX8AlslnABJ+LxjJV8OTTaWxJP3HyI=";
hash = "sha256-GjuQw/5cWlm2TtJ1x6HTT9os75nXG68MMqYtbfSK/i4=";
};
nativeBuildInputs = [

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.54";
version = "9.2.55";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-YZvc2BIc8dAvDFfJ9+DEkfi8pXTFB0gQ5z7irYKZkw8=";
hash = "sha256-D1XkRzOt3yMUEZul74rREptvmyoKwG+wentRMMA5dfE=";
};
nativeBuildInputs = [

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

@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.54";
version = "9.2.55";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-LezNPmHEy+rDGERhGfKuHGwfjAqlfBYxapjnxcY25ug=";
hash = "sha256-X/3ByWxKQJg233GkW0dqSNrInVjy8k1+prjmKPYOupg=";
};
nativeBuildInputs = [

20
pkgs/development/python-modules/openhomedevice/default.nix
View File

@ -1,14 +1,16 @@
{ lib
, aioresponses
, async-upnp-client
, buildPythonPackage
, fetchFromGitHub
, lxml
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "openhomedevice";
version = "2.0.2";
version = "2.1";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -16,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bazwilliams";
repo = pname;
rev = version;
hash = "sha256-D4n/fv+tgdKiU7CemI+12cqoox2hsqRYlCHY7daD5fM=";
rev = "refs/tags/${version}";
hash = "sha256-KNQelldqHx4m8IfgGUwWw/+AVzBotIa7cJGy1SfbRy0=";
};
propagatedBuildInputs = [
@ -25,17 +27,23 @@ buildPythonPackage rec {
lxml
];
# Tests are currently outdated
# https://github.com/bazwilliams/openhomedevice/issues/20
doCheck = false;
nativeCheckInputs = [
aioresponses
pytestCheckHook
];
pythonImportsCheck = [
"openhomedevice"
];
pytestFlagsArray = [
"tests/*.py"
];
meta = with lib; {
description = "Python module to access Linn Ds and Openhome devices";
homepage = "https://github.com/bazwilliams/openhomedevice";
changelog = "https://github.com/bazwilliams/openhomedevice/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.54";
version = "9.2.55";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-0X2K3glUWIJjiThvsTwIPUA3TVf9ret74B3BcAcr9bE=";
hash = "sha256-HNF/UXpXOLr+OcUUaJF2RFaOKG4LHJljvvQKtgigTnE=";
};
nativeBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "regenmaschine";
version = "2023.05.1";
version = "2023.06.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-8+lHfepVvR1+est5RImV4L3PHtME1o8xRX2cI1YpUKI=";
hash = "sha256-W5W/2gBraraZs8ai8tyg3aRWvHt6WOQCVICuiAigae0=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/xmodem/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "xmodem";
version = "0.4.6";
version = "0.4.7";
src = fetchFromGitHub {
owner = "tehmaze";
repo = "xmodem";
rev = version;
sha256 = "1xx7wd8bnswxa1fv3bfim2gcamii79k7qmwg7dbxbjvrhbcjjc0l";
rev = "refs/tags/${version}";
sha256 = "sha256-kwPA/lYiv6IJSKGRuH13tBofZwp19vebwQniHK7A/i8=";
};
nativeCheckInputs = [ pytest which lrzsz ];

14
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -25,14 +25,12 @@ rec {
stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
production = generic {
version = "525.116.04";
sha256_64bit = "sha256-hhDsgkR8/3LLXxizZX7ppjSlFRZiuK2QHrgfTE+2F/4=";
sha256_aarch64 = "sha256-k7k22z5PYZdBVfuYXVcl9SFUMqZmK4qyxoRwlYyRdgU=";
openSha256 = "sha256-dktHCoESqoNfu5M73aY5MQGROlZawZwzBqs3RkOyfoQ=";
settingsSha256 = "sha256-qNjfsT9NGV151EHnG4fgBonVFSKc4yFEVomtXg9uYD4=";
persistencedSha256 = "sha256-ci86XGlno6DbHw6rkVSzBpopaapfJvk0+lHcR4LDq50=";
ibtSupport = true;
version = "535.54.03";
sha256_64bit = "sha256-RUdk9X6hueGRZqNw94vhDnHwYmQ4+xl/cm3DyvBbQII=";
sha256_aarch64 = "sha256-SUxW/Z8sJJ7bc/yhozTh8Wd2gKLsniJwKmXh1tJwUm8=";
openSha256 = "sha256-dp74UiiZfsQbZbAKHgFkLdRNyYbRlVMF3tIXcxok7FU";
settingsSha256 = "sha256-5yIdOAaYQCQ2CmCayD/a5opoQppjK56s9cDqLmm17ww=";
persistencedSha256 = "sha256-R5WCh09BSPjfifui0ODkCsdIXTowceNjLDq5XHwda08=";
};
latest = selectHighestVersion production (generic {

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

@ -10,7 +10,6 @@
, glibcLocales
, testers
, fzf
, fetchpatch
}:
let
@ -25,23 +24,15 @@ let
in
buildGoModule rec {
pname = "fzf";
version = "0.41.1";
version = "0.42.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
hash = "sha256-YnWc+yStyoZoCKxEMhQC6Z4FZ/OVRaVsAJPtAzGiJVk=";
hash = "sha256-+65R7cbj62UXw3ZYXIK9VcAeGnpP4pLigr21awoPLi4=";
};
patches = [
(fetchpatch {
name = "update-test-case.patch";
url = "https://github.com/junegunn/fzf/commit/448d7e0c5a717128d499f6a09a978b7addd1d925.patch";
hash = "sha256-54UYW8x78ZcjPwDWmGLVLxw2E910wme2TkBN7YAr1L8=";
})
];
vendorHash = "sha256-O6OjBbrVAxDQd27ar2mmFkU1XyVM2C8SJWJ54rgaf2s=";
CGO_ENABLED = 0;

4
pkgs/tools/text/rare-regex/default.nix
View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "rare";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "zix99";
repo = "rare";
rev = version;
hash = "sha256-p/L9OL5Eo98PcT5vvODy2xdSH7fuIZJQIAfqhdO490Q=";
hash = "sha256-v3zczT3PMSm2AMKVnVdDxsCpYA8QhZcmOCuiQiz5hFo=";
};
vendorHash = "sha256-wUOtxNjL/4MosACCzPTWKWrnMZhxINfN1ppkRsqDh9M=";