Merge remote-tracking branch 'origin/master' into home-assistant

This commit is contained in:
Martin Weinelt 2021-08-07 01:14:44 +02:00
commit 475f9335f9
191 changed files with 3495 additions and 2466 deletions

View file

@ -21,9 +21,9 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-
- [ ] macOS - [ ] macOS
- [ ] other Linux distributions - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`) - [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [21.11 Release Notes (or backporting 21.05 Relase notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) - [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module - [ ] (Module addition) Added a release notes entry if adding a new NixOS module

View file

@ -13,6 +13,7 @@ In the following is an example expression using `buildGoModule`, the following a
- `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;` - `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;`
- `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. - `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build.
- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums.
```nix ```nix
pet = buildGoModule rec { pet = buildGoModule rec {
@ -112,16 +113,6 @@ done
Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used: Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used:
### `buildFlagsArray` and `buildFlags`: {#ex-goBuildFlags-noarray}
These attributes set build flags supported by `go build`. We recommend using `buildFlagsArray`.
```nix
buildFlagsArray = [
"-tags=release"
];
```
### `ldflags` {#var-go-ldflags} ### `ldflags` {#var-go-ldflags}
Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build`. The most common use case for this argument is to make the resulting executable aware of its own version. For example: Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build`. The most common use case for this argument is to make the resulting executable aware of its own version. For example:
@ -134,6 +125,21 @@ Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build
]; ];
``` ```
### `tags` {#var-go-tags}
Arguments to pass to the Go via the `-tags` argument of `go build`. For example:
```nix
tags = [
"production"
"sqlite"
];
```
```nix
tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ];
```
### `deleteVendor` {#var-go-deleteVendor} ### `deleteVendor` {#var-go-deleteVendor}
Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete.

View file

@ -39,7 +39,7 @@ To add a package from NPM to nixpkgs:
1. Modify `pkgs/development/node-packages/node-packages.json` to add, update 1. Modify `pkgs/development/node-packages/node-packages.json` to add, update
or remove package entries to have it included in `nodePackages` and or remove package entries to have it included in `nodePackages` and
`nodePackages_latest`. `nodePackages_latest`.
2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. 2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`.
3. Build your new package to test your changes: 3. Build your new package to test your changes:
`cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`. `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
To build against the latest stable Current Node.js version (e.g. 14.x): To build against the latest stable Current Node.js version (e.g. 14.x):

View file

@ -4007,6 +4007,16 @@
fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556"; fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556";
}]; }];
}; };
gpanders = {
name = "Gregory Anders";
email = "greg@gpanders.com";
github = "gpanders";
githubId = 8965202;
keys = [{
longkeyid = "rsa2048/0x56E93C2FB6B08BDB";
fingerprint = "B9D5 0EDF E95E ECD0 C135 00A9 56E9 3C2F B6B0 8BDB";
}];
};
gpyh = { gpyh = {
email = "yacine.hmito@gmail.com"; email = "yacine.hmito@gmail.com";
github = "yacinehmito"; github = "yacinehmito";

View file

@ -278,7 +278,10 @@ in
fi fi
''; '';
environment.etc.zinputrc.source = ./zinputrc; # Bug in nix flakes:
# If we use `.source` here the path is garbage collected also we point to it with a symlink
# see https://github.com/NixOS/nixpkgs/issues/132732
environment.etc.zinputrc.text = builtins.readFile ./zinputrc;
environment.systemPackages = environment.systemPackages =
let let

View file

@ -406,7 +406,7 @@ let
${let oath = config.security.pam.oath; in optionalString cfg.oathAuth ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
"auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth
"auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"} "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"}
${optionalString cfg.fprintAuth ${optionalString cfg.fprintAuth
"auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"}
'' + '' +
@ -822,6 +822,16 @@ in
Challenge-Response configurations. See the man-page ykpamcfg(1) for further Challenge-Response configurations. See the man-page ykpamcfg(1) for further
details on how to configure offline Challenge-Response validation. details on how to configure offline Challenge-Response validation.
More information can be found <link
xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>.
'';
};
challengeResponsePath = mkOption {
default = null;
type = types.path;
description = ''
If not null, set the path used by yubico pam module where the challenge expected response is stored.
More information can be found <link More information can be found <link
xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>. xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>.
''; '';

View file

@ -148,7 +148,7 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "time-sync.target" ]; wants = [ "time-sync.target" ];
before = [ "time-sync.target" ]; before = [ "time-sync.target" ];
after = [ "network.target" ]; after = [ "network.target" "nss-lookup.target" ];
conflicts = [ "ntpd.service" "systemd-timesyncd.service" ]; conflicts = [ "ntpd.service" "systemd-timesyncd.service" ];
path = [ chronyPkg ]; path = [ chronyPkg ];

View file

@ -1,6 +1,16 @@
import ./make-test-python.nix ({ pkgs, ...} : import ./make-test-python.nix ({ pkgs, ...} :
{ let
sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" ''
set -eu
readonly CFG=~/.config/Signal/config.json
readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)"
readonly DB="$1"
readonly SQL="SELECT * FROM sqlite_master where type='table'"
${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL"
'';
in {
name = "signal-desktop"; name = "signal-desktop";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ flokli primeos ]; maintainers = [ flokli primeos ];
@ -16,7 +26,9 @@ import ./make-test-python.nix ({ pkgs, ...} :
services.xserver.enable = true; services.xserver.enable = true;
test-support.displayManager.auto.user = "alice"; test-support.displayManager.auto.user = "alice";
environment.systemPackages = with pkgs; [ signal-desktop file ]; environment.systemPackages = with pkgs; [
signal-desktop file sqlite sqlcipher-signal
];
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
}; };
@ -44,11 +56,15 @@ import ./make-test-python.nix ({ pkgs, ...} :
# - https://github.com/NixOS/nixpkgs/issues/108772 # - https://github.com/NixOS/nixpkgs/issues/108772
# - https://github.com/NixOS/nixpkgs/pull/117555 # - https://github.com/NixOS/nixpkgs/pull/117555
print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'")) print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'"))
machine.succeed(
"su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep 'db.sqlite: data'"
)
machine.fail( machine.fail(
"su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database" "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database"
) )
# Only SQLCipher should be able to read the encrypted DB:
machine.fail(
"su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .databases'"
)
print(machine.succeed(
"su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"
))
''; '';
}) })

View file

@ -74,6 +74,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
client.wait_for_unit("multi-user.target") client.wait_for_unit("multi-user.target")
client.wait_until_succeeds("curl -sSf -H Host:nginx.traefik.test http://traefik/")
with subtest("Check that a container can be reached via Traefik"): with subtest("Check that a container can be reached via Traefik"):
assert "Hello from NGINX" in client.succeed( assert "Hello from NGINX" in client.succeed(
"curl -sSf -H Host:nginx.traefik.test http://traefik/" "curl -sSf -H Host:nginx.traefik.test http://traefik/"

View file

@ -39,10 +39,10 @@
elpaBuild { elpaBuild {
pname = "ada-mode"; pname = "ada-mode";
ename = "ada-mode"; ename = "ada-mode";
version = "7.1.5"; version = "7.1.7";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ada-mode-7.1.5.tar"; url = "https://elpa.gnu.org/packages/ada-mode-7.1.7.tar";
sha256 = "037v25mqpg1n52hz89b49vf9zw68fmc0m7l6c1f8vnbw3dibyk8d"; sha256 = "0bzykgzc3kx1dgngishsf9w4czq3ig6wvrv3832zlxb7q3rmw8j2";
}; };
packageRequires = [ emacs uniquify-files wisi ]; packageRequires = [ emacs uniquify-files wisi ];
meta = { meta = {
@ -1007,16 +1007,16 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: ebdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
elpaBuild { elpaBuild {
pname = "ebdb"; pname = "ebdb";
ename = "ebdb"; ename = "ebdb";
version = "0.7"; version = "0.7.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.7.tar"; url = "https://elpa.gnu.org/packages/ebdb-0.7.1.tar";
sha256 = "0q4ywgh87d6hjac3031s21w91gld2hh7s8nbva94dnzwn6y9d0v1"; sha256 = "1z5lh1mib60mvs5kbdsrw2h4whz4n5ad4qkpphs2xjvaz92jgq6s";
}; };
packageRequires = [ cl-lib emacs seq ]; packageRequires = [ emacs seq ];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/ebdb.html"; homepage = "https://elpa.gnu.org/packages/ebdb.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -1420,6 +1420,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
ftable = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ftable";
ename = "ftable";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ftable-1.0.tar";
sha256 = "1qi0fxw94hb7p2s8n2dzbziialbjbjxgpwx2m4mvrmicrq375r5p";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/ftable.html";
license = lib.licenses.free;
};
}) {};
gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }: gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "gcmh"; pname = "gcmh";
@ -1964,16 +1979,16 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: kiwix = callPackage ({ elpaBuild, elquery, emacs, fetchurl, lib, request }:
elpaBuild { elpaBuild {
pname = "kiwix"; pname = "kiwix";
ename = "kiwix"; ename = "kiwix";
version = "1.0.3"; version = "1.1.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/kiwix-1.0.3.tar"; url = "https://elpa.gnu.org/packages/kiwix-1.1.0.tar";
sha256 = "061b816xp8ykqd56z0nvc69aql9y4mba42p6x6vc0j6gr9n3c1j6"; sha256 = "1clp0q34bs395d0hrqdyvm9ds665hgf5qrdiqa14k31h4lbv2wsn";
}; };
packageRequires = [ emacs request ]; packageRequires = [ elquery emacs request ];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/kiwix.html"; homepage = "https://elpa.gnu.org/packages/kiwix.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -2780,10 +2795,10 @@
elpaBuild { elpaBuild {
pname = "phps-mode"; pname = "phps-mode";
ename = "phps-mode"; ename = "phps-mode";
version = "0.4.3"; version = "0.4.6";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.3.tar"; url = "https://elpa.gnu.org/packages/phps-mode-0.4.6.tar";
sha256 = "0yvwfaj7l4z3zgycvnf1j0r5jx4lryaapljbw2sqvwqpbgyiw0y0"; sha256 = "0mfwyz9rwnrs0xcd1jmq1ngdhbwygm6hbfhyr14djywxx0b4hpm5";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -2885,10 +2900,10 @@
elpaBuild { elpaBuild {
pname = "pyim"; pname = "pyim";
ename = "pyim"; ename = "pyim";
version = "3.9.3"; version = "3.9.4";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-3.9.3.tar"; url = "https://elpa.gnu.org/packages/pyim-3.9.4.tar";
sha256 = "0rjaimvbh0fadbqiq4ggyxr0y4pfzld76wb64v7l5874qczn8dfr"; sha256 = "0ggnl2jidcklyhqd5av5kk1f855gsq29wq2nhvp1yjzn35hz6xij";
}; };
packageRequires = [ async emacs xr ]; packageRequires = [ async emacs xr ];
meta = { meta = {
@ -3362,21 +3377,6 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar";
sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/shell-command+.html";
license = lib.licenses.free;
};
}) {};
shelisp = callPackage ({ elpaBuild, fetchurl, lib }: shelisp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "shelisp"; pname = "shelisp";
@ -3392,6 +3392,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar";
sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/shell-command+.html";
license = lib.licenses.free;
};
}) {};
shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "shen-mode"; pname = "shen-mode";
@ -3501,10 +3516,10 @@
elpaBuild { elpaBuild {
pname = "so-long"; pname = "so-long";
ename = "so-long"; ename = "so-long";
version = "1.0"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/so-long-1.0.el"; url = "https://elpa.gnu.org/packages/so-long-1.1.1.tar";
sha256 = "00z9gnxz32rakd0k7lqaj050fwmqzq5vr9d6rb7ji3fn01rjp7kj"; sha256 = "0qgdnkb702mkm886v0zv0hnm5y7zlifgx9ji6xmdsxycpsfkjz1f";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -3775,10 +3790,10 @@
elpaBuild { elpaBuild {
pname = "tramp"; pname = "tramp";
ename = "tramp"; ename = "tramp";
version = "2.5.1"; version = "2.5.1.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.1.tar"; url = "https://elpa.gnu.org/packages/tramp-2.5.1.1.tar";
sha256 = "1r7wifhzy2ipdlc4fqnx6549fnx45ggz57wh0cp7s6y25761si7q"; sha256 = "0v3rvvhjcnyvg6l4vyxz6513mxzvv9n0skkmr62ry8yi5x9wnqp1";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -4224,10 +4239,10 @@
elpaBuild { elpaBuild {
pname = "wisi"; pname = "wisi";
ename = "wisi"; ename = "wisi";
version = "3.1.4"; version = "3.1.5";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/wisi-3.1.4.tar"; url = "https://elpa.gnu.org/packages/wisi-3.1.5.tar";
sha256 = "1j35ln5x3dgypq3hn6xcdpg6vp6yjj6avcjakc2r6wx19vxixciw"; sha256 = "07jc8x6xdhpjv9hlghmvk7ga4gwww33nj5pizlx5scvpp0qvikpy";
}; };
packageRequires = [ emacs seq ]; packageRequires = [ emacs seq ];
meta = { meta = {

View file

@ -41,7 +41,10 @@ self: let
}: let }: let
imported = import generated { imported = import generated {
inherit (self) callPackage; callPackage = pkgs: args: self.callPackage pkgs (args // {
# Use custom elpa url fetcher with fallback/uncompress
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
});
}; };
super = removeAttrs imported [ "dash" ]; super = removeAttrs imported [ "dash" ];
@ -66,7 +69,12 @@ self: let
phases = "unpackPhase " + old.phases; # not a list, interestingly… phases = "unpackPhase " + old.phases; # not a list, interestingly…
srcs = [ srcs = [
super.ada-mode.src super.ada-mode.src
self.wisi.src # ada-mode needs a specific version of wisi, check NEWS or ada-mode's
# package-requires to find the version to use.
(pkgs.fetchurl {
url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar.lz";
sha256 = "18dwcc0crds7aw466vslqicidlzamf8avn59gqi2g7y2x9k5q0as";
})
]; ];
sourceRoot = "ada-mode-${self.ada-mode.version}"; sourceRoot = "ada-mode-${self.ada-mode.version}";
@ -74,6 +82,7 @@ self: let
nativeBuildInputs = [ nativeBuildInputs = [
buildPackages.gnat buildPackages.gnat
buildPackages.gprbuild buildPackages.gprbuild
buildPackages.lzip
]; ];
buildInputs = [ buildInputs = [
@ -81,7 +90,7 @@ self: let
]; ];
preInstall = '' preInstall = ''
./build.sh ./build.sh -j$NIX_BUILD_CORES
''; '';
postInstall = '' postInstall = ''

View file

@ -0,0 +1,21 @@
# Elpa only serves the latest version of a given package uncompressed.
# Once that release is no longer the latest & greatest it gets archived and compressed
# meaning that both the URL and the hash changes.
#
# To work around this issue we fall back to the URL with the .lz suffix and if that's the
# one we downloaded we uncompress the file to ensure the hash matches regardless of compression.
{ fetchurl, lzip }:
{ url, ... }@args: fetchurl ((removeAttrs args [ "url" ]) // {
urls = [
url
(url + ".lz")
];
postFetch = ''
if [[ $url == *.lz ]]; then
${lzip}/bin/lzip -c -d $out > uncompressed
mv uncompressed $out
fi
'';
})

View file

@ -10,7 +10,7 @@ To update the list of packages from nongnu (ELPA),
*/ */
{ lib }: { lib, buildPackages }:
self: let self: let
@ -19,7 +19,10 @@ self: let
}: let }: let
imported = import generated { imported = import generated {
inherit (self) callPackage; callPackage = pkgs: args: self.callPackage pkgs (args // {
# Use custom elpa url fetcher with fallback/uncompress
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
});
}; };
super = imported; super = imported;

View file

@ -52,7 +52,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
} }
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
if [ "${stdenv.hostPlatform.system}" == "x86_64-linux" ]; then if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then
target_size=$(get_file_size bin/fsnotifier64) target_size=$(get_file_size bin/fsnotifier64)
patchelf --set-interpreter "$interpreter" bin/fsnotifier64 patchelf --set-interpreter "$interpreter" bin/fsnotifier64
munge_size_hack bin/fsnotifier64 $target_size munge_size_hack bin/fsnotifier64 $target_size

View file

@ -242,12 +242,12 @@ in
clion = buildClion rec { clion = buildClion rec {
name = "clion-${version}"; name = "clion-${version}";
version = "2021.1.2"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform"; description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "1zx9qwjx7hwjq25y474yj7sxvp9bqnq9l53afs6d4h6131lhjkcz"; /* updated by script */ sha256 = "0im14b52b6hgns964m946q68mvyaq8haldm92s9cn5azh8yg1arc"; /* updated by script */
}; };
wmClass = "jetbrains-clion"; wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@ -255,12 +255,12 @@ in
datagrip = buildDataGrip rec { datagrip = buildDataGrip rec {
name = "datagrip-${version}"; name = "datagrip-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL"; description = "Your Swiss Army Knife for Databases and SQL";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "0lhi3vwhwb359va4sa17y071i03l4mfwqpsp7haqxjf900dcld7d"; /* updated by script */ sha256 = "17fzrn20mkldf74965c7abw3znyxskssdz1k4lciz6q7kn5cvdbf"; /* updated by script */
}; };
wmClass = "jetbrains-datagrip"; wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE"; update-channel = "DataGrip RELEASE";
@ -268,12 +268,12 @@ in
goland = buildGoland rec { goland = buildGoland rec {
name = "goland-${version}"; name = "goland-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Up and Coming Go IDE"; description = "Up and Coming Go IDE";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz"; url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "0xy9k90v3kcm9sj48l809qn0vws4ygsxxyqwsg6y9a3r1raqgqxd"; /* updated by script */ sha256 = "15pxr9w4gs342g9in7a41x0cpb7z68y28hwsamk9ic7yz2qshps8"; /* updated by script */
}; };
wmClass = "jetbrains-goland"; wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE"; update-channel = "GoLand RELEASE";
@ -281,12 +281,12 @@ in
idea-community = buildIdea rec { idea-community = buildIdea rec {
name = "idea-community-${version}"; name = "idea-community-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = lib.licenses.asl20; license = lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "1phpfa9i3k7g92ankmibp53c1469ifnb12g6s8gklln7v7xxakmi"; /* updated by script */ sha256 = "1zki6myy3wbr1sgp1gli263y32g75gna2r9m7baa06zvc6c7j9vw"; /* updated by script */
}; };
wmClass = "jetbrains-idea-ce"; wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE"; update-channel = "IntelliJ IDEA RELEASE";
@ -294,12 +294,12 @@ in
idea-ultimate = buildIdea rec { idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}"; name = "idea-ultimate-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
sha256 = "13c7a96zbw05w1gy4ds4wzac853hdlnbflww2xaz60jnr1k24gnp"; /* updated by script */ sha256 = "0gbx1ngf8i2a0dvysw5g0ikakq4a7gghb4rjk7c99jwzwq9hckjm"; /* updated by script */
}; };
wmClass = "jetbrains-idea"; wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE"; update-channel = "IntelliJ IDEA RELEASE";
@ -307,12 +307,13 @@ in
mps = buildMps rec { mps = buildMps rec {
name = "mps-${version}"; name = "mps-${version}";
version = "2021.1"; /* updated by script */ version = "2021.1.1"; /* updated by script */
versionMajorMinor = "2021.1"; /* updated by script */
description = "Create your own domain-specific language"; description = "Create your own domain-specific language";
license = lib.licenses.asl20; license = lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/mps/${version}/MPS-${version}.tar.gz"; url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz";
sha256 = "0fdh8lzsi2zryi0xs961vrf3l8kqk5imlj56dhifywi7xkhs3vwn"; /* updated by script */ sha256 = "1gp9f4b57pr8c20qxcwax4l0d3w13x4lihxpb9z4agdqjafnc9l6"; /* updated by script */
}; };
wmClass = "jetbrains-mps"; wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE"; update-channel = "MPS RELEASE";
@ -320,12 +321,12 @@ in
phpstorm = buildPhpStorm rec { phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}"; name = "phpstorm-${version}";
version = "2021.1.4"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Professional IDE for Web and PHP developers"; description = "Professional IDE for Web and PHP developers";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "0p9a8l2bpjm25x4af1hlqhmw5xsirsfajznd6y723yqmjy8hs46l"; /* updated by script */ sha256 = "11lm7mja3mc2v329i830j8w1zymlz11sj86qvcg7s4pgc4xwnzd6"; /* updated by script */
}; };
wmClass = "jetbrains-phpstorm"; wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE"; update-channel = "PhpStorm RELEASE";
@ -333,12 +334,12 @@ in
pycharm-community = buildPycharm rec { pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}"; name = "pycharm-community-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "PyCharm Community Edition"; description = "PyCharm Community Edition";
license = lib.licenses.asl20; license = lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz"; url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "0c03grsrjydb6jcnbq1qi4158c14vni3znr7vysnbvldi8al6w8m"; /* updated by script */ sha256 = "075lb50g853791hj8ahhi88zbp07cvfs3zrdahvvif2nd121r1mx"; /* updated by script */
}; };
wmClass = "jetbrains-pycharm-ce"; wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE"; update-channel = "PyCharm RELEASE";
@ -346,12 +347,12 @@ in
pycharm-professional = buildPycharm rec { pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}"; name = "pycharm-professional-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "PyCharm Professional Edition"; description = "PyCharm Professional Edition";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz"; url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "01nwc9nprlyrwyij98px915w66g6vxbznsmmmg56rv3rvjvjp7yl"; /* updated by script */ sha256 = "1l83a8wfqz4xddscpzf7v29rhq9ibx32ximcqrj1cw0i9v7qnv9g"; /* updated by script */
}; };
wmClass = "jetbrains-pycharm"; wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE"; update-channel = "PyCharm RELEASE";
@ -359,12 +360,12 @@ in
rider = buildRider rec { rider = buildRider rec {
name = "rider-${version}"; name = "rider-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.1.5"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "0k2vpndpachq6g767v2dwfa3xc8mssv0i7wwpm05dgqirpn4n0dw"; /* updated by script */ sha256 = "17mxqh6p9jby5qrjqaq5km0j8k1bp8061ch2j059ka3n4ycxy7ph"; /* updated by script */
}; };
wmClass = "jetbrains-rider"; wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE"; update-channel = "Rider RELEASE";
@ -372,12 +373,12 @@ in
ruby-mine = buildRubyMine rec { ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}"; name = "ruby-mine-${version}";
version = "2021.1.2"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE"; description = "The Most Intelligent Ruby and Rails IDE";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "0r80y8y38rdxgc9sim0q2p7bmgxlp4pdxydr0w9gjikwnjxnvz51"; /* updated by script */ sha256 = "169jsd34l83n1pnrhzz548yn7ch1dzxpy8xck7vlymjgrxdqciwi"; /* updated by script */
}; };
wmClass = "jetbrains-rubymine"; wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE"; update-channel = "RubyMine RELEASE";
@ -385,12 +386,12 @@ in
webstorm = buildWebStorm rec { webstorm = buildWebStorm rec {
name = "webstorm-${version}"; name = "webstorm-${version}";
version = "2021.1.2"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Professional IDE for Web and JavaScript development"; description = "Professional IDE for Web and JavaScript development";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "0q4hn6npm0c30v23d30dnphd6wajif0im1b9vjwa121lqi997l34"; /* updated by script */ sha256 = "1whikk1izzvhq1d7kaf2kn4j4qpxn7aq70hlbxr1kb7zs4mzy9x3"; /* updated by script */
}; };
wmClass = "jetbrains-webstorm"; wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE"; update-channel = "WebStorm RELEASE";

View file

@ -60,17 +60,20 @@ sub update_nix_block {
} elsif ($only_free && $block =~ /licenses\.unfree/) { } elsif ($only_free && $block =~ /licenses\.unfree/) {
print("$channel is unfree, skipping\n"); print("$channel is unfree, skipping\n");
} else { } else {
print("updating $channel: $version -> $latest_versions{$channel}\n"); my $version_string = $latest_versions{$channel};
my $versionMajorMinor = $version_string =~ s/^([0-9]+[.][0-9]+).*/$1/r;
print("updating $channel: $version -> $version_string\n");
my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; my ($url) = $block =~ /url\s*=\s*"([^"]+)"/;
# try to interpret some nix # try to interpret some nix
my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; my ($name) = $block =~ /name\s*=\s*"([^"]+)"/;
$name =~ s/\$\{version\}/$latest_versions{$channel}/; $name =~ s/\$\{version\}/$version_string/;
# Some url pattern contain variables more than once # Some url pattern contain variables more than once
$url =~ s/\$\{name\}/$name/g; $url =~ s/\$\{name\}/$name/g;
$url =~ s/\$\{version\}/$latest_versions{$channel}/g; $url =~ s/\$\{version\}/$version_string/g;
$url =~ s/\$\{versionMajorMinor\}/$versionMajorMinor/g;
die "$url still has some interpolation" if $url =~ /\$/; die "$url still has some interpolation" if $url =~ /\$/;
my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/;
my $version_string = $latest_versions{$channel};
unless ( $sha256 ) { unless ( $sha256 ) {
my $full_version = $latest_versions{"full1_" . $channel}; my $full_version = $latest_versions{"full1_" . $channel};
$url =~ s/$version_string/$full_version/; $url =~ s/$version_string/$full_version/;
@ -83,6 +86,7 @@ sub update_nix_block {
print "Jetbrains published SHA256: $sha256\n"; print "Jetbrains published SHA256: $sha256\n";
print "Conversion into base32 yields: $sha256Base32\n"; print "Conversion into base32 yields: $sha256Base32\n";
$block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m; $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m;
$block =~ s#versionMajorMinor\s*=\s*"([^"]+)".+$#versionMajorMinor = "$versionMajorMinor"; /* updated by script */#m;
$block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m; $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m;
} }
} else { } else {

View file

@ -27,7 +27,6 @@ in
version = "1.58.2"; version = "1.58.2";
pname = "vscode"; pname = "vscode";
sourceExecutableName = "code";
executableName = "code" + lib.optionalString isInsiders "-insiders"; executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
shortName = "Code" + lib.optionalString isInsiders " - Insiders"; shortName = "Code" + lib.optionalString isInsiders " - Insiders";

View file

@ -13,23 +13,24 @@
, wrapGAppsHook , wrapGAppsHook
, cairo , cairo
, glib , glib
, goocanvas2 , goocanvas3
, gtk3 , gtk3
, gtksourceview3 , gtksourceview3
, json-glib , json-glib
, libarchive , libarchive
, libgee , libgee
, libxml2 }: , libxml2
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "akira"; pname = "akira";
version = "0.0.13"; version = "0.0.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akiraux"; owner = "akiraux";
repo = "Akira"; repo = "Akira";
rev = "v${version}"; rev = "v${version}";
sha256 = "1i20q78jagy8xky68nmd0n7mqvh88r98kp626rnlgyzvlc3c22cm"; sha256 = "1zbb2bsc6v2rwrbigbkgrzfjmlj96s3ri73zbdcyqg4p08v1w4l6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cairo cairo
glib glib
goocanvas2 goocanvas3
pantheon.granite pantheon.granite
gtk3 gtk3
gtksourceview3 gtksourceview3
@ -67,7 +68,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Native Linux Design application built in Vala and GTK"; description = "Native Linux Design application built in Vala and GTK";
homepage = "https://github.com/akiraux/Akira"; homepage = "https://github.com/akiraux/Akira";
license = licenses.gpl3; license = licenses.gpl3Plus;
maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers; maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers;
platforms = platforms.linux; platforms = platforms.linux;
}; };

View file

@ -26,13 +26,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "megapixels"; pname = "megapixels";
version = "1.1.0"; version = "1.2.0";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~martijnbraam"; owner = "~martijnbraam";
repo = "megapixels"; repo = "megapixels";
rev = version; rev = version;
sha256 = "0y56c6vchlzidfmp3a3bdc228vbhy7zaxvmhkyxchfb752yzr0n3"; sha256 = "0jnfzwvq58p4ksyifma10i158r2fb7fv72ymibgcxbnx596xpjb2";
}; };
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
description = "GTK3 camera application using raw v4l2 and media-requests"; description = "GTK4 camera application that knows how to deal with the media request api";
homepage = "https://sr.ht/~martijnbraam/Megapixels"; homepage = "https://sr.ht/~martijnbraam/Megapixels";
changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}"; changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}";
license = licenses.gpl3Only; license = licenses.gpl3Only;

View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, runtimeShell { stdenv, lib, fetchurl, runtimeShell
, gettext, pkg-config, python3 , gettext, pkg-config, python3
, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
, curl, systemd, libxml2, poppler , curl, systemd, libxml2, poppler, gawk
, sane-drivers , sane-drivers
# List of { src name backend } attibute sets - see installFirmware below: # List of { src name backend } attibute sets - see installFirmware below:
@ -51,6 +51,7 @@ stdenv.mkDerivation {
systemd systemd
libxml2 libxml2
poppler poppler
gawk
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,9 +1,9 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: { buildGoModule, fetchFromGitHub, installShellFiles, lib }:
let let
humioCtlVersion = "0.28.5"; humioCtlVersion = "0.28.6";
sha256 = "sha256-h6zQG9jjHpAxaJUaFoVmRyR1A/bk57CKBIkOGPcdJP0="; sha256 = "sha256-15RRoTr+N+DsILYF1KndAwsW329w+UxHfB1VaWnkEFI=";
vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo="; vendorSha256 = "sha256-fgRQ2n5tzj5s4rT65VIqh61wDwu+x/fWhpaKwyr8XWA=";
in buildGoModule { in buildGoModule {
name = "humioctl-${humioCtlVersion}"; name = "humioctl-${humioCtlVersion}";
pname = "humioctl"; pname = "humioctl";

View file

@ -2,22 +2,22 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.86.1"; version = "0.87.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-2tCR4iabTLD9SynXjUM7+zNsFCCAa/n88brPnZ1DQ0Q="; sha256 = "sha256-2I1PDxbqtaOOlVbr7zhuawaFrFWM/PYt5QJm3N74Noc=";
}; };
vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk="; vendorSha256 = "sha256-0pkQ+VcmK2XLaQ2XJHh5/QftSdud6Eo1nlBK+L92xKU=";
doCheck = false; doCheck = false;
runVend = true; runVend = true;
buildFlags = [ "-tags" "extended" ]; tags = [ "extended" ];
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -3,20 +3,20 @@
}: }:
let let
pname = "josm"; pname = "josm";
version = "18004"; version = "18118";
srcs = { srcs = {
jar = fetchurl { jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "sha256-Cd+/sE6A0MddHeAxy3gx7ev+9UR3ZNcR0tCTmdX2FtY="; sha256 = "01wcbf1mh1gqxnqkc3j6h64h9sz0yd5wiwpyx4ic4d5fwkh65qym";
}; };
macosx = fetchurl { macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip";
sha256 = "sha256-QSVh8043K/f7gPEjosGo/DNj1d75LUFwf6EMeHk68fM="; sha256 = "0i1vglqg49fd3w2bny01l92wj4hvr3y35rrmd1mdff0lc1zhi397";
}; };
pkg = fetchsvn { pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version; rev = version;
sha256 = "sha256-Ic6RtQPqpQIci1IbKgTcFmLfMdPxSVybrEAk+ttM0j8="; sha256 = "0gyj9kdzl920mjdmqjgiscqxyqhnvh22l6sjicf059ga0fsr3ki1";
}; };
}; };
in in

View file

@ -15,7 +15,7 @@ buildGoModule rec {
subPackages = [ "." ]; subPackages = [ "." ];
buildFlags = [ "-tags sqlite" ]; tags = [ "sqlite" ];
doCheck = false; doCheck = false;

View file

@ -1,4 +1,6 @@
{ lib, buildFHSUserEnv, lutris-unwrapped { lib, buildFHSUserEnv, lutris-unwrapped
, extraPkgs ? pkgs: [ ]
, extraLibraries ? pkgs: [ ]
, steamSupport ? true , steamSupport ? true
}: }:
@ -87,7 +89,8 @@ in buildFHSUserEnv {
soundfont-fluid bzip2 game-music-emu soundfont-fluid bzip2 game-music-emu
] ++ qt5Deps pkgs ] ++ qt5Deps pkgs
++ gnomeDeps pkgs ++ gnomeDeps pkgs
++ lib.optional steamSupport pkgs.steam; ++ lib.optional steamSupport pkgs.steam
++ extraPkgs pkgs;
multiPkgs = pkgs: with pkgs; [ multiPkgs = pkgs: with pkgs; [
# Common # Common
@ -110,7 +113,8 @@ in buildFHSUserEnv {
# Winetricks # Winetricks
fribidi fribidi
] ++ xorgDeps pkgs; ] ++ xorgDeps pkgs
++ extraLibraries pkgs;
extraInstallCommands = '' extraInstallCommands = ''
mkdir -p $out/share mkdir -p $out/share

View file

@ -60,6 +60,11 @@ stdenv.mkDerivation rec {
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a"; url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a";
sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6"; sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6";
}) })
(fetchpatch {
name = "CVE-2021-37220.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=f5712c9949d026e4b891b25837edd2edc166151f";
sha256 = "1zyw6w6zr7k2akpzkyycj2zzw3y5qc7afsn1ysklfj2rvb6cnsx3";
})
]; ];
postPatch = '' postPatch = ''

View file

@ -8,17 +8,18 @@
, pkg-config , pkg-config
, swaylock , swaylock
, makeWrapper , makeWrapper
, gtk-layer-shell
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nwg-launchers"; pname = "nwg-launchers";
version = "0.4.4"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nwg-piotr"; owner = "nwg-piotr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-krhFtFQZSwfKPHmVxPGNySPL2Y9+kA0fxjZ/D+mNks4="; sha256 = "sha256-ZtlAs7McVQKH626h2iOhjpVaiEHeaqs9ncZ6/KnGibg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtkmm3 gtkmm3
nlohmann_json nlohmann_json
gtk-layer-shell
]; ];
postInstall = '' postInstall = ''

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nwg-menu"; pname = "nwg-menu";
version = "unstable-2021-06-12"; version = "0.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nwg-piotr"; owner = "nwg-piotr";
repo = "nwg-menu"; repo = "nwg-menu";
rev = "b0746e26514a047ed9c6b975a71b7263aa39bd56"; rev = "v${version}";
hash = "sha256-rxyf3CfpfWnRAlIR/pl+s7LGAZbZjdtNWPPK7BecdhQ="; sha256 = "sha256-M948RGU9/PwUtFRmf1Po7KlrGxqRPiOZKfS1Vv3vqW8=";
}; };
vendorSha256 = "sha256-nN5iBleK12SKY9PBiDA+tM4B8FiVGZLXbtJM2+YrEfA="; vendorSha256 = "sha256-AnYtqSe8mq10FQ071GEVh65MaWek5gYlR+9d8yL0RAc=";
runVend = true; runVend = true;

View file

@ -13,13 +13,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "nwg-panel"; pname = "nwg-panel";
version = "0.3.2"; version = "0.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nwg-piotr"; owner = "nwg-piotr";
repo = "nwg-panel"; repo = "nwg-panel";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-x5lGVF6eRhOVXrsBatdsiUiWs/+FxRlCtp79zA206RY="; sha256 = "sha256-+zJNTFYNIJKa5jK/215MoxjMKScCdWAAh4cQjEise/Q=";
}; };
# No tests # No tests

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "nwg-wrapper"; pname = "nwg-wrapper";
version = "0.0.1"; version = "0.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nwg-piotr"; owner = "nwg-piotr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1rpkcjr0chmgsfkan88lsi476bamg9a6y7h0x9zsh60a9rdf7dl8"; sha256 = "sha256-LkAB0MrwQxP3X7glfSnI0GZMv8tjaeSOz7WSOW33wuo=";
}; };
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rofi-file-browser-extended"; pname = "rofi-file-browser-extended";
version = "1.1.1"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "marvinkreis"; owner = "marvinkreis";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn"; sha256 = "1grcal8ga4gpaj3p1dvx4zmqai93jjz2izpj91lxwj0dbz1gmbdm";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -21,8 +21,7 @@ buildGoModule rec {
buildInputs = [ unixODBC icu ]; buildInputs = [ unixODBC icu ];
# These tags and flags are copied from build-release.sh # These tags and flags are copied from build-release.sh
buildFlags = [ "-tags" ]; tags = [
buildFlagsArray = [
"most" "most"
"sqlite_app_armor" "sqlite_app_armor"
"sqlite_fts5" "sqlite_fts5"

View file

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "brave"; pname = "brave";
version = "1.27.109"; version = "1.27.111";
src = fetchurl { src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "RJCGaezucb3LJC1KLG/7vPIF3diVgSTsnylXEN1BaRU="; sha256 = "nQkna1r8wSjTPEWp9RxOz45FVmz97NHzTlb4Hh5lXcs=";
}; };
dontConfigure = true; dontConfigure = true;

View file

@ -18,9 +18,9 @@
} }
}, },
"beta": { "beta": {
"version": "93.0.4577.18", "version": "93.0.4577.25",
"sha256": "1h1ppyizj5vbnrv11iy9vlcpcv8mgb9r8m2zmz6vp7q1ch6w0w4x", "sha256": "09v7wyy9xwrpzmsa030j8jjww30jps3lbvlq4bzppdg04fk6rbsn",
"sha256bin64": "1s5qj0pd79qbchq3awhxc86l9vmi6304z7sd9ls9f8q138789cha", "sha256bin64": "1l86aqym4dxsrp81ppv5cwyki4wnh7cpqy4dw88kdxgqbiwwii27",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-07-08", "version": "2021-07-08",

View file

@ -2,7 +2,7 @@
, replace, fetchurl, zip, unzip, jq, xdg-utils, writeText , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText
## various stuff that can be plugged in ## various stuff that can be plugged in
, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
, gnome/*.gnome-shell*/ , gnome/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
, tridactyl-native , tridactyl-native
@ -49,6 +49,8 @@ let
gssSupport = browser.gssSupport or false; gssSupport = browser.gssSupport or false;
alsaSupport = browser.alsaSupport or false; alsaSupport = browser.alsaSupport or false;
pipewireSupport = browser.pipewireSupport or false; pipewireSupport = browser.pipewireSupport or false;
# PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards
smartcardSupport = cfg.smartcardSupport or false;
nativeMessagingHosts = nativeMessagingHosts =
([ ] ([ ]
@ -70,6 +72,7 @@ let
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ]) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ])
++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional (config.pulseaudio or true) libpulseaudio
++ lib.optional alsaSupport alsa-lib ++ lib.optional alsaSupport alsa-lib
++ lib.optional smartcardSupport opensc
++ pkcs11Modules; ++ pkcs11Modules;
gtk_modules = [ libcanberra-gtk3 ]; gtk_modules = [ libcanberra-gtk3 ];
@ -120,6 +123,10 @@ let
ret ++ [ "${e.outPath}/${e.extid}.xpi" ] ret ++ [ "${e.outPath}/${e.extid}.xpi" ]
) [] extensions; ) [] extensions;
}; };
} // lib.optionalAttrs smartcardSupport {
SecurityDevices = {
"OpenSC PKCS#11 Module" = "onepin-opensc-pkcs11.so";
};
} }
// extraPolicies; // extraPolicies;
}; };

View file

@ -15,8 +15,8 @@ buildGoModule rec {
doCheck = false; doCheck = false;
buildFlagsArray = [ ldflags = [
"-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}" "-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}"
]; ];
subPackages = [ subPackages = [

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "fluxctl"; pname = "fluxctl";
version = "1.23.1"; version = "1.23.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weaveworks"; owner = "weaveworks";
repo = "flux"; repo = "flux";
rev = version; rev = version;
sha256 = "sha256-PcDipeW+ebGm6w/htjyx1/PXaanh2gp3EyHkcLY9peo="; sha256 = "sha256-Ypy462QYmRiQrnOYjBA4BrtPKMT7sNpWb4St3KMVqbI=";
}; };
vendorSha256 = "sha256-CxGa95x742vS+8WxK/I2ZbEn2mJPwpXa5zm3xBNbX4U="; vendorSha256 = "sha256-GUeLbngahbjEXetCfFbwWhn7jtyqKu7I2dyfjKalUM0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -22,8 +22,8 @@ let generic = { channel, version, sha256, vendorSha256 }:
env GOFLAGS="" go generate ./viz/static env GOFLAGS="" go generate ./viz/static
''; '';
buildFlagsArray = [ tags = [
"-tags=prod" "prod"
]; ];
ldflags = [ ldflags = [

View file

@ -21,7 +21,7 @@ buildGoModule rec {
meta = with lib; { meta = with lib; {
homepage = "https://www.github.com/hashicorp/nomad-driver-podman"; homepage = "https://www.github.com/hashicorp/nomad-driver-podman";
description = "Podman task driver for Nomad"; description = "Podman task driver for Nomad";
platforms = platforms.unix; platforms = platforms.linux;
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ cpcloud ]; maintainers = with maintainers; [ cpcloud ];
}; };

View file

@ -6,6 +6,7 @@
, nvidiaGpuSupport , nvidiaGpuSupport
, patchelf , patchelf
, nvidia_x11 , nvidia_x11
, nixosTests
}: }:
buildGoPackage rec { buildGoPackage rec {
@ -29,16 +30,7 @@ buildGoPackage rec {
# ui: # ui:
# Nomad release commits include the compiled version of the UI, but the file # Nomad release commits include the compiled version of the UI, but the file
# is only included if we build with the ui tag. # is only included if we build with the ui tag.
preBuild = tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
let
tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
tagsString = lib.concatStringsSep " " tags;
in
''
export buildFlagsArray=(
-tags="${tagsString}"
)
'';
# The dependency on NVML isn't explicit. We have to make it so otherwise the # The dependency on NVML isn't explicit. We have to make it so otherwise the
# binary will not know where to look for the relevant symbols. # binary will not know where to look for the relevant symbols.
@ -48,6 +40,8 @@ buildGoPackage rec {
done done
''; '';
passthru.tests.nomad = nixosTests.nomad;
meta = with lib; { meta = with lib; {
homepage = "https://www.nomadproject.io/"; homepage = "https://www.nomadproject.io/";
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";

View file

@ -1,10 +1,17 @@
{ lib, stdenv, fetchFromGitHub { lib
, makeWrapper, makeDesktopItem, mkYarnPackage , stdenv
, electron, element-web , fetchFromGitHub
, makeWrapper
, makeDesktopItem
, mkYarnPackage
, electron
, element-web
, callPackage , callPackage
, Security , Security
, AppKit , AppKit
, CoreServices , CoreServices
, useWayland ? false
}: }:
# Notes for maintainers: # Notes for maintainers:
# * versions of `element-web` and `element-desktop` should be kept in sync. # * versions of `element-web` and `element-desktop` should be kept in sync.
@ -20,7 +27,8 @@ let
sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY="; sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY=";
}; };
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in mkYarnPackage rec { in
mkYarnPackage rec {
name = "element-desktop-${version}"; name = "element-desktop-${version}";
inherit version src; inherit version src;
@ -55,6 +63,7 @@ in mkYarnPackage rec {
rm "$out/share/element/electron/node_modules" rm "$out/share/element/electron/node_modules"
cp -r './node_modules' "$out/share/element/electron" cp -r './node_modules' "$out/share/element/electron"
cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
# icons # icons
for icon in $out/share/element/electron/build/icons/*.png; do for icon in $out/share/element/electron/build/icons/*.png; do
@ -68,7 +77,7 @@ in mkYarnPackage rec {
# executable wrapper # executable wrapper
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
--add-flags "$out/share/element/electron" --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}"
''; '';
# Do not attempt generating a tarball for element-web again. # Do not attempt generating a tarball for element-web again.

View file

@ -28,7 +28,7 @@ let
else ""); else "");
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "signal-desktop"; pname = "signal-desktop";
version = "5.12.1"; # Please backport all updates to the stable channel. version = "5.12.2"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release. # All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is # When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with: # applied. The expiration date for the current release can be extracted with:
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "099p0bmaa60dfij5wq9pyfxnhy77cdnfqx4dj4377rzyfmfgnhzx"; sha256 = "0z8nphlm3q9gqri6bqh1iaayx5yy0bhrmjb7l7facdkm1aahmaa7";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage { mkDerivation, lib, fetchFromGitHub, callPackage
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, extra-cmake-modules , extra-cmake-modules
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash , qtbase, qtimageformats, gtk3, kwayland, libdbusmenu, lz4, xxHash
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc , tl-expected, hunspell, glibmm, webkitgtk, jemalloc
, rnnoise , rnnoise
@ -12,8 +12,6 @@
, xdg-utils, libsysprof-capture, libpsl, brotli , xdg-utils, libsysprof-capture, libpsl, brotli
}: }:
with lib;
# Main reference: # Main reference:
# - This package was originally based on the Arch package but all patches are now upstreamed: # - This package was originally based on the Arch package but all patches are now upstreamed:
# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop
@ -59,7 +57,7 @@ in mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash qtbase qtimageformats gtk3 kwayland libdbusmenu lz4 xxHash
ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3
tl-expected hunspell glibmm webkitgtk jemalloc tl-expected hunspell glibmm webkitgtk jemalloc
rnnoise rnnoise
@ -85,7 +83,7 @@ in mkDerivation rec {
wrapProgram $out/bin/telegram-desktop \ wrapProgram $out/bin/telegram-desktop \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \
--prefix PATH : ${xdg-utils}/bin \ --prefix PATH : ${lib.makeBinPath [ xdg-utils]} \
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
sed -i $out/bin/telegram-desktop \ sed -i $out/bin/telegram-desktop \
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
@ -96,7 +94,7 @@ in mkDerivation rec {
updateScript = ./update.py; updateScript = ./update.py;
}; };
meta = { meta = with lib; {
description = "Telegram Desktop messaging app"; description = "Telegram Desktop messaging app";
longDescription = '' longDescription = ''
Desktop client for the Telegram messenger, based on the Telegram API and Desktop client for the Telegram messenger, based on the Telegram API and

View file

@ -2,7 +2,7 @@
, lib , lib
, fetchurl , fetchurl
, makeWrapper , makeWrapper
# Dynamic libraries # Dynamic libraries
, alsa-lib , alsa-lib
, atk , atk
, cairo , cairo
@ -18,22 +18,21 @@
, xorg , xorg
, libxkbcommon , libxkbcommon
, zlib , zlib
# Runtime # Runtime
, coreutils , coreutils
, pciutils , pciutils
, procps , procps
, util-linux , util-linux
, pulseaudioSupport ? true, libpulseaudio ? null , pulseaudioSupport ? true
, libpulseaudio
}: }:
assert pulseaudioSupport -> libpulseaudio != null;
let let
version = "5.7.28852.0718"; version = "5.7.28991.0726";
srcs = { srcs = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
sha256 = "NoB9qxsuGsiwsZ3Y+F3WZpszujPBX/nehtFFI+KPV5E="; sha256 = "w1oeMKADG5+7EV1OXyuEbotrwcVywob82KOXKoRUifA=";
}; };
}; };
@ -65,9 +64,11 @@ let
xorg.libXtst xorg.libXtst
] ++ lib.optional (pulseaudioSupport) libpulseaudio); ] ++ lib.optional (pulseaudioSupport) libpulseaudio);
in stdenv.mkDerivation rec { in
stdenv.mkDerivation rec {
pname = "zoom"; pname = "zoom";
inherit version; inherit version;
src = srcs.${stdenv.hostPlatform.system}; src = srcs.${stdenv.hostPlatform.system};
dontUnpack = true; dontUnpack = true;
@ -118,11 +119,11 @@ in stdenv.mkDerivation rec {
passthru.updateScript = ./update.sh; passthru.updateScript = ./update.sh;
meta = { meta = with lib; {
homepage = "https://zoom.us/"; homepage = "https://zoom.us/";
description = "zoom.us video conferencing application"; description = "zoom.us video conferencing application";
license = lib.licenses.unfree; license = licenses.unfree;
platforms = builtins.attrNames srcs; platforms = builtins.attrNames srcs;
maintainers = with lib.maintainers; [ danbst tadfisher doronbehar ]; maintainers = with maintainers; [ danbst tadfisher doronbehar ];
}; };
} }

View file

@ -21,13 +21,13 @@
mkDerivation rec { mkDerivation rec {
pname = "nextcloud-client"; pname = "nextcloud-client";
version = "3.2.4"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nextcloud"; owner = "nextcloud";
repo = "desktop"; repo = "desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+APRR3Qj8jdDG2wc4hXFF40aTeoLGAXlsCsB4zKDI3Q="; sha256 = "sha256-KMFFRxNQUNcu7Q5515lNbEMyCWIvzXXC//s3WAWxw4g=";
}; };
patches = [ patches = [
@ -70,7 +70,7 @@ mkDerivation rec {
description = "Nextcloud themed desktop client"; description = "Nextcloud themed desktop client";
homepage = "https://nextcloud.com"; homepage = "https://nextcloud.com";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ caugner ]; maintainers = with maintainers; [ caugner kranzes ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -1,6 +1,6 @@
{ atomEnv { atomEnv
, autoPatchelfHook , autoPatchelfHook
, dpkg , squashfsTools
, fetchurl , fetchurl
, makeDesktopItem , makeDesktopItem
, makeWrapper , makeWrapper
@ -12,13 +12,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "termius"; pname = "termius";
version = "7.16.0"; version = "7.17.1";
src = fetchurl { src = fetchurl {
# find the latest version by # find the latest version with
# curl https://deb.termius.com/dists/squeeze/main/binary-amd64/Packages # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.version'
url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; # and the url with
sha256 = "013nli61bk4x4hkhr6gcpzm1y8ycmqk3vr7q0w2dn2bfdwjg559v"; # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_81.snap";
sha256 = "sha256-jNwWQTjUy8nJ8gHlbP9WgDlARWOhTQAA7KAcQNXKhNg=";
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -36,22 +38,33 @@ stdenv.mkDerivation rec {
dontPatchELF = true; dontPatchELF = true;
dontWrapGApps = true; dontWrapGApps = true;
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ]; nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ];
buildInputs = atomEnv.packages; buildInputs = atomEnv.packages;
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = ''
runHook preUnpack
unsquashfs "$src"
runHook postUnpack
'';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
cd squashfs-root
mkdir -p $out/opt/termius
cp -r \
icudtl.dat \
libffmpeg.so \
locales \
resources \
resources.pak \
termius-app \
v8_context_snapshot.bin \
$out/opt/termius
mkdir -p "$out/bin" mkdir -p "$out/share/applications" "$out/share/pixmaps/termius-app.png"
cp -R "opt" "$out"
cp -R "usr/share" "$out/share"
chmod -R g-w "$out"
# Desktop file
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* "$out/share/applications" cp "${desktopItem}/share/applications/"* "$out/share/applications"
cp meta/gui/icon.png $out/share/pixmaps/termius-app.png
runHook postInstall runHook postInstall
''; '';
@ -59,7 +72,7 @@ stdenv.mkDerivation rec {
runtimeDependencies = [ (lib.getLib udev) ]; runtimeDependencies = [ (lib.getLib udev) ];
postFixup = '' postFixup = ''
makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \ makeWrapper $out/opt/termius/termius-app $out/bin/termius-app \
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
''; '';

View file

@ -1,32 +1,57 @@
{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection { lib
, gtksourceview3, libappindicator-gtk3, libnotify }: , python3Packages
, fetchFromGitHub
, wrapGAppsHook
, gobject-introspection
, gtksourceview3
, libappindicator-gtk3
, libnotify
}:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "autokey-${version}"; pname = "autokey";
version = "0.94.1"; version = "0.95.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "autokey"; owner = "autokey";
repo = "autokey"; repo = "autokey";
rev = "v${version}"; rev = "v${version}";
sha256 = "1syxyciyxzs0khbfs9wjgj03q967p948kipw27j1031q0b5z3jxr"; sha256 = "0f0cqfnb49wwdy7zl2f2ypcnd5pc8r8n7z7ssxkq20d4xfxlgamr";
}; };
# Arch requires a similar work around—see
# https://aur.archlinux.org/packages/autokey-py3/?comments=all
patches = [ ./remove-requires-dbus-python.patch ];
# Tests appear to be broken with import errors within the project structure # Tests appear to be broken with import errors within the project structure
doCheck = false; doCheck = false;
# Note: no dependencies included for Qt GUI because Qt ui is poorly nativeBuildInputs = [ wrapGAppsHook ];
# maintained—see https://github.com/autokey/autokey/issues/51
buildInputs = [ wrapGAppsHook gobject-introspection gtksourceview3 buildInputs = [
libappindicator-gtk3 libnotify ]; gobject-introspection
gtksourceview3
libappindicator-gtk3
libnotify
];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
dbus-python pyinotify xlib pygobject3 ]; dbus-python
pyinotify
xlib
pygobject3
];
dontWrapGapps = true;
pythonPath = with python3Packages; requiredPythonModules [ dbus-python xlib pygobject3 ];
postInstall = ''
rm $out/bin/autokey-qt
buildPythonPath "$out $pythonPath"
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
# for autokey-shell ModuleNotFoundError: No module named 'autokey'
--prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages"
--prefix "PYTHONPATH" ":" "$program_PYTHONPATH"
)
'';
meta = { meta = {
homepage = "https://github.com/autokey/autokey"; homepage = "https://github.com/autokey/autokey";

View file

@ -1,81 +0,0 @@
{ lib, stdenv
, fetchFromGitHub
, nix-update-script
, fetchpatch
, meson
, ninja
, pkg-config
, pantheon
, python3
, vala
, appstream-glib
, desktop-file-utils
, gettext
, glib
, gtk3
, libgee
, sqlite
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "envelope";
version = "0.0.4";
src = fetchFromGitHub {
owner = "cjfloss";
repo = pname;
rev = version;
sha256 = "111lq1gijcm7qwpac09q11ymwiw2x3m12a28ki52f28fb1amvffc";
};
nativeBuildInputs = [
appstream-glib
desktop-file-utils
gettext
meson
ninja
vala
pkg-config
python3
wrapGAppsHook
];
buildInputs = [
glib
gtk3
libgee
pantheon.granite
sqlite
];
doCheck = true;
patches = [
# Fix AppData Validation.
# https://github.com/cjfloss/envelope/pull/59
(fetchpatch {
url = "https://github.com/cjfloss/envelope/commit/b6a28eced89b8f944479fcc695aebfb9aae0c691.patch";
sha256 = "11znc8z52kl893n3gmmdpnp3y4vpzmb263m5gp0qxbl3xykq2wzr";
})
];
postPatch = ''
chmod +x data/post_install.py
patchShebangs data/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "Personal finance manager for elementary OS";
homepage = "https://github.com/cjfloss/envelope";
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3Plus;
};
}

View file

@ -1,25 +1,22 @@
{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: { lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }:
#
# TODO: Declare configuration options for the following optional dependencies: # TODO: Declare configuration options for the following optional dependencies:
# - File stores: hg, git, bzr # - File stores: hg, git, bzr
# - Included plugins depenencies: dot, ditaa, dia, any other? # - Included plugins depenencies: dot, ditaa, dia, any other?
# - pyxdg: Need to make it work first (see setupPyInstallFlags). # - pyxdg: Need to make it work first (see setupPyInstallFlags).
#
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "zim-${version}"; pname = "zim";
version = "0.73.1"; version = "0.73.5";
src = fetchurl { src = fetchurl {
url = "https://zim-wiki.org/downloads/${name}.tar.gz"; url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz";
sha256 = "13vhwsgv6mscgixypc0ixkgj0y7cpcm7z7wn1vmdrwp7kn8m3xgx"; sha256 = "sha256-o28V2Sw5lMDVWwf4MlOz2LgmvrNxSGXturwU8cyR1jo=";
}; };
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ];
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
preFixup = '' preFixup = ''
export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped" export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped"
''; '';
@ -28,13 +25,12 @@ python3Packages.buildPythonApplication rec {
doCheck = false; doCheck = false;
checkPhase = '' checkPhase = ''
python test.py ${python3Packages.python.interpreter} test.py
''; '';
meta = with lib; { meta = with lib; {
description = "A desktop wiki"; description = "A desktop wiki";
homepage = "http://zim-wiki.org"; homepage = "https://zim-wiki.org/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ];
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790

View file

@ -5,9 +5,9 @@
} : } :
let let
version = "21.02"; version = "21.06";
# The tag keeps moving, fix a hash instead # The tag keeps moving, fix a hash instead
gitLabRev = "41cee871945ac712e86ee971425a49a8fc60a936"; gitLabRev = "dd982ad4bc94dec8ac1e3e99cb6a7dd249ff71de";
python = python3.withPackages (ps : with ps; [ six pyparsing ]); python = python3.withPackages (ps : with ps; [ six pyparsing ]);
@ -19,7 +19,7 @@ in stdenv.mkDerivation {
owner = "Molcas"; owner = "Molcas";
repo = "OpenMolcas"; repo = "OpenMolcas";
rev = gitLabRev; rev = gitLabRev;
sha256 = "0cap53gy1wds2qaxbijw09fqhvfxphfkr93nhp9xdq84yxh4wzv6"; sha256 = "07dm73n0s7ckif561yb3s9yqxsv39a73kb9qwny4yp39wdvv52hz";
}; };
patches = [ patches = [

View file

@ -0,0 +1,61 @@
{ stdenv
, lib
, pkg-config
, makeWrapper
, texinfo
, fetchurl
, autoreconfHook
, guile
, flex
, gtk2
, glib
, gtkextra
, gettext
, gawk
, shared-mime-info
, groff
, libstroke
}:
stdenv.mkDerivation rec {
pname = "lepton-eda";
version = "1.9.13-20201211";
src = fetchurl {
url = "https://github.com/lepton-eda/lepton-eda/releases/download/${version}/lepton-eda-${builtins.head (lib.splitString "-" version)}.tar.gz";
sha256 = "sha256-9Be3FBWnZU2M5aNQwi3N8M81e0S7n46mwWQh1mrK4Z8=";
};
nativeBuildInputs = [ pkg-config makeWrapper texinfo autoreconfHook ];
propagatedBuildInputs = [ guile flex gtk2 glib gtkextra gettext gawk shared-mime-info groff libstroke ];
configureFlags = [
"--disable-update-xdg-database"
];
CFLAGS = [
"-DSCM_DEBUG_TYPING_STRICTNESS=2"
];
postInstall = ''
libs="${lib.makeLibraryPath propagatedBuildInputs}"
for program in $out/bin/*; do
wrapProgram "$program" \
--prefix LD_LIBRARY_PATH : "$libs" \
--prefix LTDL_LIBRARY_PATH : "$out/lib"
done
'';
meta = with lib; {
homepage = "https://github.com/lepton-eda";
description = "Lepton Electronic Design Automation";
longDescription = ''
Lepton EDA is a suite of free software tools for designing electronics.
It provides schematic capture, netlisting into over 30 netlist formats, and many other features.
'';
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ tesq0 ];
};
}

View file

@ -1,36 +1,48 @@
{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver, libxcb, nss, nspr
, libxcb, nss, nspr, alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk }: , alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk, at-spi2-core, libxshmfence
, libdrm, libxkbcommon, mesa }:
let let
libPath = lib.makeLibraryPath [ libPath = lib.makeLibraryPath [
stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio
at-spi2-atk at-spi2-atk at-spi2-core libxshmfence libdrm libxkbcommon mesa
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.2";
pname = "hyper"; pname = "hyper";
version = "3.1.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb";
sha256 = "0fv4wv5f8nc739bna83qxmgrvvbyq4w9ch764q2f12wjygrz336p"; sha256 = "1mixy9hlgdbbnwdgidady7q828dkf09lx1pacwxw386jj7kp4y5g";
}; };
buildInputs = [ dpkg ];
nativeBuildInputs = [ dpkg ];
unpackPhase = '' unpackPhase = ''
mkdir pkg mkdir pkg
dpkg-deb -x $src pkg dpkg-deb -x $src pkg
sourceRoot=pkg sourceRoot=pkg
''; '';
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
mv opt "$out/" mv opt "$out/"
ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper" ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Hyper:\$ORIGIN" "$out/opt/Hyper/hyper" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Hyper:\$ORIGIN" "$out/opt/Hyper/hyper"
mv usr/* "$out/" mv usr/* "$out/"
substituteInPlace $out/share/applications/hyper.desktop \
--replace "/opt/Hyper/hyper" "hyper"
''; '';
dontPatchELF = true; dontPatchELF = true;
meta = with lib; { meta = with lib; {
description = "A terminal built on web technologies"; description = "A terminal built on web technologies";

View file

@ -1,13 +1,13 @@
{ {
"version": "14.1.1", "version": "14.1.2",
"repo_hash": "1cygdllhqxah7d8lmx4hcx880wijwfvbbs6dfkdzcn0cd3czpcv8", "repo_hash": "1d28minrpgp8awcnx15bm7jv0k27i46wji3pc2d6wh1m0wk74b60",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v14.1.1-ee", "rev": "v14.1.2-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "14.1.1", "GITALY_SERVER_VERSION": "14.1.2",
"GITLAB_PAGES_VERSION": "1.41.0", "GITLAB_PAGES_VERSION": "1.41.0",
"GITLAB_SHELL_VERSION": "13.19.0", "GITLAB_SHELL_VERSION": "13.19.1",
"GITLAB_WORKHORSE_VERSION": "14.1.1" "GITLAB_WORKHORSE_VERSION": "14.1.2"
} }
} }

View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
, gitlabEnterprise ? false, callPackage, yarn , gitlabEnterprise ? false, callPackage, yarn
, fixup_yarn_lock, replace, file , fixup_yarn_lock, replace, file, cacert
}: }:
let let
@ -51,7 +51,7 @@ let
pname = "gitlab-assets"; pname = "gitlab-assets";
inherit version src; inherit version src;
nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git ]; nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ];
# Since version 12.6.0, the rake tasks need the location of git, # Since version 12.6.0, the rake tasks need the location of git,
# so we have to apply the location patches here too. # so we have to apply the location patches here too.

View file

@ -21,14 +21,14 @@ let
}; };
}; };
in buildGoModule rec { in buildGoModule rec {
version = "14.1.1"; version = "14.1.2";
pname = "gitaly"; pname = "gitaly";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-UCWN9TXbfysNLMOU8bDcjrwYtz7+kTCDQmRAl84ysWU="; sha256 = "sha256-7OqTOJDQJ/ojHevj/ld8VLjm5ZRQgCGZKchPrAlOSO8=";
}; };
vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0="; vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0=";
@ -37,7 +37,7 @@ in buildGoModule rec {
inherit rubyEnv; inherit rubyEnv;
}; };
buildFlags = [ "-tags=static,system_libgit2" ]; tags = [ "static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
doCheck = false; doCheck = false;

View file

@ -2,12 +2,12 @@
buildGoModule rec { buildGoModule rec {
pname = "gitlab-shell"; pname = "gitlab-shell";
version = "13.19.0"; version = "13.19.1";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-shell"; repo = "gitlab-shell";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-CmatKArkpDS3GGbIIkKjs4FwywLiU+lRL32GKEpOqZ0="; sha256 = "sha256-F0TW0VjO5hc/lHqZhhMJJvpHazWRyR7Q7W324Fgn7fA=";
}; };
buildInputs = [ ruby ]; buildInputs = [ ruby ];

View file

@ -5,7 +5,7 @@ in
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "14.1.1"; version = "14.1.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = data.owner; owner = data.owner;

View file

@ -798,7 +798,7 @@ GEM
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
numerizer (0.2.0) numerizer (0.2.0)
oauth (0.5.4) oauth (0.5.6)
oauth2 (1.4.7) oauth2 (1.4.7)
faraday (>= 0.8, < 2.0) faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0) jwt (>= 1.0, < 3.0)

View file

@ -3427,10 +3427,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0";
type = "gem"; type = "gem";
}; };
version = "0.5.4"; version = "0.5.6";
}; };
oauth2 = { oauth2 = {
dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];

View file

@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "pijul"; pname = "pijul";
version = "1.0.0-alpha.52"; version = "1.0.0-alpha.53";
src = fetchCrate { src = fetchCrate {
inherit version pname; inherit version pname;
sha256 = "0m759zfh40kxswsv40z1l332lc8lfqppyv8188y4i6biqmgbx8f1"; sha256 = "1y5wnqscyfhd806qs6gfmssm7hvfdi7mxc9p1125jnmzca4wcsm2";
}; };
cargoSha256 = "0f31hw2zjvhkhsb0ykvw4c3d0qy8zirgsaz7yr89hy01rs23bh8z"; cargoSha256 = "0m9zjagq59rxf5pysklal030f4n0dqgmjsgwcnljajxc2r26665h";
cargoBuildFlags = lib.optional gitImportSupport "--features=git"; cargoBuildFlags = lib.optional gitImportSupport "--features=git";

View file

@ -1,13 +0,0 @@
diff -Naur bochs-2.6.10.orig/iodev/network/slirp/slirp.h bochs-2.6.10.mod/iodev/network/slirp/slirp.h
--- bochs-2.6.10.orig/iodev/network/slirp/slirp.h 2019-11-02 16:30:39.843938000 -0300
+++ bochs-2.6.10.mod/iodev/network/slirp/slirp.h 2019-12-29 12:55:49.541630697 -0300
@@ -44,8 +44,8 @@
#endif
#include <sys/types.h>
-#if defined(__OpenBSD__) || defined(__linux__)
#include <stdint.h>
+#if defined(__OpenBSD__) || defined(__linux__)
#include <sys/wait.h>
#endif
#ifdef HAVE_SYS_BITYPES_H

View file

@ -1,29 +0,0 @@
------------------------------------------------------------------------
r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines
Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion).
Index: iodev/display/voodoo_data.h
===================================================================
--- a/iodev/display/voodoo_data.h (revision 13881)
+++ b/iodev/display/voodoo_data.h (revision 13882)
@@ -1837,11 +1837,11 @@
/* fifo content defines */
#define FIFO_TYPES (7 << 29)
-#define FIFO_WR_REG (1 << 29)
-#define FIFO_WR_TEX (2 << 29)
-#define FIFO_WR_FBI_32 (3 << 29)
-#define FIFO_WR_FBI_16L (4 << 29)
-#define FIFO_WR_FBI_16H (5 << 29)
+#define FIFO_WR_REG (1U << 29)
+#define FIFO_WR_TEX (2U << 29)
+#define FIFO_WR_FBI_32 (3U << 29)
+#define FIFO_WR_FBI_16L (4U << 29)
+#define FIFO_WR_FBI_16H (5U << 29)
BX_CPP_INLINE void fifo_reset(fifo_state *f)
{
------------------------------------------------------------------------

View file

@ -20,22 +20,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bochs"; pname = "bochs";
version = "2.6.11"; version = "2.7";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/project/bochs/bochs/${version}/bochs-${version}.tar.gz";
sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3"; hash = "sha256-oBCrG/3HKsWgjS4kEs1HHA/r1mrx2TSbwNeWh53lsXo=";
}; };
patches = [
# A flip between two lines of code, in order to compile with GLIBC 2.26
./bochs-2.6.11-glibc-2.26.patch
# Fix compilation for MSYS2 GCC 10; remove it when the next version arrives
./bochs_fix_narrowing_conv_warning.patch
# SMP-enabled configs; remove it when the next version arrives
./fix-build-smp.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
docbook_xml_dtd_45 docbook_xml_dtd_45
docbook_xsl docbook_xsl
@ -62,7 +53,6 @@ stdenv.mkDerivation rec {
"--with-rfb=no" "--with-rfb=no"
"--with-vncsrv=no" "--with-vncsrv=no"
"--with-svga=no" # it doesn't compile on NixOS
# These will always be "yes" on NixOS # These will always be "yes" on NixOS
"--enable-ltdl-install=yes" "--enable-ltdl-install=yes"
@ -92,7 +82,6 @@ stdenv.mkDerivation rec {
"--enable-cpu-level=6" # from 3 to 6 "--enable-cpu-level=6" # from 3 to 6
"--enable-debugger" #conflicts with gdb-stub option "--enable-debugger" #conflicts with gdb-stub option
"--enable-debugger-gui" "--enable-debugger-gui"
"--enable-disasm"
"--enable-e1000" "--enable-e1000"
"--enable-es1370" "--enable-es1370"
"--enable-evex" "--enable-evex"
@ -105,7 +94,7 @@ stdenv.mkDerivation rec {
"--enable-largefile" "--enable-largefile"
"--enable-ne2000" "--enable-ne2000"
"--enable-pci" "--enable-pci"
"--enable-plugins=no" # Plugins are a bit buggy in Bochs "--enable-plugins=yes"
"--enable-pnic" "--enable-pnic"
"--enable-repeat-speedups" "--enable-repeat-speedups"
"--enable-sb16" "--enable-sb16"
@ -126,11 +115,6 @@ stdenv.mkDerivation rec {
++ lib.optionals (ncurses != null) [ "--with-term" ] ++ lib.optionals (ncurses != null) [ "--with-term" ]
++ lib.optionals (gtk2 != null && wxGTK != null) [ "--with-wx" ]; ++ lib.optionals (gtk2 != null && wxGTK != null) [ "--with-wx" ];
NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/";
NIX_LDFLAGS="-L${libtool.lib}/lib";
hardeningDisable = [ "format" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
@ -146,5 +130,5 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }
# TODO: plugins
# TODO: a better way to organize the options # TODO: a better way to organize the options
# TODO: docbook (install docbook-tools from RedHat mirrors can help)

View file

@ -1,21 +0,0 @@
Description: A fix for SMP-enable configurations
Inspired in: https://sourceforge.net/p/bochs/code/13778/
============
diff -Naur bochs-2.6.11-old/bx_debug/dbg_main.cc bochs-2.6.11-new/bx_debug/dbg_main.cc
--- bochs-2.6.11-old/bx_debug/dbg_main.cc 2019-12-20 04:57:59.818924000 -0300
+++ bochs-2.6.11-new/bx_debug/dbg_main.cc 2020-03-30 23:20:29.402195707 -0300
@@ -1494,11 +1494,11 @@
{
char cpu_param_name[16];
- Bit32u index = BX_ITLB_INDEX_OF(laddr);
+ Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr);
sprintf(cpu_param_name, "ITLB.entry%d", index);
bx_dbg_show_param_command(cpu_param_name, 0);
- index = BX_DTLB_INDEX_OF(laddr, 0);
+ index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr);
sprintf(cpu_param_name, "DTLB.entry%d", index);
bx_dbg_show_param_command(cpu_param_name, 0);
}

View file

@ -21,7 +21,7 @@ buildGoModule rec {
doCheck = false; doCheck = false;
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; ldflags = [ "-s" "-w" "-X main.version=${version}" ];
nativeBuildInputs = [ go-md2man installShellFiles ]; nativeBuildInputs = [ go-md2man installShellFiles ];

View file

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pkg-config , pkg-config
, meson , meson
, ninja , ninja
@ -22,43 +21,34 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "labwc"; pname = "labwc";
version = "0.2.1"; # We're effectively using that version version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johanmalm"; owner = "johanmalm";
repo = pname; repo = pname;
rev = "6744e103014bcb0480133a029ec0f82f9b017e60"; rev = version;
sha256 = "0sdr4zkix8x3vmna4i946y3whpj7fqizpaac6yj7w0as9d6hj0iq"; sha256 = "sha256-v8LGiQG/n1IXeVMPWyiP9MgZzZLW78JftvxnRVTswaM=";
}; };
patches = [ nativeBuildInputs = [
# To fix the build with wlroots 0.14: meson
(fetchpatch { ninja
# output: access texture width/height directly pkg-config
url = "https://github.com/johanmalm/labwc/commit/892e93dd84c514b4e6f34a0fab01c727edd2d8de.patch"; scdoc
sha256 = "1p1pg1kd98727wlcspa2sffl7ijhvsfad6bj2rxsw322q0bz3yrh";
})
(fetchpatch {
# xdg: chase swaywm/wlroots@9e58301
url = "https://github.com/johanmalm/labwc/commit/874cc9e63706dd54d9f9fcb071f2d2e0c19d3d7e.patch";
sha256 = "0ypd47q5ffq4wjkrcr3068qjknn2s66zszyxg3dl0f87q2pxh6wx";
})
]; ];
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
buildInputs = [ buildInputs = [
cairo cairo
glib glib
libdrm
libinput libinput
libxcb
libxkbcommon
libxml2 libxml2
pango pango
wayland wayland
wayland-protocols wayland-protocols
wlroots wlroots
libxcb
libxkbcommon
xwayland xwayland
libdrm
]; ];
mesonFlags = [ "-Dxwayland=enabled" ]; mesonFlags = [ "-Dxwayland=enabled" ];

View file

@ -1,17 +1,22 @@
{ lib, fetchzip }: { lib, fetchFromGitHub }:
let let
version = "3.001"; version = "3.101";
in fetchzip rec { in fetchFromGitHub rec {
name = "comfortaa-${version}"; name = "comfortaa-${version}";
url = "https://orig00.deviantart.net/40a3/f/2017/093/d/4/comfortaa___font_by_aajohan-d1qr019.zip"; owner = "googlefonts";
repo = "comfortaa";
rev = version;
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts $out/share/doc tar -xf $downloadedFile --strip=1
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype mkdir -p $out/share/fonts/truetype $out/share/doc/comfortaa
unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name} cp fonts/TTF/*.ttf $out/share/fonts/truetype
cp FONTLOG.txt README.md $out/share/doc/comfortaa
''; '';
sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h";
sha256 = "06jhdrfzl01ma085bp354g002ypmkbp6a51jn1lsj77zfj2mfmfc";
meta = with lib; { meta = with lib; {
homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949";

View file

@ -1,13 +1,14 @@
{ lib, fetchzip }: { lib, fetchzip }:
fetchzip { let version = "4.202";
name = "fira-mono-3.206"; in fetchzip {
name = "fira-mono-${version}";
url = "https://github.com/mozilla/Fira/archive/4.106.zip"; url = "https://github.com/mozilla/Fira/archive/${version}.zip";
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts mkdir -p $out/share/fonts
unzip -j $downloadedFile Fira-4.106/otf/FiraMono\*.otf -d $out/share/fonts/opentype unzip -j $downloadedFile Fira-${version}/otf/FiraMono\*.otf -d $out/share/fonts/opentype
''; '';
sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj";

View file

@ -4,16 +4,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unifont"; pname = "unifont";
version = "13.0.05"; version = "13.0.06";
ttf = fetchurl { ttf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
sha256 = "0ff7zbyqi45q0171rl9ckj6lpfhcj8a9850d8j89m7wbwky32isf"; sha256 = "0hp72lcj8q8cw490lxl5y1ygw9mcicryjwqr1mmkdz8zh4jh8g6p";
}; };
pcf = fetchurl { pcf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
sha256 = "16n666p6rs6l4r8grh67gy4ls33qfnbb5xk7cksywzjwdh42js0r"; sha256 = "0y030km1x8mai8zrk661dqsb0yq8rpx6akl7p2sw5ijkcdsfm85f";
}; };
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
@ -43,10 +43,10 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Unicode font for Base Multilingual Plane"; description = "Unicode font for Base Multilingual Plane";
homepage = "http://unifoundry.com/unifont.html"; homepage = "https://unifoundry.com/unifont/";
# Basically GPL2+ with font exception. # Basically GPL2+ with font exception.
license = "http://unifoundry.com/LICENSE.txt"; license = "https://unifoundry.com/LICENSE.txt";
maintainers = [ maintainers.rycee maintainers.vrthra ]; maintainers = [ maintainers.rycee maintainers.vrthra ];
platforms = platforms.all; platforms = platforms.all;
}; };

View file

@ -1,7 +1,7 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "13.0.05"; version = "13.0.06";
in fetchzip rec { in fetchzip rec {
name = "unifont_upper-${version}"; name = "unifont_upper-${version}";
@ -9,14 +9,14 @@ in fetchzip rec {
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
sha256 = "1cpi44fzsiq3yqg38763awgri1ma46421c3v8167bsxzsx7vzlkp"; sha256 = "0bqw30h5b787dw8bn1dj8shz22mlxr1zmcfp68fpyll5vg02540n";
meta = with lib; { meta = with lib; {
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
homepage = "http://unifoundry.com/unifont.html"; homepage = "https://unifoundry.com/unifont/";
# Basically GPL2+ with font exception. # Basically GPL2+ with font exception.
license = "http://unifoundry.com/LICENSE.txt"; license = "https://unifoundry.com/LICENSE.txt";
maintainers = [ maintainers.mathnerd314 maintainers.vrthra ]; maintainers = [ maintainers.mathnerd314 maintainers.vrthra ];
platforms = platforms.all; platforms = platforms.all;
}; };

View file

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 { fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
, wrapGAppsHook, libgee }: , wrapGAppsHook, libgee, vala_0_40 }:
let let
pname = "caribou"; pname = "caribou";
@ -21,9 +21,19 @@ in stdenv.mkDerivation rec {
url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; url = "https://bugzilla.gnome.org/attachment.cgi?id=364774";
sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd";
}) })
(fetchurl {
name = "fix-build-modern-vala.patch";
url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.patch";
sha256 = "0qy27zk7889hg51nx40afgppcx9iaihxbg3aqz9w35d6fmhr2k2y";
})
(fetchurl {
name = "CVE-2021-3567.patch";
url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/d41c8e44b12222a290eaca16703406b113a630c6.patch";
sha256 = "1vd2j3823k2p3msv7fq2437p3jvxzbd7hyh07i80g9754ylh92y8";
})
]; ];
nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala_0_40 ];
buildInputs = [ buildInputs = [
glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3

View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.3/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.4/ -A '*.tar.xz' )

View file

@ -4,427 +4,427 @@
{ {
bluedevil = { bluedevil = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/bluedevil-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/bluedevil-5.22.4.tar.xz";
sha256 = "1qgq4c3c1jmhssq9yllx69df58a884w39ng9z2ddl3kvph6c1f4m"; sha256 = "10bqk46ygnf72aqxxaxlx4khv1gwj46la1czsjmlszvkcqxrpwa0";
name = "bluedevil-5.22.3.tar.xz"; name = "bluedevil-5.22.4.tar.xz";
}; };
}; };
breeze = { breeze = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/breeze-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/breeze-5.22.4.tar.xz";
sha256 = "1r10y41l6l2xhmwvy2q03icp6b4163pav98bdrwysrx7pvlj131b"; sha256 = "1b4zrwpaayd6mlwsnwg416ryba32zpg8w2dlh56qbmg6jxzjnybx";
name = "breeze-5.22.3.tar.xz"; name = "breeze-5.22.4.tar.xz";
}; };
}; };
breeze-grub = { breeze-grub = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/breeze-grub-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/breeze-grub-5.22.4.tar.xz";
sha256 = "06i0k2s7arfwjzcr972c1zs2kpkxvl57ih9nz5idd0lshamc36gy"; sha256 = "19zlhq3k80id676sxlf8nhk0a11rkrwmbd256aggdwhz1fivxc1c";
name = "breeze-grub-5.22.3.tar.xz"; name = "breeze-grub-5.22.4.tar.xz";
}; };
}; };
breeze-gtk = { breeze-gtk = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/breeze-gtk-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/breeze-gtk-5.22.4.tar.xz";
sha256 = "1gvx1ip8jkc7pj6bciy3514bkmlazliz60sxdab8b6m00lb0rwng"; sha256 = "1p47vsr2xj00p1r2jhyns2wzchjlhymzzyv2xqy9xd4l8pkv8scb";
name = "breeze-gtk-5.22.3.tar.xz"; name = "breeze-gtk-5.22.4.tar.xz";
}; };
}; };
breeze-plymouth = { breeze-plymouth = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/breeze-plymouth-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/breeze-plymouth-5.22.4.tar.xz";
sha256 = "03px2jk50plalpnzj6xsbkpqxmj5vkxl7r6y60g7dxf6d4hv15dr"; sha256 = "0b9sjn8lfhgyc2sz1r9rnknkas79526qmwi5j3wbxb0va2rcap9z";
name = "breeze-plymouth-5.22.3.tar.xz"; name = "breeze-plymouth-5.22.4.tar.xz";
}; };
}; };
discover = { discover = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/discover-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/discover-5.22.4.tar.xz";
sha256 = "1893wwq4m40z6k64n97vqgxkhwcgbhw4q5m5cs0dpczx1803sa8y"; sha256 = "0ij7b1fyv9rgiw6ywgxzj35c9bd3937w3njzqmkzi2l9zlnrzwvg";
name = "discover-5.22.3.tar.xz"; name = "discover-5.22.4.tar.xz";
}; };
}; };
drkonqi = { drkonqi = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/drkonqi-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/drkonqi-5.22.4.tar.xz";
sha256 = "09jf0rdpb1k2fbbqg3p5ypk7jhp2nls19x1zc8rphnsr1hwxxsb3"; sha256 = "1dy5v50icnlwa4pl5z30q5abv2sbznlrpgiy28hh1mf64hx6hl3w";
name = "drkonqi-5.22.3.tar.xz"; name = "drkonqi-5.22.4.tar.xz";
}; };
}; };
kactivitymanagerd = { kactivitymanagerd = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kactivitymanagerd-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kactivitymanagerd-5.22.4.tar.xz";
sha256 = "1i2hs9204vi41d3jb6hr050g9v0jm5in07nqyxy1wxw2bmpncisx"; sha256 = "1km0mlqyrvflq45gwffrbwvkrqirb44qn1rp37iif4d82pmx11yv";
name = "kactivitymanagerd-5.22.3.tar.xz"; name = "kactivitymanagerd-5.22.4.tar.xz";
}; };
}; };
kde-cli-tools = { kde-cli-tools = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kde-cli-tools-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kde-cli-tools-5.22.4.tar.xz";
sha256 = "1w5c65fd0p2xz185prkrr6ys0cy3wasfkbfv1q4qiniwxjipa3q4"; sha256 = "1kh8pba9q61qjjpc945nvx42mm63vrj5bny4iv60jgcfxxwy7qj4";
name = "kde-cli-tools-5.22.3.tar.xz"; name = "kde-cli-tools-5.22.4.tar.xz";
}; };
}; };
kdecoration = { kdecoration = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kdecoration-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kdecoration-5.22.4.tar.xz";
sha256 = "1bgygqi37yc34nhlf5w32zgz0qvrga9kh7ickxc2gydslvjwaq5p"; sha256 = "0cc0lskm359lbg93bxny84cf1qnk0h53f64bxy3dvbyn5gmvzsch";
name = "kdecoration-5.22.3.tar.xz"; name = "kdecoration-5.22.4.tar.xz";
}; };
}; };
kde-gtk-config = { kde-gtk-config = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kde-gtk-config-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kde-gtk-config-5.22.4.tar.xz";
sha256 = "1mq10qbp3jm4mdbkday1afwa0nj9zx8clvaw51qxprcphg4csjy8"; sha256 = "0d56brzpk5yi7cdyvpqg3jlk5n3l2dvk98npw34fd4i3gw357px8";
name = "kde-gtk-config-5.22.3.tar.xz"; name = "kde-gtk-config-5.22.4.tar.xz";
}; };
}; };
kdeplasma-addons = { kdeplasma-addons = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kdeplasma-addons-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kdeplasma-addons-5.22.4.tar.xz";
sha256 = "1hd3lv9sjlhab91lsxbg6rkgjcp50zy7n3sj51hdcbsdi8fjr9nh"; sha256 = "1flf4mq0zcjh7fnv155hklliidfvflh20d1s84rj8q2ka7phcwk0";
name = "kdeplasma-addons-5.22.3.tar.xz"; name = "kdeplasma-addons-5.22.4.tar.xz";
}; };
}; };
kgamma5 = { kgamma5 = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kgamma5-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kgamma5-5.22.4.tar.xz";
sha256 = "1v7jak4bpj5vhzqzq07v9v6b24xqp52k00dx43w2dhsh0vaas9sc"; sha256 = "0fgx9i031iqrp7w7v7px1vha079cjcdv9w5ah4k1m53g8abriddl";
name = "kgamma5-5.22.3.tar.xz"; name = "kgamma5-5.22.4.tar.xz";
}; };
}; };
khotkeys = { khotkeys = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/khotkeys-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/khotkeys-5.22.4.tar.xz";
sha256 = "0070nk02nwsbnikvf7qjw0wdxkpfv6nvyv1sw68whnm0xjgxnkl5"; sha256 = "1lm1xrbrpym7nhvnzljdgr5nsas8z3i0hgda53j5k6svzk5r3qg8";
name = "khotkeys-5.22.3.tar.xz"; name = "khotkeys-5.22.4.tar.xz";
}; };
}; };
kinfocenter = { kinfocenter = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kinfocenter-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kinfocenter-5.22.4.tar.xz";
sha256 = "1qkbhic99ddd55z3wvnhx1ykiy2ydanw32gs7gww8i0adwh0jc3b"; sha256 = "14vfz5j3fxhfb1fip00fgg9k6dc9ffjf0ss8ij1cx7bga14nmzvw";
name = "kinfocenter-5.22.3.tar.xz"; name = "kinfocenter-5.22.4.tar.xz";
}; };
}; };
kmenuedit = { kmenuedit = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kmenuedit-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kmenuedit-5.22.4.tar.xz";
sha256 = "1ldvx0mvzx3ym7aqz9hk044nn33b97n5bh757v8kwi8fy6yk10xx"; sha256 = "186j8ky5z3l0mmxx327xzahhsyf7wlds1rsmzzmlxficpg43n90b";
name = "kmenuedit-5.22.3.tar.xz"; name = "kmenuedit-5.22.4.tar.xz";
}; };
}; };
kscreen = { kscreen = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kscreen-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kscreen-5.22.4.tar.xz";
sha256 = "09ai5l3rnhsq3fy1faqg8q3hrikmsjq7gvh1rsw542v9ii37bgjn"; sha256 = "0hkn7ap55x4rzm6x3qdinjar9qhnb742zgzmvswy1kn3a8mxby17";
name = "kscreen-5.22.3.tar.xz"; name = "kscreen-5.22.4.tar.xz";
}; };
}; };
kscreenlocker = { kscreenlocker = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kscreenlocker-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kscreenlocker-5.22.4.tar.xz";
sha256 = "119jbpvni7id6d1kidi8n4nsxscisyc8ifd5a4q7y73sspdr46fp"; sha256 = "0i7c6a378h7366h7nl5051mwrx7cadzfaryfnhpskhlgy3l7119j";
name = "kscreenlocker-5.22.3.tar.xz"; name = "kscreenlocker-5.22.4.tar.xz";
}; };
}; };
ksshaskpass = { ksshaskpass = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/ksshaskpass-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/ksshaskpass-5.22.4.tar.xz";
sha256 = "1vgnz3j83yypymwqzi9r314zwgvaqp82akyfwzzfw60csb6vqdfr"; sha256 = "01f2rz1xqb1jy83427f7rmsb3a7ivkgf2qmm04kwjv29zplg796f";
name = "ksshaskpass-5.22.3.tar.xz"; name = "ksshaskpass-5.22.4.tar.xz";
}; };
}; };
ksystemstats = { ksystemstats = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/ksystemstats-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/ksystemstats-5.22.4.tar.xz";
sha256 = "0p19lcn8rmpxnnwa6crn9id6pwxixmh68yx6j3cy7z2l3ngfrnka"; sha256 = "1daz3890v7qbkcsb9m535mfnijdq3rbasxwqs0ixhn2m400yivvg";
name = "ksystemstats-5.22.3.tar.xz"; name = "ksystemstats-5.22.4.tar.xz";
}; };
}; };
kwallet-pam = { kwallet-pam = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwallet-pam-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwallet-pam-5.22.4.tar.xz";
sha256 = "0x2dw5rgqr0hysdbd4d7nqx4wkxh511xhwfikrgbc3m13vs7l8dg"; sha256 = "1ljrrgjvkvs3fsiijgaxj82hzp1fhsiy39r4amwp21v411c80jwq";
name = "kwallet-pam-5.22.3.tar.xz"; name = "kwallet-pam-5.22.4.tar.xz";
}; };
}; };
kwayland-integration = { kwayland-integration = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwayland-integration-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwayland-integration-5.22.4.tar.xz";
sha256 = "096a8b4pjc1l57jq08x7x181biichrjp5i3s9kyp2kkd09lk0niz"; sha256 = "17nl033vl8i9a92bjbgwwwrkf03lg4726lwdbj3y8xajdp8ql1nb";
name = "kwayland-integration-5.22.3.tar.xz"; name = "kwayland-integration-5.22.4.tar.xz";
}; };
}; };
kwayland-server = { kwayland-server = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwayland-server-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwayland-server-5.22.4.tar.xz";
sha256 = "0c5xcnj29d5j9zqj4qnqgs5732aqi6xqpxqwid20v551lf24kc6n"; sha256 = "0z3ni5ar2bwpc75ssb3qmkbff85a489sxr7vzqhxa40n48bp85ns";
name = "kwayland-server-5.22.3.tar.xz"; name = "kwayland-server-5.22.4.tar.xz";
}; };
}; };
kwin = { kwin = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwin-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwin-5.22.4.tar.xz";
sha256 = "03kd07p1hm6s8vkfjr1rlbjj9bpc48k5ynfb364dkypbfin5p6dw"; sha256 = "1x5338aib7kn1lgpb06b8s06bfj2ybfgyr6k0q91zlc53x61qamh";
name = "kwin-5.22.3.tar.xz"; name = "kwin-5.22.4.tar.xz";
}; };
}; };
kwrited = { kwrited = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwrited-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwrited-5.22.4.tar.xz";
sha256 = "063hmj24i3hvaw6wzjqs56ln6p9jjfz08f9r04wgzgg01zzyznjn"; sha256 = "1rbkbqf5v8wqd2aldpg396ki8a9fsw82jmzmdhsirq33r5yznn4i";
name = "kwrited-5.22.3.tar.xz"; name = "kwrited-5.22.4.tar.xz";
}; };
}; };
layer-shell-qt = { layer-shell-qt = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/layer-shell-qt-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/layer-shell-qt-5.22.4.tar.xz";
sha256 = "0jnfhq86419f9y0vs6l7z3n2f63xy7mwz1s0992zx44ambvwfpnq"; sha256 = "11iqk4bla0y0w2frmvzxi4a3jxj3cj2m8y473z3nfb0z8i5yca0m";
name = "layer-shell-qt-5.22.3.tar.xz"; name = "layer-shell-qt-5.22.4.tar.xz";
}; };
}; };
libkscreen = { libkscreen = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/libkscreen-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/libkscreen-5.22.4.tar.xz";
sha256 = "1whhxzbl8sh63490c222y2dn6qcx9rp8wxsmx8mpx9i7p0x3rl01"; sha256 = "0z2mzha22f2yl7l0ijy4pqpab6n1ivib3grnd583znff02wvj4d2";
name = "libkscreen-5.22.3.tar.xz"; name = "libkscreen-5.22.4.tar.xz";
}; };
}; };
libksysguard = { libksysguard = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/libksysguard-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/libksysguard-5.22.4.tar.xz";
sha256 = "0sjrm3g4wxscv0p9vkw0p6vr1hdysmngc1l57a26cg1z920zidjh"; sha256 = "14h66gs7z6gf7wrpdhpd1461431q2plv7kvfsh02fj52l1dzpcc0";
name = "libksysguard-5.22.3.tar.xz"; name = "libksysguard-5.22.4.tar.xz";
}; };
}; };
milou = { milou = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/milou-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/milou-5.22.4.tar.xz";
sha256 = "0qcy7snn3r16x0vyz57xv60fnjl565pfq9rd265n3w6543ivc09r"; sha256 = "11fa9bj3yzriaydfk8q9kc626yv0s0sal5ws13pcd6ksbhslz83s";
name = "milou-5.22.3.tar.xz"; name = "milou-5.22.4.tar.xz";
}; };
}; };
oxygen = { oxygen = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/oxygen-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/oxygen-5.22.4.tar.xz";
sha256 = "1fp425ifzk5fxapkwdc4q8xfyajs2skqg83sf1gqh9qsyniw47m5"; sha256 = "1p5hklryi02xw0byy5zcaxx5zw81vd6vq3s1h8dyhj07vspimpzw";
name = "oxygen-5.22.3.tar.xz"; name = "oxygen-5.22.4.tar.xz";
}; };
}; };
plasma-browser-integration = { plasma-browser-integration = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-browser-integration-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-browser-integration-5.22.4.tar.xz";
sha256 = "16mpzycxpag946l6fivr5gv5ns5wlmxq7q8mwmhmffa0byg87wxs"; sha256 = "023qbp77ga0jblhhx3437v9jjxx5va7q58abmnpv2nls1xwyq8hb";
name = "plasma-browser-integration-5.22.3.tar.xz"; name = "plasma-browser-integration-5.22.4.tar.xz";
}; };
}; };
plasma-desktop = { plasma-desktop = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-desktop-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-desktop-5.22.4.tar.xz";
sha256 = "046n6wxbdmjxhv1xvvdkb2vy76cpb7nkj7x5zpkmjy2ifa2q6nxx"; sha256 = "0c225lckhsmhig7xsnv5yfajys3w67g6xj4w1hvz1x3hqs79z3kj";
name = "plasma-desktop-5.22.3.tar.xz"; name = "plasma-desktop-5.22.4.tar.xz";
}; };
}; };
plasma-disks = { plasma-disks = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-disks-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-disks-5.22.4.tar.xz";
sha256 = "1a36mgd32743jmnib2gc9x5yg8ipv7zpjwjq087b39k7sr16c40l"; sha256 = "02brm36akqfhjz9fzyzfinjnb954glrrlwpyhiq1sx073v2ibyap";
name = "plasma-disks-5.22.3.tar.xz"; name = "plasma-disks-5.22.4.tar.xz";
}; };
}; };
plasma-firewall = { plasma-firewall = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-firewall-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-firewall-5.22.4.tar.xz";
sha256 = "09300mbq6g193k3bk51g0a21idw5lfvibciiw6dqpn4dxynb8i0d"; sha256 = "1c1mzpd45hd4sb6qsylqgq2x4fay1nskkgmcc1vswmnapcm9gp91";
name = "plasma-firewall-5.22.3.tar.xz"; name = "plasma-firewall-5.22.4.tar.xz";
}; };
}; };
plasma-integration = { plasma-integration = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-integration-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-integration-5.22.4.tar.xz";
sha256 = "02xsw10zn3p17zb6nqgbjlsmy6ayxyyr6krnmqdg5xz03p6m9whq"; sha256 = "0rslli0jsyyhm6prac3xgilwf58gjxqhsijgvr25sipg6200r2z0";
name = "plasma-integration-5.22.3.tar.xz"; name = "plasma-integration-5.22.4.tar.xz";
}; };
}; };
plasma-nano = { plasma-nano = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-nano-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-nano-5.22.4.tar.xz";
sha256 = "100ljwavpm02dvf0msp2al2hrjb2ki1zpm57bwkfaqj40knir6p6"; sha256 = "1ag57nphgkj3f17s42d81npk0z2n27623szbiz1hpgp7f6994l90";
name = "plasma-nano-5.22.3.tar.xz"; name = "plasma-nano-5.22.4.tar.xz";
}; };
}; };
plasma-nm = { plasma-nm = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-nm-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-nm-5.22.4.tar.xz";
sha256 = "1imq4j5a62idqjp0bqwbz2rqc9ln1dwxxarxkq68jiw7bvyy0rix"; sha256 = "1cvfawsqzk3yzjwnz6gc6l7p3pz9brbh0n6km23i1bis08rks168";
name = "plasma-nm-5.22.3.tar.xz"; name = "plasma-nm-5.22.4.tar.xz";
}; };
}; };
plasma-pa = { plasma-pa = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-pa-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-pa-5.22.4.tar.xz";
sha256 = "184a89qfn58ylakqjh524p3n4knvch85klz534jzxdxzb8kjmn0a"; sha256 = "1p000y08p89wvv73glv9ic0gdbdhc9fpzvphx72y420g5hhmnnwa";
name = "plasma-pa-5.22.3.tar.xz"; name = "plasma-pa-5.22.4.tar.xz";
}; };
}; };
plasma-phone-components = { plasma-phone-components = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-phone-components-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-phone-components-5.22.4.tar.xz";
sha256 = "1plp49acy83a1ls7i9aafckb62grwhsqv1i7l3hrzdd1ci7gsmxl"; sha256 = "0mkr7amxvr325y7f98y1368iv4gs6j2x6bkpi20rp8c2vifkvg5b";
name = "plasma-phone-components-5.22.3.tar.xz"; name = "plasma-phone-components-5.22.4.tar.xz";
}; };
}; };
plasma-sdk = { plasma-sdk = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-sdk-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-sdk-5.22.4.tar.xz";
sha256 = "0hn7im5wb2jka2q1g5gyp9hr8n000raxpk1rfcr09i8yrc6xhsnj"; sha256 = "0nrh3zbff25wr59hbsvrygjix56as8rd95smr5075qwdyamcqnhf";
name = "plasma-sdk-5.22.3.tar.xz"; name = "plasma-sdk-5.22.4.tar.xz";
}; };
}; };
plasma-systemmonitor = { plasma-systemmonitor = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-systemmonitor-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-systemmonitor-5.22.4.tar.xz";
sha256 = "1lz4j5cv405jfbx4bl522wica0xylc33hgsf8v5915d3i074z669"; sha256 = "1gl6kjk6b8xwcfrk6xf41jf1lh3zxr5b6qvdv7z6i8wb3pll63cb";
name = "plasma-systemmonitor-5.22.3.tar.xz"; name = "plasma-systemmonitor-5.22.4.tar.xz";
}; };
}; };
plasma-tests = { plasma-tests = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-tests-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-tests-5.22.4.tar.xz";
sha256 = "0qvgmk4idxr4ajj33frrsa2xpdgr53am4cvzs70g6fk3wfjm0b9z"; sha256 = "1wf33c0izm9yyjcysiimcpiwmsa64b4ypklga2rbg7kkk7q0nq82";
name = "plasma-tests-5.22.3.tar.xz"; name = "plasma-tests-5.22.4.tar.xz";
}; };
}; };
plasma-thunderbolt = { plasma-thunderbolt = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-thunderbolt-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-thunderbolt-5.22.4.tar.xz";
sha256 = "1f5vnf4zacgzvg9rbga90mcgjzfhrqq1qbbf16syi0xkbg031prz"; sha256 = "1c5ihvam5hfk7xiy3m707jjhpv2rxgl7d2f6m0d764zynm6zax79";
name = "plasma-thunderbolt-5.22.3.tar.xz"; name = "plasma-thunderbolt-5.22.4.tar.xz";
}; };
}; };
plasma-vault = { plasma-vault = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-vault-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-vault-5.22.4.tar.xz";
sha256 = "13vdbmbsz6bfjdsbhwv29rm515h7bk11lqc6hk2178yh9p4xn6nk"; sha256 = "1p6bl8as8rx36nzwx2rymqmx4rg7dg0bfrxr0flx9jqp1adclf39";
name = "plasma-vault-5.22.3.tar.xz"; name = "plasma-vault-5.22.4.tar.xz";
}; };
}; };
plasma-workspace = { plasma-workspace = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-5.22.4.tar.xz";
sha256 = "1mm4lpx094v62h05qlg0rbgk10g8aisnnr82ynyal4m1awahlp6r"; sha256 = "1fi0c66f2cgqcbshbaxzch75r28l5w4l3flggccil5c73lavf5mg";
name = "plasma-workspace-5.22.3.tar.xz"; name = "plasma-workspace-5.22.4.tar.xz";
}; };
}; };
plasma-workspace-wallpapers = { plasma-workspace-wallpapers = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-wallpapers-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-wallpapers-5.22.4.tar.xz";
sha256 = "0xay6zfrvz535n5cl3w40x63b5mvqmzmmha4csbwhingqrxyxqp3"; sha256 = "0abz3qic8m7dcbd0m1ci8qspfds3fdsqhgv8m6ks2jkcm7z4vnnr";
name = "plasma-workspace-wallpapers-5.22.3.tar.xz"; name = "plasma-workspace-wallpapers-5.22.4.tar.xz";
}; };
}; };
plymouth-kcm = { plymouth-kcm = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plymouth-kcm-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plymouth-kcm-5.22.4.tar.xz";
sha256 = "0xwn827xi0fwvwsrb69q6k8xgbgdjjhb50v4d9icy1n7dfjlbw19"; sha256 = "0vh39lidm0dqah14y7nkzqpanlkxpmylf7wc40giavady3d2i1y1";
name = "plymouth-kcm-5.22.3.tar.xz"; name = "plymouth-kcm-5.22.4.tar.xz";
}; };
}; };
polkit-kde-agent = { polkit-kde-agent = {
version = "1-5.22.3"; version = "1-5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/polkit-kde-agent-1-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/polkit-kde-agent-1-5.22.4.tar.xz";
sha256 = "16jdrqgibm9iv1j7vl9n8k7q4sqjqmvzcndq67wyva2lvy2xhjcw"; sha256 = "0pxrrn4qs96a5p9cp890vdq2g79ah72p655643ciqdb14936p0z2";
name = "polkit-kde-agent-1-5.22.3.tar.xz"; name = "polkit-kde-agent-1-5.22.4.tar.xz";
}; };
}; };
powerdevil = { powerdevil = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/powerdevil-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/powerdevil-5.22.4.tar.xz";
sha256 = "1i7zx8ykp73g8mav1k8jiizfz4f3lzjvsjf0ky74hklc610hgvb4"; sha256 = "17427sv6yh16hmgl94lyb4d7gds0r4hvx8vbbqhzysih2x81xl6m";
name = "powerdevil-5.22.3.tar.xz"; name = "powerdevil-5.22.4.tar.xz";
}; };
}; };
qqc2-breeze-style = { qqc2-breeze-style = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/qqc2-breeze-style-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/qqc2-breeze-style-5.22.4.tar.xz";
sha256 = "1pfpmqs4469sfk753915jjg78a61jjswzq2ckg1mrvpvjm6c3m3n"; sha256 = "15h9rjc4ry3kw18aw18r8y8av4cn2wckab8gyyi7zx7s54n6zpvc";
name = "qqc2-breeze-style-5.22.3.tar.xz"; name = "qqc2-breeze-style-5.22.4.tar.xz";
}; };
}; };
sddm-kcm = { sddm-kcm = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/sddm-kcm-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/sddm-kcm-5.22.4.tar.xz";
sha256 = "1cp421qk5plp0l3h0z3v6kkfm2qc3j1xk1q7xgfw7s6scrxkj1gp"; sha256 = "08j0qd288a5msagpyaqwrw0w6wymxsgqq3rlk8kv3n6qvrsm7174";
name = "sddm-kcm-5.22.3.tar.xz"; name = "sddm-kcm-5.22.4.tar.xz";
}; };
}; };
systemsettings = { systemsettings = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/systemsettings-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/systemsettings-5.22.4.tar.xz";
sha256 = "0hg999vk4nw8hpyl0wmy1h0bcgd9jc7xd1y073bd28bjjpywn5vq"; sha256 = "1ap2h1sa6hdakhf6lzy4bhaq5pxc8g7p32iz04894hd7dbb2iv8h";
name = "systemsettings-5.22.3.tar.xz"; name = "systemsettings-5.22.4.tar.xz";
}; };
}; };
xdg-desktop-portal-kde = { xdg-desktop-portal-kde = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/xdg-desktop-portal-kde-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/xdg-desktop-portal-kde-5.22.4.tar.xz";
sha256 = "1ggcnwvpp32912jgi2ly1541456kwk18q7a7z7l913vhfyrmsa5q"; sha256 = "1xmlw66bw60cl530hjjab8g4krv6di4wpimjaz0a9mv3dnq9xz7m";
name = "xdg-desktop-portal-kde-5.22.3.tar.xz"; name = "xdg-desktop-portal-kde-5.22.4.tar.xz";
}; };
}; };
} }

View file

@ -51,11 +51,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "go"; pname = "go";
version = "1.15.14"; version = "1.15.15";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz"; url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-YKSlxI1j0KE+yohJAJtiRin/QpyLxdGmqMPE2p805wo="; sha256 = "sha256-BmKuOBMzAoDV8al6LuI7vb46Wnz6YAGySphzoZoNx+w=";
}; };
# perl is used for testing go vet # perl is used for testing go vet

View file

@ -51,11 +51,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "go"; pname = "go";
version = "1.16.6"; version = "1.16.7";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz"; url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-o6XUvEAbUdsGXk+TtSM0ek00OuDAsIplw0I7BaE4A30="; sha256 = "sha256-Gp8olNPYeHKfcEUHLzC+zr4kNSTPL85OCnskix4GVKw=";
}; };
# perl is used for testing go vet # perl is used for testing go vet

View file

@ -1,24 +1,27 @@
{lib, stdenv, fetchurl, fetchpatch, bison, flex}: {lib, stdenv, fetchurl, bison, flex}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iasl"; pname = "iasl";
version = "20200110"; version = "20210730";
src = fetchurl { src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
sha256 = "1cb6aa6acrixmdzvj9vv4qs9lmlsbkd27pjlz14i1kq1x3xn0gwx"; sha256 = "1pmm977nyl3bs71ipzcl4dh30qm8x9wm2p2ml0m62rl62kai832a";
}; };
NIX_CFLAGS_COMPILE = "-O3"; NIX_CFLAGS_COMPILE = "-O3";
buildFlags = [ "iasl" ]; buildFlags = [ "iasl" ];
buildInputs = [ bison flex ]; nativeBuildInputs = [ bison flex ];
installPhase = installPhase =
'' ''
install -d $out/bin runHook preInstall
install generate/unix/bin*/iasl $out/bin
install -Dm755 generate/unix/bin*/iasl -t $out/bin
runHook postInstall
''; '';
meta = { meta = {

View file

@ -10,6 +10,9 @@
# Go linker flags, passed to go via -ldflags # Go linker flags, passed to go via -ldflags
, ldflags ? [] , ldflags ? []
# Go tags, passed to go via -tag
, tags ? []
# A function to override the go-modules derivation # A function to override the go-modules derivation
, overrideModAttrs ? (_oldAttrs : {}) , overrideModAttrs ? (_oldAttrs : {})
@ -26,6 +29,10 @@
# Whether to run the vend tool to regenerate the vendor directory. # Whether to run the vend tool to regenerate the vendor directory.
# This is useful if any dependency contain C files. # This is useful if any dependency contain C files.
, runVend ? false , runVend ? false
# Whether to fetch (go mod download) and proxy the vendor directory.
# This is useful if any dependency has case-insensitive conflicts
# which will produce platform dependant `vendorSha256` checksums.
, proxyVendor ? false
# We want parallel builds by default # We want parallel builds by default
, enableParallelBuilding ? true , enableParallelBuilding ? true
@ -43,6 +50,8 @@
with builtins; with builtins;
assert (runVend == true && proxyVendor == true) -> throw "can't use `runVend` and `proxyVendor` together";
assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`"; assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
let let
@ -94,6 +103,9 @@ let
${if runVend then '' ${if runVend then ''
echo "running 'vend' to rewrite vendor folder" echo "running 'vend' to rewrite vendor folder"
${vend}/bin/vend ${vend}/bin/vend
'' else if proxyVendor then ''
mkdir -p "''${GOPATH}/pkg/mod/cache/download"
go mod download
'' else '' '' else ''
go mod vendor go mod vendor
''} ''}
@ -106,8 +118,12 @@ let
installPhase = args.modInstallPhase or '' installPhase = args.modInstallPhase or ''
runHook preInstall runHook preInstall
# remove cached lookup results and tiles ${if proxyVendor then ''
rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb"
cp -r --reflink=auto "''${GOPATH}/pkg/mod/cache/download" $out
'' else ''
cp -r --reflink=auto vendor $out cp -r --reflink=auto vendor $out
''}
runHook postInstall runHook postInstall
''; '';
@ -127,7 +143,7 @@ let
inherit (go) GOOS GOARCH; inherit (go) GOOS GOARCH;
GO111MODULE = "on"; GO111MODULE = "on";
GOFLAGS = [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ]; GOFLAGS = lib.optionals (!proxyVendor) [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ];
configurePhase = args.configurePhase or '' configurePhase = args.configurePhase or ''
runHook preConfigure runHook preConfigure
@ -135,11 +151,15 @@ let
export GOCACHE=$TMPDIR/go-cache export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go" export GOPATH="$TMPDIR/go"
export GOSUMDB=off export GOSUMDB=off
export GOPROXY=off
cd "$modRoot" cd "$modRoot"
'' + lib.optionalString (go-modules != "") '' '' + lib.optionalString (go-modules != "") ''
rm -rf vendor ${if proxyVendor then ''
cp -r --reflink=auto ${go-modules} vendor export GOPROXY=file://${go-modules}
'' else ''
export GOPROXY=off
rm -rf vendor
cp -r --reflink=auto ${go-modules} vendor
''}
'' + '' '' + ''
runHook postConfigure runHook postConfigure
@ -156,7 +176,7 @@ let
echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0 echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
local OUT local OUT
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
echo "$OUT" >&2 echo "$OUT" >&2
return 1 return 1

View file

@ -10,6 +10,9 @@
# Go linker flags, passed to go via -ldflags # Go linker flags, passed to go via -ldflags
, ldflags ? [] , ldflags ? []
# Go tags, passed to go via -tag
, tags ? []
# We want parallel builds by default # We want parallel builds by default
, enableParallelBuilding ? true , enableParallelBuilding ? true
@ -151,7 +154,7 @@ let
echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
local OUT local OUT
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
echo "$OUT" >&2 echo "$OUT" >&2
return 1 return 1

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "armadillo"; pname = "armadillo";
version = "10.6.1"; version = "10.6.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "sha256-HQbDI31lx7xGHqEvT9/YtaabapZbSQCucJYM6SCIF58="; sha256 = "sha256-KoA9b4921AfbnBXtw4lJZSOMjliflMyQeoNz7pRXKKg=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -0,0 +1,49 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, gettext
, gobject-introspection
, gtk-doc
, python3
, cairo
, gtk3
, glib
}:
stdenv.mkDerivation rec {
pname = "goocanvas";
version = "3.0.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/goocanvas/${lib.versions.majorMinor version}/goocanvas-${version}.tar.xz";
sha256 = "06j05g2lmwvklmv51xsb7gm7rszcarhm01sal41jfp0qzrbpa2k7";
};
nativeBuildInputs = [
pkg-config
gettext
gobject-introspection
gtk-doc
python3
];
buildInputs = [
cairo
gtk3
glib
];
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0";
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
meta = with lib; {
description = "Canvas widget for GTK based on the the Cairo 2D library";
homepage = "https://wiki.gnome.org/Projects/GooCanvas";
license = licenses.lgpl2; # https://gitlab.gnome.org/GNOME/goocanvas/-/issues/12
maintainers = with maintainers; [ bobby285271 ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,42 @@
{ stdenv
, lib
, fetchurl
, pkg-config
, gobject-introspection
, file
, gtk2
, glib
, cairo
, atk
, pango
, libtiff
, libpng
, libjpeg
}:
stdenv.mkDerivation rec {
pname = "gtkextra";
version = "3.3.4";
src = fetchurl {
url = "mirror://sourceforge/project/gtkextra/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "1mpihbyzhv3ymfim93l9xnxmzhwyqdba5xb4rdn5vggdg25766v5";
};
postPatch = ''
substituteInPlace configure \
--replace "/usr/bin/file" "${file}/bin/file"
'';
nativeBuildInputs = [ gobject-introspection pkg-config ];
buildInputs = [ gtk2 glib cairo atk pango libtiff libpng libjpeg ];
meta = with lib; {
homepage = "http://gtkextra.sourceforge.net/";
description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+.";
license = licenses.lgpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ tesq0 ];
};
}

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hivex"; pname = "hivex";
version = "1.3.20"; version = "1.3.21";
src = fetchurl { src = fetchurl {
url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz";
sha256 = "sha256-9SPDe7BkpLq321IkkCw07uT5+rLZuBz2FbMsC4UJ0y0="; sha256 = "sha256-ms4+9KL/LKUKmb4Gi2D7H9vJ6rivU+NF6XznW6S2O1Y=";
}; };
patches = [ ./hivex-syms.patch ]; patches = [ ./hivex-syms.patch ];

View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: { lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }:
let stdenv.mkDerivation rec {
version = "0.7.0";
pname = "libgrss"; pname = "libgrss";
in version = "0.7.0";
stdenv.mkDerivation {
name = "${pname}-${version}";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libraspberrypi"; pname = "libraspberrypi";
version = "unstable-2021-03-17"; version = "unstable-2021-06-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "userland"; repo = "userland";
rev = "3fd8527eefd8790b4e8393458efc5f94eb21a615"; rev = "97bc8180ad682b004ea224d1db7b8e108eda4397";
sha256 = "099qxh4bjzwd431ffpdhzx0gzlrkdyf66wplgkwg2rrfrc9zlv5a"; sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5";
}; };
patches = [ patches = [

View file

@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, python3
}:
stdenv.mkDerivation rec {
pname = "libvarlink";
version = "22";
src = fetchFromGitHub {
owner = "varlink";
repo = pname;
rev = version;
sha256 = "1i15227vlc9k4276r833ndhxrcys9305pf6dga1j0alx2vj85yz2";
};
nativeBuildInputs = [ meson ninja ];
postPatch = ''
substituteInPlace varlink-wrapper.py \
--replace "/usr/bin/env python3" "${python3}/bin/python3"
# test-object: ../lib/test-object.c:129: main: Assertion `setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0' failed.
# PR that added it https://github.com/varlink/libvarlink/pull/27
substituteInPlace lib/test-object.c \
--replace 'assert(setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0);' ""
patchShebangs lib/test-symbols.sh
'';
doCheck = true;
meta = with lib; {
description = "C implementation of the Varlink protocol and command line tool";
homepage = "https://github.com/varlink/libvarlink";
license = licenses.asl20;
maintainers = with maintainers; [ artturin ];
platforms = platforms.linux;
};
}

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ndi"; pname = "ndi";
fullVersion = "4.6.0"; fullVersion = "4.6.2";
version = builtins.head (builtins.splitVersion fullVersion); version = builtins.head (builtins.splitVersion fullVersion);
src = requireFile rec { src = requireFile rec {
name = "InstallNDISDK_v${version}_Linux.tar.gz"; name = "InstallNDISDK_v${version}_Linux.tar.gz";
sha256 = "19jrj2v7x1amdpc9pdq3042vm2l3szwqbzb83lirgbc24s2q043m"; sha256 = "181ypfj1bl0kljzrfr6037i14ykg2y4plkzdhym6m3z7kcrnm1fl";
message = '' message = ''
In order to use NDI SDK version ${fullVersion}, you need to comply with In order to use NDI SDK version ${fullVersion}, you need to comply with
NewTek's license and download the appropriate Linux tarball from: NewTek's license and download the appropriate Linux tarball from:

View file

@ -263,8 +263,10 @@
, "uglify-js" , "uglify-js"
, "undollar" , "undollar"
, "ungit" , "ungit"
, "unified-language-server"
, "vega-cli" , "vega-cli"
, "vega-lite" , "vega-lite"
, "vercel"
, "vim-language-server" , "vim-language-server"
, "vls" , "vls"
, "vscode-css-languageserver-bin" , "vscode-css-languageserver-bin"

File diff suppressed because it is too large Load diff

View file

@ -1,18 +1,20 @@
{ lib, fetchzip, ppx_deriving, ppxfind, buildDunePackage, ounit }: { lib, fetchFromGitHub, ppx_deriving, ppxlib, buildDunePackage, ounit }:
buildDunePackage rec { buildDunePackage rec {
pname = "lens"; pname = "lens";
version = "1.2.4"; version = "1.2.5";
useDune2 = true; useDune2 = true;
src = fetchzip { src = fetchFromGitHub {
url = "https://github.com/pdonadeo/ocaml-lens/archive/v${version}.tar.gz"; owner = "pdonadeo";
sha256 = "18mv7n5rcix3545mc2qa2f9xngks4g4kqj2g878qj7r3cy96kklv"; repo = "ocaml-lens";
rev = "v${version}";
sha256 = "1k23n7pa945fk6nbaq6nlkag5kg97wsw045ghz4gqp8b9i2im3vn";
}; };
minimumOCamlVersion = "4.10"; minimalOCamlVersion = "4.10";
buildInputs = [ ppx_deriving ppxfind ]; buildInputs = [ ppx_deriving ppxlib ];
doCheck = true; doCheck = true;
checkInputs = [ ounit ]; checkInputs = [ ounit ];
@ -24,6 +26,5 @@ buildDunePackage rec {
maintainers = with maintainers; [ maintainers = with maintainers; [
kazcw kazcw
]; ];
broken = true; # Not compatible with ppx_deriving ≥ 5.0
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchpatch, python, cmake, libllvm, ocaml, findlib, ctypes }: { stdenv, lib, python, cmake, libllvm, ocaml, findlib, ctypes }:
let version = lib.getVersion libllvm; in let version = lib.getVersion libllvm; in
@ -12,12 +12,8 @@ stdenv.mkDerivation {
buildInputs = [ python ocaml findlib ctypes ]; buildInputs = [ python ocaml findlib ctypes ];
propagatedBuildInputs = [ libllvm ]; propagatedBuildInputs = [ libllvm ];
patches = [ (fetchpatch {
url = "https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch";
sha256 = "1p98j3b1vrryfn1xa7i50m6mmm4dyw5ldafq6kyh9sfmdihz4zsx";
})];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES" # fixes bytecode builds
"-DLLVM_OCAML_OUT_OF_TREE=TRUE" "-DLLVM_OCAML_OUT_OF_TREE=TRUE"
"-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml" "-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml"
"-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib libllvm}/lib" "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib libllvm}/lib"
@ -31,6 +27,7 @@ stdenv.mkDerivation {
mkdir -p $OCAMLFIND_DESTDIR/ mkdir -p $OCAMLFIND_DESTDIR/
mv $out/ocaml $OCAMLFIND_DESTDIR/llvm mv $out/ocaml $OCAMLFIND_DESTDIR/llvm
mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,} mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,}
mv $OCAMLFIND_DESTDIR/llvm/stublibs $OCAMLFIND_DESTDIR/stublibs
''; '';
passthru = { passthru = {

View file

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchFromGitHub
, isPy27
, substituteAll , substituteAll
, git , git
, gitdb , gitdb
@ -11,13 +10,15 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "GitPython"; pname = "gitpython";
version = "3.1.19"; version = "3.1.20";
disabled = isPy27; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "gitpython-developers";
sha256 = "0lqf5plm02aw9zl73kffk7aa4mp4girm3f2yfk27nmmmjsdh7x0q"; repo = "GitPython";
rev = version;
sha256 = "1ygrxn8br2ff87j02ibijxzxa0ax9lgjdviwddslqxiarfggik9h";
}; };
patches = [ patches = [

View file

@ -0,0 +1,37 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "adax";
version = "0.1.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyadax";
rev = version;
sha256 = "06qk8xbv8lsaabdpi6pclnbkp3vmb4k18spahldazqj8235ii237";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "adax" ];
meta = with lib; {
description = "Python module to communicate with Adax";
homepage = "https://github.com/Danielhiversen/pyAdax";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchPypi
, spotipy
, click
, pycryptodomex
, mutagen
, requests
, deezer-py
, pythonOlder
}:
buildPythonPackage rec {
pname = "deemix";
version = "3.4.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-FGzMFJOoKQPNq4tGI1KsMO+i9iBZhoz5Z67BFLEuv48=";
};
propagatedBuildInputs = [
spotipy
click
pycryptodomex
mutagen
requests
deezer-py
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"spotipy"
"click"
"Cryptodome"
"mutagen"
"requests"
"deezer"
];
meta = with lib; {
homepage = "https://git.freezer.life/RemixDev/deemix-py";
description = "Deezer downloader built from the ashes of Deezloader Remix";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ natto1784 ];
};
}

View file

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, pythonOlder
}:
buildPythonPackage rec {
pname = "deezer-py";
version = "1.1.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EAiGMSLrRsF03FMLkizy3Fm+nAldSTxe9KdXFFep0iQ=";
};
propagatedBuildInputs = [ requests ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "requests" ];
meta = with lib; {
homepage = "https://gitlab.com/RemixDev/deezer-py";
description = "A wrapper for all Deezer's APIs";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ natto1784 ];
};
}

View file

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchFromSourcehut, sqlparse, wrapt, pytestCheckHook }:
buildPythonPackage rec {
pname = "embrace";
version = "4.0.0";
src = fetchFromSourcehut {
vc = "hg";
owner = "~olly";
repo = "embrace-sql";
rev = "v${version}-release";
sha256 = "sha256-G/7FeKlMbOWobQOpD7/0JiTFpf8oWZ1TxPpDS9wrKMo=";
};
propagatedBuildInputs = [ sqlparse wrapt ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "embrace" ];
meta = with lib; {
description = "Embrace SQL keeps your SQL queries in SQL files";
homepage = "https://pypi.org/project/embrace/";
license = licenses.asl20;
maintainers = with maintainers; [ pacien ];
};
}

View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mdformat"; pname = "mdformat";
version = "0.7.7"; version = "0.7.8";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "executablebooks"; owner = "executablebooks";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-1qwluHxZnSuyNJENzeJzkuhIQN5njTOch2Wz45J0qRI="; sha256 = "0zvgz2c517ig31hcrf05gv4h68zpqk56asnmwx072ld8gk2ff8ag";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -10,7 +10,7 @@ buildPythonPackage {
pname = "notmuch2"; pname = "notmuch2";
inherit (notmuch) version src; inherit (notmuch) version src;
sourceRoot = "${notmuch.src.name}/bindings/python-cffi"; sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi";
buildInputs = [ python notmuch cffi ]; buildInputs = [ python notmuch cffi ];

View file

@ -0,0 +1,37 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "open-garage";
version = "0.1.5";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyOpenGarage";
rev = version;
sha256 = "1iqcqkbb1ik5lmsvwgy6i780x6y3wlm1gx257anxyvp1b21gm24p";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "opengarage" ];
meta = with lib; {
description = "Python module to communicate with opengarage.io";
homepage = "https://github.com/Danielhiversen/pyOpenGarage";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,39 @@
{ lib
, aiohttp
, backoff
, buildPythonPackage
, click
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyprosegur";
version = "0.0.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dgomes";
repo = pname;
rev = version;
sha256 = "0bpzxm8s548fw6j36brp7bcx9481x2hrypcw3yyg4ihsjhka5qln";
};
propagatedBuildInputs = [
aiohttp
backoff
click
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pyprosegur" ];
meta = with lib; {
description = "Python module to communicate with Prosegur Residential Alarms";
homepage = "https://github.com/dgomes/pyprosegur";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "solc-select";
version = "0.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6VawTcffIgnR+zuC4rti+Ocwu1VMTX+VihT/L7LzchI=";
};
# no tests
doCheck = false;
pythonImportsCheck = [ "solc_select" ];
meta = with lib; {
description = "Manage and switch between Solidity compiler versions";
homepage = "https://github.com/crytic/solc-select";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ arturcygan ];
};
}

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