Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
d3da112c8c
@ -73,6 +73,17 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila
|
||||
|
||||
* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. This can be an array of multiple projects as well.
|
||||
* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. This file should be generated using `nuget-to-nix` tool, which is available in nixpkgs.
|
||||
* `packNupkg` is used to pack project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`.
|
||||
* `projectReferences` can be used to resolve `ProjectReference` project items. Referenced projects can be packed with `buildDotnetModule` by setting the `packNupkg = true` attribute and passing a list of derivations to `projectReferences`. Since we are sharing referenced projects as NuGets they must be added to csproj/fsproj files as `PackageReference` as well.
|
||||
For example, your project has a local dependency:
|
||||
```xml
|
||||
<ProjectReference Include="../foo/bar.fsproj" />
|
||||
```
|
||||
To enable discovery through `projectReferences` you would need to add:
|
||||
```xml
|
||||
<ProjectReference Include="../foo/bar.fsproj" />
|
||||
<PackageReference Include="bar" Version="*" Condition=" '$(ContinuousIntegrationBuild)'=='true' "/>
|
||||
```
|
||||
* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`.
|
||||
* `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies.
|
||||
* `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`.
|
||||
@ -83,15 +94,18 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila
|
||||
* `disabledTests` is used to disable running specific unit tests. This gets passed as: `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all unit test frameworks.
|
||||
* `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`.
|
||||
* `dotnetBuildFlags` can be used to pass flags to `dotnet build`.
|
||||
* `dotnetTestFlags` can be used to pass flags to `dotnet test`.
|
||||
* `dotnetTestFlags` can be used to pass flags to `dotnet test`. Used only if `doCheck` is set to `true`.
|
||||
* `dotnetInstallFlags` can be used to pass flags to `dotnet install`.
|
||||
* `dotnetPackFlags` can be used to pass flags to `dotnet pack`. Used only if `packNupkg` is set to `true`.
|
||||
* `dotnetFlags` can be used to pass flags to all of the above phases.
|
||||
|
||||
Here is an example `default.nix`, using some of the previously discussed arguments:
|
||||
```nix
|
||||
{ lib, buildDotnetModule, dotnetCorePackages, ffmpeg }:
|
||||
|
||||
buildDotnetModule rec {
|
||||
let
|
||||
referencedProject = import ../../bar { ... };
|
||||
in buildDotnetModule rec {
|
||||
pname = "someDotnetApplication";
|
||||
version = "0.1";
|
||||
|
||||
@ -99,6 +113,7 @@ buildDotnetModule rec {
|
||||
|
||||
projectFile = "src/project.sln";
|
||||
nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix`.
|
||||
projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure.
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_3_1;
|
||||
dotnet-runtime = dotnetCorePackages.net_5_0;
|
||||
@ -107,6 +122,8 @@ buildDotnetModule rec {
|
||||
executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`.
|
||||
executables = []; # Don't install any executables.
|
||||
|
||||
packNupkg = true; # This packs the project as "foo-0.1.nupkg" at `$out/share`.
|
||||
|
||||
runtimeDeps = [ ffmpeg ]; # This will wrap ffmpeg's library path into `LD_LIBRARY_PATH`.
|
||||
}
|
||||
```
|
||||
|
||||
@ -92,7 +92,7 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti
|
||||
|
||||
- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`.
|
||||
|
||||
- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGAppsHook` copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper.
|
||||
- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](#ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGAppsHook` copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper.
|
||||
|
||||
- []{#ssec-gnome-hooks-gtk-drop-icon-theme-cache} One of `gtk3`’s setup hooks will remove `icon-theme.cache` files from package’s icon theme directories to avoid conflicts. Icon theme packages should prevent this with `dontDropIconThemeCache = true;`.
|
||||
|
||||
|
||||
@ -128,7 +128,7 @@ Let's present the luarocks way first and the manual one in a second time.
|
||||
|
||||
### Packaging a library on luarocks {#packaging-a-library-on-luarocks}
|
||||
|
||||
[Luarocks.org](www.luarocks.org) is the main repository of lua packages.
|
||||
[Luarocks.org](https://luarocks.org/) is the main repository of lua packages.
|
||||
The site proposes two types of packages, the rockspec and the src.rock
|
||||
(equivalent of a [rockspec](https://github.com/luarocks/luarocks/wiki/Rockspec-format) but with the source).
|
||||
These packages can have different build types such as `cmake`, `builtin` etc .
|
||||
|
||||
@ -309,9 +309,9 @@ Sample output2:
|
||||
|
||||
## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}
|
||||
|
||||
Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
|
||||
Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
|
||||
|
||||
Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:
|
||||
Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:
|
||||
|
||||
```nix
|
||||
deoplete-fish = super.deoplete-fish.overrideAttrs(old: {
|
||||
|
||||
@ -118,8 +118,9 @@ in rec {
|
||||
# The actual generation of the xml file is done in nix purely for the convenience
|
||||
# of not having to generate the xml some other way
|
||||
optionsXML = pkgs.runCommand "options.xml" {} ''
|
||||
export NIX_STORE_DIR=$TMPDIR/store
|
||||
export NIX_STATE_DIR=$TMPDIR/state
|
||||
${pkgs.nix}/bin/nix-instantiate \
|
||||
--store dummy:// \
|
||||
--eval --xml --strict ${./optionsJSONtoXML.nix} \
|
||||
--argstr file ${optionsJSON}/share/doc/nixos/options.json \
|
||||
> "$out"
|
||||
|
||||
@ -43,8 +43,8 @@ in {
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.couchdb;
|
||||
defaultText = literalExpression "pkgs.couchdb";
|
||||
default = pkgs.couchdb3;
|
||||
defaultText = literalExpression "pkgs.couchdb3";
|
||||
description = ''
|
||||
CouchDB package to use.
|
||||
'';
|
||||
@ -150,6 +150,14 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
argsFile = mkOption {
|
||||
type = types.path;
|
||||
default = "${cfg.package}/etc/vm.args";
|
||||
description = ''
|
||||
vm.args configuration. Overrides Couchdb's Erlang VM parameters file.
|
||||
'';
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.path;
|
||||
description = ''
|
||||
@ -186,12 +194,14 @@ in {
|
||||
'';
|
||||
|
||||
environment = {
|
||||
# we are actually specifying 4 configuration files:
|
||||
# we are actually specifying 5 configuration files:
|
||||
# 1. the preinstalled default.ini
|
||||
# 2. the module configuration
|
||||
# 3. the extraConfig from the module options
|
||||
# 4. the locally writable config file, which couchdb itself writes to
|
||||
ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}'';
|
||||
# 5. the vm.args file
|
||||
COUCHDB_ARGS_FILE=''${cfg.argsFile}'';
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
|
||||
@ -56,5 +56,8 @@ with lib;
|
||||
couchdb3.succeed(
|
||||
"${curlJqCheck testlogin "GET" "_all_dbs" ". | length" "0"}"
|
||||
)
|
||||
couchdb3.succeed(
|
||||
"${curlJqCheck testlogin "GET" "_node/couchdb@127.0.0.1" ".couchdb" "Welcome"}"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
||||
@ -10,8 +10,6 @@ in
|
||||
{
|
||||
dns-single-node = dns.singlenode.test;
|
||||
dns-multi-node = dns.multinode.test;
|
||||
# timed out: https://hydra.nixos.org/build/160710933
|
||||
#rbac-single-node = rbac.singlenode.test;
|
||||
# timed out: https://hydra.nixos.org/build/160711286
|
||||
#rbac-multi-node = rbac.multinode.test;
|
||||
rbac-single-node = rbac.singlenode.test;
|
||||
rbac-multi-node = rbac.multinode.test;
|
||||
}
|
||||
|
||||
@ -100,7 +100,7 @@ let
|
||||
machine1.succeed("host redis.default.svc.cluster.local")
|
||||
|
||||
# check dns inside the container
|
||||
machine1.succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local")
|
||||
machine1.succeed("kubectl exec probe -- /bin/host redis.default.svc.cluster.local")
|
||||
'';
|
||||
};
|
||||
|
||||
@ -142,7 +142,7 @@ let
|
||||
machine2.succeed("host redis.default.svc.cluster.local")
|
||||
|
||||
# check dns inside the container
|
||||
machine1.succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local")
|
||||
machine1.succeed("kubectl exec probe -- /bin/host redis.default.svc.cluster.local")
|
||||
'';
|
||||
};
|
||||
in {
|
||||
|
||||
@ -115,9 +115,9 @@ let
|
||||
|
||||
machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running")
|
||||
|
||||
machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods")
|
||||
machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json")
|
||||
machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl")
|
||||
machine1.wait_until_succeeds("kubectl exec kubectl -- kubectl get pods")
|
||||
machine1.fail("kubectl exec kubectl -- kubectl create -f /kubectl-pod-2.json")
|
||||
machine1.fail("kubectl exec kubectl -- kubectl delete pods -l name=kubectl")
|
||||
'';
|
||||
};
|
||||
|
||||
@ -152,9 +152,9 @@ let
|
||||
|
||||
machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running")
|
||||
|
||||
machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods")
|
||||
machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json")
|
||||
machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl")
|
||||
machine1.wait_until_succeeds("kubectl exec kubectl -- kubectl get pods")
|
||||
machine1.fail("kubectl exec kubectl -- kubectl create -f /kubectl-pod-2.json")
|
||||
machine1.fail("kubectl exec kubectl -- kubectl delete pods -l name=kubectl")
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
server_wsdd.wait_for_unit("samba-wsdd")
|
||||
|
||||
client_wsdd.wait_until_succeeds(
|
||||
"echo list | ${pkgs.libressl.nc}/bin/nc -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
|
||||
"echo list | ${pkgs.libressl.nc}/bin/nc -N -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
||||
@ -9,16 +9,16 @@ let
|
||||
inherit buildFHSUserEnv;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "2020.3.1.25"; # "Android Studio Arctic Fox (2020.3.1)"
|
||||
sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg";
|
||||
version = "2020.3.1.26"; # "Android Studio Arctic Fox (2020.3.1)"
|
||||
sha256Hash = "NE2FgjXtXTCVrCWRakqPhzAGn3blpf0OugJSKviPVBs=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2021.1.1.17"; # "Android Studio Bumblebee (2021.1.1) Beta 4"
|
||||
sha256Hash = "5WLUgCmdrK0PArc4eQQTNbEokq4DReKRwsZOWKb+Td4=";
|
||||
version = "2021.1.1.18"; # "Android Studio Bumblebee (2021.1.1) Beta 5"
|
||||
sha256Hash = "gWG8h3wTQDH84vSKlfTm3soUqLkwFYfSymJuAAFPDuQ=";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "2021.2.1.3"; # "Android Studio Chipmunk (2021.2.1) Canary 3"
|
||||
sha256Hash = "sha256-xIVdM28NDadvJklDIw71iJ7Z5GPVJ1ZDJ+t1y+bt8cE=";
|
||||
version = "2021.2.1.5"; # "Android Studio Chipmunk (2021.2.1) Canary 5"
|
||||
sha256Hash = "PS45nu5g9qXNeolYnFEs//Z6p8eIZoD6kUo/0yfHQ6A=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, zlib, jdk, glib, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk
|
||||
, makeWrapper, perl, ... }:
|
||||
|
||||
{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }:
|
||||
{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit name src;
|
||||
@ -37,13 +37,12 @@ stdenv.mkDerivation rec {
|
||||
# settings in ~/.eclipse/org.eclipse.platform_<version> rather
|
||||
# than ~/.eclipse/org.eclipse.platform_<version>_<number>.
|
||||
productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct)
|
||||
productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct)
|
||||
|
||||
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
|
||||
--add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration"
|
||||
|
||||
# Create desktop item.
|
||||
mkdir -p $out/share/applications
|
||||
|
||||
@ -16,18 +16,21 @@ assert stdenv ? glibc;
|
||||
|
||||
let
|
||||
platform_major = "4";
|
||||
platform_minor = "21";
|
||||
platform_minor = "22";
|
||||
year = "2021";
|
||||
month = "09";
|
||||
timestamp = "${year}${month}060500";
|
||||
month = "12"; #release month
|
||||
buildmonth = "11"; #sometimes differs from release month
|
||||
timestamp = "${year}${buildmonth}241800";
|
||||
gtk = gtk3;
|
||||
in rec {
|
||||
|
||||
buildEclipse = callPackage ./build-eclipse.nix {
|
||||
# work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3
|
||||
buildEclipseUnversioned = callPackage ./build-eclipse.nix {
|
||||
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
|
||||
jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk
|
||||
makeWrapper;
|
||||
};
|
||||
buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; });
|
||||
|
||||
### Eclipse CPP
|
||||
|
||||
@ -37,7 +40,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "3xdj7b0mlhdys9q4l19kkf1hm0d67dwx55gzfmgv90nvswv0jhyvs42my4wrlrmkh6lz8m0z6dakadhl1bxf2fd8pdp5sm4bv0w0gwc";
|
||||
hash = "sha512-Lniaw8aUptHI0a75olTNHaMba+ugUdJKf9sJ0hGzKqY94vvfU3N2TH5eQBeXb1MyQdRdBL1D8Vs3+LD9lWlTMg==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -49,7 +52,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "20xy4vzqlmg4sdvqimz2nc212vb45k5kwh40qagm13r6h3vfv3yrl8bznnappaf4msfa9xdaxns2kz0x94hw444zjmrnbf7614a48xi";
|
||||
hash = "sha512-F/5yroFDbrSclmUP5vTNSkYR+OZ1dkPv2FPZT1XM5HFoynitYkDxnj+uTcJIBOWv3Zu1plU4yweW0DF1E9jLcg==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -61,16 +64,17 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "29hab3ha3spk0048k3mf2x5m80hlh1l6nazsykx0xxrqy9vdkdibv6mq74dzf1n93h1bd5qh9axicnhs465kp7r1irdl04761c1wibi";
|
||||
hash = "sha512-3XsBk8/KHtTjit/WMneOghuOkqEHOIdLwof7718dsrDP4vfgcfhb47V7fPYDOw2eld88pHk+85mTGpZOTTywxw==";
|
||||
};
|
||||
};
|
||||
|
||||
### Eclipse Scala SDK
|
||||
|
||||
eclipse-scala-sdk =
|
||||
buildEclipse.override { jdk = jdk8; gtk = gtk2; } {
|
||||
buildEclipseUnversioned.override { jdk = jdk8; gtk = gtk2; } {
|
||||
name = "eclipse-scala-sdk-4.7.0";
|
||||
description = "Eclipse IDE for Scala Developers";
|
||||
productVersion = "4.7";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz";
|
||||
@ -86,7 +90,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "3ag7nfpnn1149gkva58x0037pbdb5wds0qpwv21lif7a6b1a1n7g2n056bn43a7fkxkkj38752gkz29nvqh5g8hqkg29lax8sjlm7sm";
|
||||
hash = "sha512-7bTYIFnX8oUPaqDrMOlGNnpyC+xvDQsNmgZUps/epGkzM9Fjlc2lPr75VR7UaezBCoAuNTSHCYtG5d6TJOKjmQ==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -98,7 +102,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "27h5wjr4k0jhi256rk74kbjbm5h7xi4hbml89n1jhppq1yfyv2mf75zb32iaia2pxclx6hc0cd1hvq85fwvcshnq79fw8za687yvbhv";
|
||||
hash = "sha512-ahykujYH9RLvxVMPFlFILGYJO0LXHvuhnILifeAo5v5Tp5ktGVlZWG461iZHETlt8Zr76liGAqm1ytQcuzCyQA==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -110,7 +114,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "03li2bkhkdybwp411xs8i3cp2hmrfg2xd7inbdsxh07y4b9806spi3q10vga97m7ngl6fl5n0mvgxwj8dbdvp133wn9mgrlajb1n4n8";
|
||||
hash = "sha512-CuKxjcnvkROURtavZJN0AhCuA0x7NayZTpIOn9oE21rUzVqR0p7x7C5RPtMZ9gS4ZMWcYyQDJ0BVgRHBoKsYqQ==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -122,7 +126,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "38xwwvg59bdp0a6brmcvq0wlfikik0wnqq897abf5a8vyr0ci7xp5f4ii90x2l5sj5gmcc6jiwvi99c03cjbgivpalr741yka0p3pv5";
|
||||
hash = "sha512-CqUbxUUMIJsXsx4XEOQ1d2L3U22VpAfQP+R8HNoVetDawhR+b2tyDVnTQRKTL4dJ0fjLXDeoHvTlPm1EXi/ahA==";
|
||||
};
|
||||
};
|
||||
|
||||
@ -134,7 +138,7 @@ in rec {
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "30hhy83lmjldcwwbjpk5q9zjai5r3xyhlrddalgrw8mspknayncaa2l32gg327fw0a8qaakzgwkh68gj81pmk3dps5wzy881pf22dhc";
|
||||
hash = "sha256-ys3MjIBr2hLZC/GB8Am/Qlto4+dSzOoK9p7QF+GS0Eg=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -248,12 +248,12 @@ rec {
|
||||
cdt = buildEclipseUpdateSite rec {
|
||||
name = "cdt-${version}";
|
||||
# find current version at https://www.eclipse.org/cdt/downloads.php
|
||||
version = "10.4.1";
|
||||
version = "10.5.0";
|
||||
|
||||
src = fetchzip {
|
||||
stripRoot = false;
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
|
||||
sha256 = "1l3v6dryaqifwrv2h4knwmpyf11qbyl04p7gcvgrx3hczc82a6p1";
|
||||
hash = "sha256-0sf38Ekw9mMjiEmJDcunVL3VS3KqWVXKZlQIGBk4V4g=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,7 +2,6 @@ import ./generic.nix (rec {
|
||||
version = "27.2";
|
||||
sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=";
|
||||
patches = fetchpatch: [
|
||||
./tramp-detect-wrapped-gvfsd.patch
|
||||
(fetchpatch {
|
||||
name = "fix-aarch64-darwin-triplet.patch";
|
||||
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
trivialBuild {
|
||||
pname = "bqn-mode";
|
||||
version = "0.pre+unstable=2021-12-04";
|
||||
version = "0.pre+date=2021-12-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "museoa";
|
||||
|
||||
@ -39,10 +39,10 @@
|
||||
elpaBuild {
|
||||
pname = "ada-mode";
|
||||
ename = "ada-mode";
|
||||
version = "7.1.8";
|
||||
version = "7.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-7.1.8.tar";
|
||||
sha256 = "0gggzjj58bxp7n4xdvhqwaxk6z79bbiqs59cc36mxk4gqyzf41xh";
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-7.2.0.tar";
|
||||
sha256 = "00mrcn98bah9cld78qz75mmmk1yrs9k4dbzf6r1x07pngz70fxm2";
|
||||
};
|
||||
packageRequires = [ emacs uniquify-files wisi ];
|
||||
meta = {
|
||||
@ -448,10 +448,10 @@
|
||||
elpaBuild {
|
||||
pname = "capf-autosuggest";
|
||||
ename = "capf-autosuggest";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/capf-autosuggest-0.2.tar";
|
||||
sha256 = "0a3bkf3c1gwv9m4rq9kvgw48y5av4arnymnm64yija55ygrnm88b";
|
||||
url = "https://elpa.gnu.org/packages/capf-autosuggest-0.3.tar";
|
||||
sha256 = "05abnvg84248pbqr2hdkyxr1q1qlgsf4nji23nw41bfly795ikpm";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -681,10 +681,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult";
|
||||
ename = "consult";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-0.12.tar";
|
||||
sha256 = "0xcr7jki9m30hppy24z74nrw7xv5nahm1yrjilcck32mxfkrc69x";
|
||||
url = "https://elpa.gnu.org/packages/consult-0.13.tar";
|
||||
sha256 = "08hwvyj9sif9r92nhd09prwlryyqgnifjfqj51xgx98m0rg7ks3p";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -711,10 +711,10 @@
|
||||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "0.13";
|
||||
version = "0.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.13.tar";
|
||||
sha256 = "0psvkxr7fjqq7gkqdzl0ma367zjlxgixk563vpv9hmwfwymddyyb";
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.16.tar";
|
||||
sha256 = "04xgq5rkz8a0lykcyjsxq76yapbzz8vfw8gxqvdx0y58bhcw82y6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -726,10 +726,10 @@
|
||||
elpaBuild {
|
||||
pname = "coterm";
|
||||
ename = "coterm";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/coterm-1.2.tar";
|
||||
sha256 = "0jl48bi4a4fkk7p2nj2bx0b658wrjw0cvab5ds6rid44irc8b1mn";
|
||||
url = "https://elpa.gnu.org/packages/coterm-1.3.tar";
|
||||
sha256 = "078rrc776mdzb4nczp1h8p0pymzds76kz3g2h78ri95k3wpy5ksj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -801,10 +801,10 @@
|
||||
elpaBuild {
|
||||
pname = "csharp-mode";
|
||||
ename = "csharp-mode";
|
||||
version = "1.0.2";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/csharp-mode-1.0.2.tar";
|
||||
sha256 = "1xddnd6g6qz3xnzl6dmd38qvzvm32acdyhmm27hfdpqcbg6isfad";
|
||||
url = "https://elpa.gnu.org/packages/csharp-mode-1.1.1.tar";
|
||||
sha256 = "096aj4np1ii60h1kxbff5lkfznd0l0x551x103m5i1ks82kxlv1l";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -816,10 +816,10 @@
|
||||
elpaBuild {
|
||||
pname = "csv-mode";
|
||||
ename = "csv-mode";
|
||||
version = "1.16";
|
||||
version = "1.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.16.tar";
|
||||
sha256 = "1i43b2p31xhrf97xbdi35y550ysp69fasa5gcrhg6iyxw176807p";
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.17.tar";
|
||||
sha256 = "16kv3n70pl4h3jfmmqy9bzflsm4nv7cwvrj7g4mgy8yb76nbyka2";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1176,10 +1176,10 @@
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20211101";
|
||||
version = "20211205";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20211101.tar";
|
||||
sha256 = "0sxbf116msfv6ly1dqga2sz2zpqr78nzp3v44qy7rps2887incmr";
|
||||
url = "https://elpa.gnu.org/packages/eev-20211205.tar";
|
||||
sha256 = "0qicm3ym9n6iamlj0xyzn8729gfwjp5lwq6lj8r3ydgs4ggsr4jy";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1279,10 +1279,10 @@
|
||||
elpaBuild {
|
||||
pname = "elisp-benchmarks";
|
||||
ename = "elisp-benchmarks";
|
||||
version = "1.12";
|
||||
version = "1.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.12.tar";
|
||||
sha256 = "0jzpzif4vrjg5hl0hxg4aqvi6nv56cxa1w0amnkgcz4hsscxkvwm";
|
||||
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.13.tar";
|
||||
sha256 = "13gvljqj7k8qpyn9fcwa6gl3kqakiy5rqx5s3afdc2y356a06wr6";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1474,10 +1474,10 @@
|
||||
elpaBuild {
|
||||
pname = "exwm";
|
||||
ename = "exwm";
|
||||
version = "0.25";
|
||||
version = "0.26";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.25.tar";
|
||||
sha256 = "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7";
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.26.tar";
|
||||
sha256 = "03pg0r8a5vb1wc5grmjgzql74p47fniv47x39gdll5s3cq0haf6q";
|
||||
};
|
||||
packageRequires = [ xelb ];
|
||||
meta = {
|
||||
@ -2078,10 +2078,10 @@
|
||||
elpaBuild {
|
||||
pname = "javaimp";
|
||||
ename = "javaimp";
|
||||
version = "0.7.1";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/javaimp-0.7.1.tar";
|
||||
sha256 = "0i93akp9jhlpgbm454wkjhir8cbzhfjb97cxxlk8n4pgzbh481l3";
|
||||
url = "https://elpa.gnu.org/packages/javaimp-0.8.tar";
|
||||
sha256 = "1i6k0yz6r7v774qgnkzinia783fwx73y3brxr31sbip3b5dbpmsn";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2164,6 +2164,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
kind-icon = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg-lib }:
|
||||
elpaBuild {
|
||||
pname = "kind-icon";
|
||||
ename = "kind-icon";
|
||||
version = "0.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/kind-icon-0.1.3.tar";
|
||||
sha256 = "0iqbjlqna5n8dx78350macs129wnri7kgmxk2qf3w9bj6qp760sn";
|
||||
};
|
||||
packageRequires = [ emacs svg-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/kind-icon.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }:
|
||||
elpaBuild {
|
||||
pname = "kiwix";
|
||||
@ -2348,10 +2363,10 @@
|
||||
elpaBuild {
|
||||
pname = "marginalia";
|
||||
ename = "marginalia";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/marginalia-0.9.tar";
|
||||
sha256 = "0jnw9ys7p2rhi7sx2wxi3xs95ryg9vr34xb2jdfiz0p1xv04a300";
|
||||
url = "https://elpa.gnu.org/packages/marginalia-0.10.tar";
|
||||
sha256 = "0sw4kfqda3z9bph4vgzqvg045li64ww2gdc2cgddi2m5p7anq20g";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2389,6 +2404,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
mct = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "mct";
|
||||
ename = "mct";
|
||||
version = "0.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mct-0.3.0.tar";
|
||||
sha256 = "07wywk5zadcinjpx9hvag8ndzb426lq5jlg42rqdgrv92ka7n16b";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/mct.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
memory-usage = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "memory-usage";
|
||||
@ -2517,10 +2547,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.6.0.tar";
|
||||
sha256 = "03ahavpvd57z7cw1n46k6lq5335p1ld7kkjcylyx5fvq1rc1jw44";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.7.0.tar";
|
||||
sha256 = "1ncpgya5lbwr5z7gbq59prfqqnjxhqgaylcjr23mwrhbvvfrj5ff";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2661,10 +2691,10 @@
|
||||
elpaBuild {
|
||||
pname = "nano-agenda";
|
||||
ename = "nano-agenda";
|
||||
version = "0.1";
|
||||
version = "0.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nano-agenda-0.1.tar";
|
||||
sha256 = "1bylgd4ly6dybpg66ndgsmgs5w0y5ymfq3s2pbwjnl46fnrmggz0";
|
||||
url = "https://elpa.gnu.org/packages/nano-agenda-0.2.1.tar";
|
||||
sha256 = "0j29fwc273mjdlj83h1a46sb7z3j066qqnp2i78kn2pmgjg27szb";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2860,10 +2890,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.5";
|
||||
version = "9.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.5.tar";
|
||||
sha256 = "16cflg5nms5nb8w86nvwkg49zkl0rvdhigkf4xpvbs0v7zb5y3ky";
|
||||
url = "https://elpa.gnu.org/packages/org-9.5.1.tar";
|
||||
sha256 = "033q5rpk8kfp43qymll339dybk4ig3gc6jz7av6zwjjcz2iawpj1";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2901,6 +2931,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-transclusion = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
|
||||
elpaBuild {
|
||||
pname = "org-transclusion";
|
||||
ename = "org-transclusion";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-transclusion-1.0.1.tar";
|
||||
sha256 = "1mn66a82nk3daf2vjw6pg9zgff48inik04ffizgm6cdlgn6ymrcs";
|
||||
};
|
||||
packageRequires = [ emacs org ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org-transclusion.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-translate = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
|
||||
elpaBuild {
|
||||
pname = "org-translate";
|
||||
@ -3006,6 +3051,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
parser-generator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "parser-generator";
|
||||
ename = "parser-generator";
|
||||
version = "0.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/parser-generator-0.1.3.tar";
|
||||
sha256 = "13ssmdlni9ma6iafr4zwa2jlmq6rdlaafkdpli1a4jrk6ri6w996";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/parser-generator.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "path-iterator";
|
||||
@ -3055,10 +3115,10 @@
|
||||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.4.12";
|
||||
version = "0.4.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.12.tar";
|
||||
sha256 = "0xkzx5narbry0kbamzxv1hjgsal98cj9rp3ck25xg2ywb6nspwcw";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.13.tar";
|
||||
sha256 = "03j5ck0pk88kdl7br1rkdqmnjd8418y9w9m27gk63hqbi3p8diy6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3100,10 +3160,10 @@
|
||||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "1.1.0";
|
||||
version = "1.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.1.0.tar";
|
||||
sha256 = "0ddm149dz71nksbpz7rwa8cax1nisf6wklv5iq4zrcbf5ghpagkg";
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.1.2.tar";
|
||||
sha256 = "0vrv46v7qwmax5m1i6b7lwdh789dfr18ggxjl4bk05qn7waway6j";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3160,10 +3220,10 @@
|
||||
elpaBuild {
|
||||
pname = "pyim";
|
||||
ename = "pyim";
|
||||
version = "3.9.4";
|
||||
version = "3.9.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.9.4.tar";
|
||||
sha256 = "0ggnl2jidcklyhqd5av5kk1f855gsq29wq2nhvp1yjzn35hz6xij";
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.9.5.tar";
|
||||
sha256 = "1dj46yprbl3l6n83aj0hsnd0rwjcp4ypyg2nhwig39wxirwlf9an";
|
||||
};
|
||||
packageRequires = [ async emacs xr ];
|
||||
meta = {
|
||||
@ -3440,10 +3500,10 @@
|
||||
elpaBuild {
|
||||
pname = "rec-mode";
|
||||
ename = "rec-mode";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rec-mode-1.8.1.tar";
|
||||
sha256 = "0injk27l38d0sl9nzjz2bkd0qgccxyf31i42mwmivv86kv0kyxyb";
|
||||
url = "https://elpa.gnu.org/packages/rec-mode-1.8.2.tar";
|
||||
sha256 = "06mjj1la2v8zdhsflj3mwcp7qnkj7gxzm8wbk2pli1h8vnq2zvd0";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3533,7 +3593,7 @@
|
||||
version = "2.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rt-liberation-2.4.tar";
|
||||
sha256 = "1yqcrgfn9lbv26729x5d9qx4zyp1k05r4f63ikrnk8lhqpjs5i00";
|
||||
sha256 = "1qfd0dy4n04gf3vx0pbwfgmp4wm2a64sh3m6mlfhinqgmasajh6r";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -3626,10 +3686,10 @@
|
||||
elpaBuild {
|
||||
pname = "setup";
|
||||
ename = "setup";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/setup-1.1.0.tar";
|
||||
sha256 = "1xbh4fix6n47avv57gz48zf4ad1l6mfj30qr5lwvk6pz5gpnjg7i";
|
||||
url = "https://elpa.gnu.org/packages/setup-1.2.0.tar";
|
||||
sha256 = "1fyzkm42gsvsjpk3vahfb7asfldarixm0wsw3g66q3ad0r7cbjnz";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3868,8 +3928,8 @@
|
||||
ename = "sql-beeline";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/sql-beeline-0.1.el";
|
||||
sha256 = "0z2wdvvq1zdw90253s5i57lx8b59rjf7g7isns4yz29lwav04j3r";
|
||||
url = "https://elpa.gnu.org/packages/sql-beeline-0.1.tar";
|
||||
sha256 = "0yvj96aljmyiz8y6xjpypqjfrl1jdcrcc4jx4kbgl6mkv4z2aq1g";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -4095,10 +4155,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.5.1.4";
|
||||
version = "2.5.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.1.4.tar";
|
||||
sha256 = "0mk9r9hj43klah7mwldg4bw7fxcqvrbwv1gj6g90zdfsflqy7nh9";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.1.5.tar";
|
||||
sha256 = "1g3xf97q5h6sr67w9bphcbbqx9jz2lbl8lij5rz1r0zbsnlcv7n8";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4188,7 +4248,7 @@
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/uni-confusables-0.2.tar";
|
||||
sha256 = "1lak9sr0h7hmc4qb7lzjqc1f88vjzbk8n76sspplfrizs3avg5ps";
|
||||
sha256 = "1an2l7f8lqhp3hq511a371isv1q00nx431g2a7266pp6pn2sndj1";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -4203,7 +4263,7 @@
|
||||
version = "1.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/uniquify-files-1.0.3.tar";
|
||||
sha256 = "04yfys615ncz3jyh3hx5sg6x6szx028223184zv52skb4j99vkwq";
|
||||
sha256 = "1i7svplkw9wxiypw52chdry7f5gf992fb4yg8s7jy77v521fd2af";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4376,10 +4436,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico";
|
||||
ename = "vertico";
|
||||
version = "0.14";
|
||||
version = "0.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.14.tar";
|
||||
sha256 = "1lvfvrmfi6f1jcf356rj1zl2bcbqxas7wi3yb93mxpn37l22l8mi";
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.17.tar";
|
||||
sha256 = "1zhrkdhnc32wsc5f958hwa7mgf2vcjh3x6ng1cpndds5yllxb7s9";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4396,10 +4456,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico-posframe";
|
||||
ename = "vertico-posframe";
|
||||
version = "0.3.10";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.3.10.tar";
|
||||
sha256 = "1bksipfi92adlmnk2rdw33c2g6qhw8hplcg67xhc299svqlkd0j2";
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.4.2.tar";
|
||||
sha256 = "1kajkjnjlisws2zdahy3bym942f3zvf05qhbmw9i2lv54jiy07pz";
|
||||
};
|
||||
packageRequires = [ emacs posframe vertico ];
|
||||
meta = {
|
||||
@ -4474,10 +4534,10 @@
|
||||
elpaBuild {
|
||||
pname = "wcheck-mode";
|
||||
ename = "wcheck-mode";
|
||||
version = "2020.10.4";
|
||||
version = "2021";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/wcheck-mode-2020.10.4.el";
|
||||
sha256 = "0pi6gvyw80phmx0qzc5wdk5czv4m9cq1hs3l4s7r8rr91g2cqi3m";
|
||||
url = "https://elpa.gnu.org/packages/wcheck-mode-2021.tar";
|
||||
sha256 = "0qcj0af0570cssy9b7f74v9pv0pssm6ysnl1lyh8wwvl4yf0zx61";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -4594,10 +4654,10 @@
|
||||
elpaBuild {
|
||||
pname = "wisi";
|
||||
ename = "wisi";
|
||||
version = "3.1.5";
|
||||
version = "3.1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/wisi-3.1.5.tar";
|
||||
sha256 = "07jc8x6xdhpjv9hlghmvk7ga4gwww33nj5pizlx5scvpp0qvikpy";
|
||||
url = "https://elpa.gnu.org/packages/wisi-3.1.7.tar";
|
||||
sha256 = "1xraks3n97axc978qlgcwr4f7ib3lyr4bvb5lq5z099hd2g01qch";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
|
||||
@ -297,10 +297,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser";
|
||||
ename = "geiser";
|
||||
version = "0.18";
|
||||
version = "0.19";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.18.tar";
|
||||
sha256 = "131j4f82hl4pqj07qsl1f2dz4105v5fyll3bc97ggayzvrdiy58i";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.19.tar";
|
||||
sha256 = "13w6gx6y8ilppcpfib5293600n0xy4xc4xa6idpmbcfd2pkmnw1x";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -327,10 +327,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-chibi";
|
||||
ename = "geiser-chibi";
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.16.tar";
|
||||
sha256 = "0j9dgg2q01ya6yawpfc15ywrfykd5gzbh118k1x4mghfkfnqn1zi";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.17.tar";
|
||||
sha256 = "1mpbkv48y1ij762f61hp1zjg3lx8k5b9bbsm5lfb7xzvmk5k3zf0";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
@ -342,10 +342,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-chicken";
|
||||
ename = "geiser-chicken";
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.16.tar";
|
||||
sha256 = "1zmb8c86akrd5f1v59s4xkbpgsqbdcbc6d5f9h6kxa55ylc4dn6a";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.17.tar";
|
||||
sha256 = "13jhh0083fjx4xq0k31vw5v3ffbmn3jkb2608bimm9xlw6acgn4s";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
@ -357,10 +357,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-gambit";
|
||||
ename = "geiser-gambit";
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.16.tar";
|
||||
sha256 = "0bc38qlqj7a3cnrcnqrb6m3jvjh2ia5iby9i50vcn0jbs52rfsnz";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.17.tar";
|
||||
sha256 = "12r9h1dl0y9j421v0idvr9ljj93962xfrs0nff5lmx5z1cayq456";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
@ -387,10 +387,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-guile";
|
||||
ename = "geiser-guile";
|
||||
version = "0.18";
|
||||
version = "0.19";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.18.tar";
|
||||
sha256 = "1jnqra7gysscn0gb1ap56rbjlrnhsmma7q4yfiy3zxsz8m69xhqf";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.19.tar";
|
||||
sha256 = "1rjml11gkl80x4hmh84m84r4qb3kxi36d7mwm25n791v5fs1cl32";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
@ -417,10 +417,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-mit";
|
||||
ename = "geiser-mit";
|
||||
version = "0.13";
|
||||
version = "0.15";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.13.tar";
|
||||
sha256 = "1y2cgrcvdp358x7lpcz8x8nw5g1y4h03d9gbkbd6k85643cwrkbi";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.15.tar";
|
||||
sha256 = "11agp5k79g0w5596x98kbwijvqnb1hwrbqx680mh1svd1l8374q0";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
@ -447,10 +447,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-stklos";
|
||||
ename = "geiser-stklos";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.3.tar";
|
||||
sha256 = "1wkhnkdhdrhrh0vipgnlmyimi859za6jhf2ldpwfmk8r2aj8ywan";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.4.tar";
|
||||
sha256 = "18z34x4xmn58080r2ar6wd07kap7f367my2q5ph6cdf0gs6nz4sv";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
@ -881,6 +881,26 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
pdf-tools = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, let-alist
|
||||
, lib
|
||||
, tablist }:
|
||||
elpaBuild {
|
||||
pname = "pdf-tools";
|
||||
ename = "pdf-tools";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.0.tar";
|
||||
sha256 = "0cjr7y2ikf2al43wrzlqdpbksj0ww6m0nvmlz97slx8nk94k2qyf";
|
||||
};
|
||||
packageRequires = [ emacs let-alist tablist ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/pdf-tools.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
php-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "php-mode";
|
||||
@ -975,10 +995,10 @@
|
||||
elpaBuild {
|
||||
pname = "rust-mode";
|
||||
ename = "rust-mode";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.1.tar";
|
||||
sha256 = "1rybjnaycvjgqp8g8lkjzgvnwd4565cbx88qlnxfrlqd5161r1k3";
|
||||
url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.2.tar";
|
||||
sha256 = "08zkq5md20ppqlvd5xxsbzargs6ffzmjr1b1pq9i937l3n9d4swl";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1095,6 +1115,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
subed = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "0.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-0.0.2.tar";
|
||||
sha256 = "1q9sb8kn1g5hvmm5zl4hm90fvf5kb82da69y24x7yzgs6axy0dga";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/subed.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
|
||||
elpaBuild {
|
||||
pname = "swift-mode";
|
||||
@ -1125,6 +1160,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tablist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "tablist";
|
||||
ename = "tablist";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/tablist-1.0.tar";
|
||||
sha256 = "1r37vk31ddiahhd11ric00py9ay9flgmsv368j47pl9653g9i6d9";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/tablist.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "tuareg";
|
||||
@ -1185,6 +1235,26 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
webpaste = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, request }:
|
||||
elpaBuild {
|
||||
pname = "webpaste";
|
||||
ename = "webpaste";
|
||||
version = "3.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/webpaste-3.2.2.tar";
|
||||
sha256 = "0vviv062v46mlssz8627623g1b2nq4n4x3yiv8c882gvgvfvi2bi";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs request ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/webpaste.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
wgrep = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "wgrep";
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20210920";
|
||||
version = "20210929";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20210920.tar";
|
||||
sha256 = "01b44npf0rxq7c4ddygc3n3cv3h7afs41az0nfs67a5x7ag6c1jj";
|
||||
url = "https://orgmode.org/elpa/org-20210929.tar";
|
||||
sha256 = "1fxhxjy48jxvs16x7270c4qj6n4lm952sn7q369c88gbf2jqxis4";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -19,10 +19,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20210920";
|
||||
version = "20210929";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210920.tar";
|
||||
sha256 = "1m376fnm8hrm83hgx4b0y21lzdrbxjp83bv45plvrjky44qfdwfn";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210929.tar";
|
||||
sha256 = "0bn80kji2h423d39c0am2r3p2hwvdxs9rm31xa4810dff27ihxb1";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -64,6 +64,16 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
|
||||
rm -fr .git
|
||||
'')
|
||||
|
||||
# Add the name of the wrapped gvfsd
|
||||
# This used to be carried as a patch but it often got out of sync with upstream
|
||||
# and was hard to maintain for emacs-overlay.
|
||||
(lib.concatStrings (map (fn: ''
|
||||
sed -i 's#(${fn} "gvfs-fuse-daemon")#(${fn} "gvfs-fuse-daemon") (${fn} ".gvfsd-fuse-wrapped")#' lisp/net/tramp-gvfs.el
|
||||
'') [
|
||||
"tramp-compat-process-running-p"
|
||||
"tramp-process-running-p"
|
||||
]))
|
||||
|
||||
# Reduce closure size by cleaning the environment of the emacs dumper
|
||||
''
|
||||
substituteInPlace src/Makefile.in \
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
|
||||
index f370abba31..f2806263a9 100644
|
||||
--- a/lisp/net/tramp-gvfs.el
|
||||
+++ b/lisp/net/tramp-gvfs.el
|
||||
@@ -164,7 +164,8 @@ tramp-gvfs-enabled
|
||||
(and (featurep 'dbusbind)
|
||||
(tramp-compat-funcall 'dbus-get-unique-name :system)
|
||||
(tramp-compat-funcall 'dbus-get-unique-name :session)
|
||||
- (or (tramp-compat-process-running-p "gvfs-fuse-daemon")
|
||||
+ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
|
||||
+ (tramp-compat-process-running-p "gvfs-fuse-daemon")
|
||||
(tramp-compat-process-running-p "gvfsd-fuse"))))
|
||||
"Non-nil when GVFS is available.")
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
|
||||
index 9e26c8fd6d..fa220e513c 100644
|
||||
--- a/lisp/net/tramp-gvfs.el
|
||||
+++ b/lisp/net/tramp-gvfs.el
|
||||
@@ -125,5 +125,6 @@
|
||||
;; for some processes. Better we don't check.
|
||||
(<= emacs-major-version 25)
|
||||
(tramp-compat-process-running-p "gvfs-fuse-daemon")
|
||||
+ (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
|
||||
(tramp-compat-process-running-p "gvfsd-fuse"))))
|
||||
"Non-nil when GVFS is available.")
|
||||
@ -23,7 +23,7 @@ let
|
||||
"x86_64-linux" = "x64";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl gtk3 cairo pango ];
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl gtk3 cairo pango curl ];
|
||||
in let
|
||||
binaryPackage = stdenv.mkDerivation {
|
||||
pname = "${pname}-bin";
|
||||
|
||||
@ -9,15 +9,15 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brscan5";
|
||||
version = "1.2.6-0";
|
||||
version = "1.2.7-0";
|
||||
src = {
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf104034/${pname}-${version}.i386.deb";
|
||||
sha256 = "102q745pc0168syggd4gym51qf3m3iqld3a4skfnbkm6yky4w4s8";
|
||||
sha256 = "647d06f629c22408d25be7c0bf49a4b1c7280bf78a27aa2cde6c3e3fa8b6807a";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf104033/${pname}-${version}.amd64.deb";
|
||||
sha256 = "1pwbzhpg5nzpw2rw936vf2cr334v8iny16y8fbb1zimgzmv427wx";
|
||||
sha256 = "867bd88ab0d90f8e9391dc8127385095127e533cb6bd2d5d13449df602b165ae";
|
||||
};
|
||||
}."${stdenv.hostPlatform.system}";
|
||||
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
pushd $out/$PATH_TO_BRSCAN5
|
||||
ln -s libLxBsDeviceAccs.so.1.0.0 libLxBsDeviceAccs.so.1
|
||||
ln -s libLxBsNetDevAccs.so.1.0.0 libLxBsNetDevAccs.so.1
|
||||
ln -s libLxBsScanCoreApi.so.3.0.0 libLxBsScanCoreApi.so.3
|
||||
ln -s libLxBsScanCoreApi.so.3.2.0 libLxBsScanCoreApi.so.3
|
||||
ln -s libLxBsUsbDevAccs.so.1.0.0 libLxBsUsbDevAccs.so.1
|
||||
ln -s libsane-brother5.so.1.0.7 libsane-brother5.so.1
|
||||
popd
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.5.2";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "ZlyteVTwP5oM32G+yUzCOmu6b/b19RVLmlEvyOz5hu0=";
|
||||
sha256 = "PGrx2JBYmp5vQ8jLpOfiT1T1+SNeRt0W5oHUjHNKuBE=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
||||
@ -33,5 +33,6 @@ symlinkJoin {
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ smironov globin TethysSvensson ];
|
||||
mainProgram = "zathura";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "96.0.4664.93",
|
||||
"sha256": "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw",
|
||||
"sha256bin64": "15233njj6ln7q3c112ssfh9s4m3shhp920zw8648z9dr7k8512qb",
|
||||
"version": "96.0.4664.110",
|
||||
"sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n",
|
||||
"sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-09-24",
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.23.0";
|
||||
sha256 = "15j4r43hy3slyahx4am7lj7jns4x3axrcbr9qwiznmk8qbvrzrdy";
|
||||
manifestsSha256 = "10rh0q1la5dq6n9y1yvw9ilj5lhzx8vh1zi2lznfjsvc5niwx7wf";
|
||||
version = "0.24.0";
|
||||
sha256 = "025dynxkfqrnpqrvdq39394biky2ra1mfjirrigamngchifav3b3";
|
||||
manifestsSha256 = "0sbbvv40c66qdrhlvas42qcdmpgg1mb8zzcdrfr5yrkqwxnzis7x";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
url =
|
||||
"https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
sha256 = manifestsSha256;
|
||||
stripRoot = false;
|
||||
};
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
in buildGoModule rec {
|
||||
pname = "fluxcd";
|
||||
inherit version;
|
||||
|
||||
@ -23,15 +23,13 @@ buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vFm9ai+VWOPLRckKJ7gfD/0iQ8b4o5HNQE4cekb0vA0=";
|
||||
vendorSha256 = "0w1qzsri3dkyzwfh6s13np52j3xzxxhk02pqgfh7297djwbppnbs";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./patches/disable-tests-ssh_key.patch
|
||||
];
|
||||
patches = [ ./patches/disable-tests-ssh_key.patch ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
|
||||
@ -39,7 +37,7 @@ buildGoModule rec {
|
||||
|
||||
# Required to workaround test error:
|
||||
# panic: mkdir /homeless-shelter: permission denied
|
||||
HOME="$TMPDIR";
|
||||
HOME = "$TMPDIR";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -58,7 +56,8 @@ buildGoModule rec {
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open and extensible continuous delivery solution for Kubernetes";
|
||||
description =
|
||||
"Open and extensible continuous delivery solution for Kubernetes";
|
||||
longDescription = ''
|
||||
Flux is a tool for keeping Kubernetes clusters in sync
|
||||
with sources of configuration (like Git repositories), and automating
|
||||
|
||||
@ -1,19 +1,17 @@
|
||||
diff --git a/cmd/flux/create_secret_git_test.go b/cmd/flux/create_secret_git_test.go
|
||||
index afa34ba..0d22cce 100644
|
||||
--- a/cmd/flux/create_secret_git_test.go
|
||||
+++ b/cmd/flux/create_secret_git_test.go
|
||||
@@ -20,16 +20,6 @@ func TestCreateGitSecret(t *testing.T) {
|
||||
--- flux/cmd/flux/create_secret_git_test.go.orig 2021-12-07 13:46:21.196278468 +0100
|
||||
+++ flux/cmd/flux/create_secret_git_test.go 2021-12-07 13:49:51.668566955 +0100
|
||||
@@ -20,16 +20,6 @@
|
||||
args: "create secret git podinfo-auth --url=https://github.com/stefanprodan/podinfo --username=my-username --password=my-password --namespace=my-namespace --export",
|
||||
assert: assertGoldenFile("./testdata/create_secret/git/secret-git-basic.yaml"),
|
||||
},
|
||||
- {
|
||||
- name: "ssh key",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/rsa.private --namespace=my-namespace --export",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/ecdsa.private --namespace=my-namespace --export",
|
||||
- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret.yaml"),
|
||||
- },
|
||||
- {
|
||||
- name: "ssh key with password",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/rsa-password.private --password=password --namespace=my-namespace --export",
|
||||
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/ecdsa-password.private --password=password --namespace=my-namespace --export",
|
||||
- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret-password.yaml"),
|
||||
- },
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.8";
|
||||
version = "0.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-8b1VyukVMTXLAnvYcjXgTdPtMq3YxJgTpxe25Kj+Wpw=";
|
||||
sha256 = "sha256-mBPRsLBIwahKm2RR22pNXxJhdLaWHCKx0TKc4H4YIVY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catgirl";
|
||||
version = "1.9a";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-MEm5mrrWfNp+mBHFjGSOGvvfvBJ+Ho/K+mPUxzJDkV0=";
|
||||
sha256 = "sha256-rk6nvfyaFxJ/7JN92L5tDraTngffVb6u/U7dbNjK9jI=";
|
||||
};
|
||||
|
||||
# catgirl's configure script uses pkg-config --variable exec_prefix openssl
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "owncloud-client";
|
||||
version = "2.9.1.5500";
|
||||
version = "2.9.2.6206";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz";
|
||||
sha256 = "0h4dclxr6kmhmx318wvxz36lhyqw84q0mg4c6di6p230mp8b1l4v";
|
||||
sha256 = "sha256-i6TmJFEuH4A1jTyoKiJoVU7yC+AXZIH4miYSk3XzVEo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "teamviewer";
|
||||
version = "15.22.3";
|
||||
version = "15.24.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
|
||||
sha256 = "15fvzhdq7mnx2l2w4byvij8ww16qwdlkbadal60rm66yzv79mv9w";
|
||||
sha256 = "sha256-u4azVjwD5xTc0vWe8tDEx44rBdYFZljZPVQ0yilqeR0=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grisbi";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-4ykG310He1aFaUNo5fClaM3QWFBzKERGihYfqaxR1Vo=";
|
||||
sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, python3Packages
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
@ -13,22 +12,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pympress";
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-f+OjE0x/3yfJYHCLB+on7TT7MJ2vNu87SHRi67qFDCM=";
|
||||
sha256 = "sha256-AxH0PyAWYEEIqQAx9gG2eYyXMijLZGZqXkRhld32ieE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Should not be needed once v1.6.4 is released
|
||||
(fetchpatch {
|
||||
name = "fix-setuptools-version-parsing.patch";
|
||||
url = "https://github.com/Cimbali/pympress/commit/474514d71396ac065e210fd846e07ed1139602d0.diff";
|
||||
sha256 = "sha256-eiw54sjMrXrNrhtkAXxiSTatzoA0NDA03L+HpTDax58=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, coreutils, fltk, libjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
pname = "seaview";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
|
||||
sha256 = "09yp8467h49qnj7gg0mbcdha4ai3bn6vgs00gb76dd6h3pzfflz1";
|
||||
sha256 = "sha256-zo9emLpHiDv6kekbx55NOibxWN2Zg7XngzGkUqSx+PI=";
|
||||
};
|
||||
|
||||
buildInputs = [ fltk libjpeg ];
|
||||
|
||||
@ -125,6 +125,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/32567
|
||||
(fetchSageDiff {
|
||||
base = "9.5.beta2";
|
||||
name = "arb-2.21.0-update.patch";
|
||||
rev = "eb3304dd521a3d5a9334e747a08e234bbf16b4eb";
|
||||
sha256 = "sha256-XDkaY4VQGyESXI6zuD7nCNzyQOl/fmBFvAESH9+RRvk=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/32797
|
||||
(fetchSageDiff {
|
||||
base = "9.5.beta7";
|
||||
|
||||
@ -17,7 +17,7 @@ let
|
||||
archSha256 = sha256;
|
||||
arch = "x64";
|
||||
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango curl.out ];
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango curl ];
|
||||
redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ];
|
||||
in let
|
||||
binaryPackage = stdenv.mkDerivation {
|
||||
|
||||
@ -14,6 +14,8 @@
|
||||
, dotnetTestFlags ? []
|
||||
# Flags to pass to `dotnet install`.
|
||||
, dotnetInstallFlags ? []
|
||||
# Flags to pass to `dotnet pack`.
|
||||
, dotnetPackFlags ? []
|
||||
# Flags to pass to dotnet in all phases.
|
||||
, dotnetFlags ? []
|
||||
|
||||
@ -21,11 +23,22 @@
|
||||
# Unfortunately, dotnet has no method for doing this automatically.
|
||||
# If unset, all executables in the projects root will get installed. This may cause bloat!
|
||||
, executables ? null
|
||||
# Packs a project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`.
|
||||
, packNupkg ? false
|
||||
# The packages project file, which contains instructions on how to compile it. This can be an array of multiple project files as well.
|
||||
, projectFile ? null
|
||||
# The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched.
|
||||
# This can be generated using the `nuget-to-nix` tool.
|
||||
, nugetDeps ? null
|
||||
# A list of derivations containing nupkg packages for local project references.
|
||||
# Referenced derivations can be built with `buildDotnetModule` with `packNupkg=true` flag.
|
||||
# Since we are sharing them as nugets they must be added to csproj/fsproj files as `PackageReference` as well.
|
||||
# For example, your project has a local dependency:
|
||||
# <ProjectReference Include="../foo/bar.fsproj" />
|
||||
# To enable discovery through `projectReferences` you would need to add a line:
|
||||
# <ProjectReference Include="../foo/bar.fsproj" />
|
||||
# <PackageReference Include="bar" Version="*" Condition=" '$(ContinuousIntegrationBuild)'=='true' "/>
|
||||
, projectReferences ? []
|
||||
# Libraries that need to be available at runtime should be passed through this.
|
||||
# These get wrapped into `LD_LIBRARY_PATH`.
|
||||
, runtimeDeps ? []
|
||||
@ -60,6 +73,7 @@ let
|
||||
inherit sha256;
|
||||
};
|
||||
});
|
||||
_localDeps = linkFarmFromDrvs "${name}-local-nuget-deps" projectReferences;
|
||||
|
||||
nuget-source = stdenvNoCC.mkDerivation rec {
|
||||
name = "${args.pname}-nuget-source";
|
||||
@ -72,6 +86,8 @@ let
|
||||
|
||||
nuget sources Add -Name nixos -Source "$out/lib"
|
||||
nuget init "${_nugetDeps}" "$out/lib"
|
||||
${lib.optionalString (projectReferences != [])
|
||||
"nuget init \"${_localDeps}\" \"$out/lib\""}
|
||||
|
||||
# Generates a list of all unique licenses' spdx ids.
|
||||
find "$out/lib" -name "*.nuspec" -exec sh -c \
|
||||
@ -167,7 +183,18 @@ let
|
||||
"''${dotnetInstallFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
done
|
||||
'' + (if executables != null then ''
|
||||
'' + (lib.optionalString packNupkg ''
|
||||
for project in ''${projectFile[@]}; do
|
||||
dotnet pack "$project" \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--output $out/share \
|
||||
--configuration "$buildType" \
|
||||
--no-build \
|
||||
"''${dotnetPackFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
done
|
||||
'') + (if executables != null then ''
|
||||
for executable in $executables; do
|
||||
execPath="$out/lib/${args.pname}/$executable"
|
||||
|
||||
|
||||
28
pkgs/data/misc/v2ray-geoip/default.nix
Normal file
28
pkgs/data/misc/v2ray-geoip/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202112090029";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "97f4acb31d926ae31bb3cdc5c8948d8dcdddca79";
|
||||
sha256 = "sha256-kYMp/D7xVpBTu35YXq45bR2XebpVOW57UAc7H/6px/U=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -m 0644 geoip.dat -D $out/share/v2ray/geoip.dat
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "GeoIP for V2Ray";
|
||||
homepage = "https://github.com/v2fly/geoip";
|
||||
license = licenses.cc-by-sa-40;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
||||
6
pkgs/data/misc/v2ray-geoip/update.sh
Executable file
6
pkgs/data/misc/v2ray-geoip/update.sh
Executable file
@ -0,0 +1,6 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p common-updater-scripts curl jq
|
||||
set -euo pipefail
|
||||
|
||||
COMMIT=$(curl "https://api.github.com/repos/v2fly/geoip/commits/release?per_page=1")
|
||||
update-source-version v2ray-geoip "$(echo $COMMIT | jq -r .commit.message)" --file=pkgs/data/misc/v2ray-geoip/default.nix --rev="$(echo $COMMIT | jq -r .sha)"
|
||||
@ -21,21 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-calculator";
|
||||
version = "1.7.1";
|
||||
|
||||
repoName = "calculator";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "calculator";
|
||||
rev = version;
|
||||
sha256 = "sha256-GoQFWhEhUBVLYL1vsIIBMT8pKc0dK/ploiGfUtJAJQU=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-U0wXrw9ZJwkqZAtTTHmTzqYhwF9V2JZEZZdDak3kPIc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -63,6 +55,12 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/elementary/calculator";
|
||||
description = "Calculator app designed for elementary OS";
|
||||
|
||||
@ -25,15 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-camera";
|
||||
version = "6.0.2";
|
||||
|
||||
repoName = "camera";
|
||||
version = "6.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "camera";
|
||||
rev = version;
|
||||
sha256 = "sha256-uVeV+LKA/W7WVUAvVWaSNRzeh1MUrhRjvS0HuhZZJ04=";
|
||||
sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -25,21 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-mail";
|
||||
version = "6.3.0";
|
||||
|
||||
repoName = "mail";
|
||||
version = "6.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "mail";
|
||||
rev = version;
|
||||
sha256 = "sha256-lIVAMTtRrzJI5Qcd6y24ZmtzFWeTSbcKiEhG8hLC+PM=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-wOu9jvvwG53vzcNa38nk4eREZWW7Cin8el4qApQ8gI8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -72,6 +64,12 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mail app designed for elementary OS";
|
||||
homepage = "https://github.com/elementary/mail";
|
||||
|
||||
@ -19,21 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-screenshot";
|
||||
version = "6.0.1";
|
||||
|
||||
repoName = "screenshot";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "screenshot";
|
||||
rev = version;
|
||||
sha256 = "sha256-MDmk+0IUCe6PSV5QOjjDRedv7X3lcBJ04jn9cE9DP3M=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-n+L08C/W5YnHZ5P3F1NGUYE2SH94sc4+kr1x+wXZ+cw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -60,6 +52,12 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Screenshot tool designed for elementary OS";
|
||||
homepage = "https://github.com/elementary/screenshot";
|
||||
|
||||
@ -26,21 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-tasks";
|
||||
version = "6.0.4";
|
||||
|
||||
repoName = "tasks";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "tasks";
|
||||
rev = version;
|
||||
sha256 = "1gb51gm8qgd8yzhqb7v69p2f1fgm3qf534if4lc85jrjsb8hgmhl";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-Gt9Hp9m28QdAFnKIT1xcbiSM5cn6kW7wEXmi/iFfu8k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -74,6 +66,12 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/elementary/tasks";
|
||||
description = "Synced tasks and reminders on elementary OS";
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
@ -24,30 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-terminal";
|
||||
version = "6.0.0";
|
||||
|
||||
repoName = "terminal";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "terminal";
|
||||
rev = version;
|
||||
sha256 = "08akr4sv4jy9kd4s26kib6j7i8hc3vs0sp71fifv7ww4mi9cm6jc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/terminal/pull/611
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/terminal/commit/4f6f2d9f58642ed904240c247cc0a0846baecb6b.patch";
|
||||
sha256 = "04pbd72migxw8i949v3bmw8kfi5nr02rjcwfrx3b6xkiic9825sv";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -81,6 +63,12 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal emulator designed for elementary OS";
|
||||
longDescription = ''
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-onlineaccounts";
|
||||
version = "6.2.2";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-L1SL8YbsYKdE+mvRW/fxjNoiyXRXTyV2ru7/tZzgTfM=";
|
||||
sha256 = "sha256-aRh2zbKqcGOH4Qw5gdJw07hod8a/QGWUcJo/2R9erQs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,30 +2,35 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, gettext
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-wallpapers";
|
||||
version = "6.0.0";
|
||||
|
||||
repoName = "wallpapers";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "wallpapers";
|
||||
rev = version;
|
||||
sha256 = "1qpf8w7x9sp3sd4zpsrlj5ywpwqkq4ywbagm4sf25cwwn82dl59b";
|
||||
sha256 = "sha256-E/cUxa/GNt/01EjuuvurHxJu3qV9e+jcdcCi2+NxVDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/symlink.py
|
||||
patchShebangs meson/symlink.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
|
||||
@ -44,6 +44,12 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch";
|
||||
sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc=";
|
||||
})
|
||||
# WindowSwitcher: Clear indicator background
|
||||
# https://github.com/elementary/gala/pull/1318
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/cce53acffecba795b6cc48916d4621a47996d2c9.patch";
|
||||
sha256 = "sha256-5aTZE6poo4sQMTLfk9Nhw4G4BW8i9dvpWktizRIS58Q=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,20 +4,20 @@ let
|
||||
getPatches = dir:
|
||||
let files = builtins.attrNames (builtins.readDir dir);
|
||||
in map (f: dir + ("/" + f)) files;
|
||||
version = "2.5.1";
|
||||
version = "2.8.0";
|
||||
channel = "stable";
|
||||
filename = "flutter_linux_${version}-${channel}.tar.xz";
|
||||
|
||||
# Decouples flutter derivation from dart derivation,
|
||||
# use specific dart version to not need to bump dart derivation when bumping flutter.
|
||||
dartVersion = "2.14.2";
|
||||
dartVersion = "2.15.0";
|
||||
dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
|
||||
dartForFlutter = dart.override {
|
||||
version = dartVersion;
|
||||
sources = {
|
||||
"${dartVersion}-x86_64-linux" = fetchurl {
|
||||
url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "1gr2dr683kz0a0k6rcn4jcbxf9fr2xlzi5fcgn1lzrrxvys2lddx";
|
||||
sha256 = "sha256-U1V1OPmFeNZCdBxFy7yqAbAE0cxh9f2UqKQmreJu9YA=";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -29,7 +29,7 @@ in {
|
||||
pname = "flutter";
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}";
|
||||
sha256 = "12ycz7iasrc9p9c6zr95l6llyji3za43gsx8cmr2kjfiv23bcrv2";
|
||||
sha256 = "sha256-sSz/owGdCMB5b9+cAWvLkrfFcIIq5665Xopd4JKv1G4=";
|
||||
};
|
||||
patches = getPatches ./patches;
|
||||
};
|
||||
|
||||
@ -1,62 +1,57 @@
|
||||
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
|
||||
index 80fb16673f..5723f93f9f 100644
|
||||
index ed42baea29..fee2fb1d62 100644
|
||||
--- a/packages/flutter_tools/lib/src/asset.dart
|
||||
+++ b/packages/flutter_tools/lib/src/asset.dart
|
||||
@@ -7,6 +7,7 @@
|
||||
import 'package:meta/meta.dart';
|
||||
import 'package:package_config/package_config.dart';
|
||||
|
||||
+import 'base/common.dart';
|
||||
import 'base/context.dart';
|
||||
import 'base/deferred_component.dart';
|
||||
import 'base/file_system.dart';
|
||||
@@ -16,6 +17,7 @@ import 'build_info.dart';
|
||||
import 'cache.dart';
|
||||
@@ -11,11 +11,11 @@ import 'base/file_system.dart';
|
||||
import 'base/logger.dart';
|
||||
import 'base/platform.dart';
|
||||
import 'build_info.dart';
|
||||
-import 'cache.dart';
|
||||
import 'convert.dart';
|
||||
import 'dart/package_map.dart';
|
||||
+import 'globals.dart' as globals;
|
||||
import 'devfs.dart';
|
||||
import 'flutter_manifest.dart';
|
||||
+import 'globals.dart' as globals;
|
||||
import 'license_collector.dart';
|
||||
@@ -449,7 +451,7 @@ class ManifestAssetBundle implements AssetBundle {
|
||||
for (final Map<String, Object> font in family['fonts'] as List<Map<String, Object>>) {
|
||||
final Uri entryUri = _fileSystem.path.toUri(font['asset'] as String);
|
||||
import 'project.dart';
|
||||
|
||||
@@ -504,7 +504,7 @@ class ManifestAssetBundle implements AssetBundle {
|
||||
}
|
||||
final Uri entryUri = _fileSystem.path.toUri(asset);
|
||||
result.add(_Asset(
|
||||
- baseDir: _fileSystem.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
|
||||
+ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
|
||||
- baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'),
|
||||
+ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, 'bin', 'cache', 'artifacts', 'material_fonts'),
|
||||
relativeUri: Uri(path: entryUri.pathSegments.last),
|
||||
entryUri: entryUri,
|
||||
package: null,
|
||||
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
|
||||
index 152d4e75e5..1fcff7e2bd 100644
|
||||
index 7870c7807f..3fcf92f20d 100644
|
||||
--- a/packages/flutter_tools/lib/src/cache.dart
|
||||
+++ b/packages/flutter_tools/lib/src/cache.dart
|
||||
@@ -9,6 +9,7 @@ import 'package:file/memory.dart';
|
||||
import 'package:meta/meta.dart';
|
||||
import 'package:process/process.dart';
|
||||
|
||||
@@ -22,6 +22,7 @@ import 'base/user_messages.dart';
|
||||
import 'build_info.dart';
|
||||
import 'convert.dart';
|
||||
import 'features.dart';
|
||||
+import 'globals.dart' as globals;
|
||||
import 'base/common.dart';
|
||||
import 'base/error_handling_io.dart';
|
||||
import 'base/file_system.dart';
|
||||
@@ -298,8 +299,15 @@ class Cache {
|
||||
|
||||
const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
|
||||
const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
|
||||
@@ -302,8 +303,13 @@ class Cache {
|
||||
return;
|
||||
}
|
||||
assert(_lock == null);
|
||||
+
|
||||
+ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
|
||||
+ if (!dir.existsSync()) {
|
||||
+ dir.createSync(recursive: true);
|
||||
+ globals.os.chmod(dir, '755');
|
||||
+ }
|
||||
+
|
||||
final File lockFile =
|
||||
- _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile'));
|
||||
+ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile'));
|
||||
try {
|
||||
_lock = lockFile.openSync(mode: FileMode.write);
|
||||
} on FileSystemException catch (e) {
|
||||
@@ -404,7 +412,7 @@ class Cache {
|
||||
@@ -453,7 +459,7 @@ class Cache {
|
||||
if (_rootOverride != null) {
|
||||
return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
|
||||
} else {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin";
|
||||
version = "1.6.0";
|
||||
version = "1.6.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "sha256-F0yS4SpUwJAf2fC62s8VFMKLUZepVlTk2rF3UpPd4dw=";
|
||||
sha256 = "sha256-QyJnmW0Na0sXyo3g+HjkTUoJm36fFYepjtxNJ+dsIVo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin-native";
|
||||
version = "1.6.0";
|
||||
version = "1.6.10";
|
||||
|
||||
src = let
|
||||
getArch = {
|
||||
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
|
||||
"https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";
|
||||
|
||||
getHash = arch: {
|
||||
"macos-aarch64" = "sha256-HLI6E3Y8l/5vAgjT39ezBCEYhCGV3pdjx1B1fL57qO4=";
|
||||
"macos-x86_64" = "sha256-cJV+dP9/pJHlJx55HMqd7KC/OIWEzPXKmobCZLBZ+ec=";
|
||||
"linux-x86_64" = "sha256-C5R2hdPg1cOA9WcSZYkN22Ca3/pslEcp554tuy/HxnQ=";
|
||||
"macos-aarch64" = "sha256-W+9F1YZ5ATa6KaALYQEXW4xr4UxfquuC72xoB2987iM=";
|
||||
"macos-x86_64" = "sha256-pceORt+YJZiP67nbnUB6ny1ic/r0aTrdA2hsQi5Otp8=";
|
||||
"linux-x86_64" = "sha256-tcZffJPcR6PYJ22wIh5BHn/yjG3Jb+MG5COLbAQ2/Ww=";
|
||||
}.${arch};
|
||||
in
|
||||
fetchurl {
|
||||
|
||||
@ -11,21 +11,21 @@ let
|
||||
name = "cbqn-bytecode-files";
|
||||
owner = "dzaima";
|
||||
repo = "CBQN";
|
||||
rev = "db686e89d4d2e9bfac3dddf306dff890135b2de1";
|
||||
hash = "sha256-RJ751jCsAGjqQx3V5S5Uc611n+/TBs6G2o0q26x98NM=";
|
||||
rev = "b000b951aa8f3590b196b4c09056604c0b32a168";
|
||||
hash = "sha256-znW0xOXogP4TfifUmk3cs4aN/9mMSpSD2WJppmeI1Fg=";
|
||||
};
|
||||
in
|
||||
assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
|
||||
version = "0.pre+date=2021-11-06";
|
||||
version = "0.pre+date=2021-12-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dzaima";
|
||||
repo = "CBQN";
|
||||
rev = "cd866e1e45ce0f22bfacd25565ab912c06cb040f";
|
||||
hash = "sha256-XuowrGDgrttRL/SY5si0nqHMKEidSNrQuquxNdBCW8o=";
|
||||
rev = "e7662b0f6a44add0749fba2a6d7309a5c1eb2601";
|
||||
hash = "sha256-2nfkTZBIGHX5cok6Ea3KSewakZy8Ey8nSO2Fe4xGgvg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bqn";
|
||||
version = "0.pre+date=2021-11-08";
|
||||
version = "0.pre+date=2021-12-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlochbaum";
|
||||
repo = "BQN";
|
||||
rev = "5c68173276c1c1b136a7eda3ad8f4423ab0ee9d0";
|
||||
hash = "sha256-e0P1I8I/J41Hk7Edb4uKCdx30Azkiheq014kSZzJ8yg=";
|
||||
rev = "2c2e86e10ff963a6aefa14f76fd8833ce3c9157c";
|
||||
hash = "sha256-iAlDXGlHTeI6+r/QKFiBHhj5A+FgUy7JFrCpAwpyVQU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -285,4 +285,8 @@ in {
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
rustpython = callPackage ./rustpython/default.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
|
||||
};
|
||||
|
||||
})
|
||||
|
||||
44
pkgs/development/interpreters/python/rustpython/default.nix
Normal file
44
pkgs/development/interpreters/python/rustpython/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, SystemConfiguration
|
||||
, python3
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustpython";
|
||||
version = "unstable-2021-12-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustPython";
|
||||
repo = "RustPython";
|
||||
rev = "db3b3127df34ff5dd569301aa36ed71ae5624e4e";
|
||||
sha256 = "sha256-YwGfXs3A5L/18mHnnWubPU3Y8EI9uU3keJ2HJnnTwv0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T85kiPG80oZ4mwpb8Ag40wDHKx2Aens+gM7NGXan5lM=";
|
||||
|
||||
# freeze the stdlib into the rustpython binary
|
||||
cargoBuildFlags = "--features=freeze-stdlib";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ];
|
||||
|
||||
checkInputs = [ python3 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python 3 interpreter in written Rust";
|
||||
homepage = "https://rustpython.github.io";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
|
||||
# TODO: Remove once nixpkgs uses newer SDKs that supports '*at' functions.
|
||||
# Probably macOS SDK 10.13 or later. Check the current version in
|
||||
# .../os-specific/darwin/apple-sdk/default.nix
|
||||
#
|
||||
# From the build logs:
|
||||
#
|
||||
# > Undefined symbols for architecture x86_64: "_utimensat"
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arb";
|
||||
version = "2.20.0";
|
||||
version = "2.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fredrik-johansson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HOIbdkVV7NKowIGhDdn/S8unIRV469OnRHiuiCGaWgk=";
|
||||
sha256 = "sha256-OBY2gKVnvrZLVrv+d6rXQLo026mrGB9eyNV4LESgrNI=";
|
||||
};
|
||||
|
||||
buildInputs = [ mpir gmp mpfr flint ];
|
||||
|
||||
@ -42,7 +42,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
||||
rev = "v${branchName}-lts";
|
||||
in
|
||||
{
|
||||
version = "${branchName}-${lib.substring 0 7 rev}";
|
||||
version = branchName;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/qt/qtwebengine.git";
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, primesieve }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "primecount";
|
||||
version = "7.2";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ primesieve ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primecount";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast prime counting function implementations";
|
||||
homepage = "https://github.com/kimwalisch/primecount";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.sage.members;
|
||||
};
|
||||
}
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "umockdev";
|
||||
version = "0.16.3";
|
||||
version = "0.17.0";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "TjHxqtz8mPhzpsMb5lXWdj8hx/whsadTfor4S2x4U2M=";
|
||||
sha256 = "sha256-rrZtftnvKWJ8f8qIjAOcudn2uvE1upwgByoLrtv1leY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
{ lib, buildOcaml, fetchFromGitHub, type_conv, pa_ounit }:
|
||||
|
||||
buildOcaml rec {
|
||||
pname = "pa_bench";
|
||||
version = "113.00.00";
|
||||
|
||||
minimumSupportedOcamlVersion = "4.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "pa_bench";
|
||||
rev = version;
|
||||
sha256 = "sha256-WaXB3lgNPHy/z6D7uHxfD5W4HYuTZ+ieRbxxHlPao7c=";
|
||||
};
|
||||
|
||||
buildInputs = [ pa_ounit ];
|
||||
propagatedBuildInputs = [ type_conv ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/janestreet/pa_bench";
|
||||
description = "Syntax extension for inline benchmarks";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
{ lib, buildOcaml, ocaml, fetchFromGitHub, ounit }:
|
||||
|
||||
if lib.versionAtLeast ocaml.version "4.06"
|
||||
then throw "pa_ounit is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
buildOcaml rec {
|
||||
pname = "pa_ounit";
|
||||
version = "113.00.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "pa_ounit";
|
||||
rev = version;
|
||||
sha256 = "sha256-zzXN+mSJtlnQ3e1QoEukCiyfDEoe8cBdkAQ3U1dkvEk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ounit ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/janestreet/pa_ounit";
|
||||
description = "OCaml inline testing";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-agent-parameters-types";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "faraday_agent_parameters_types";
|
||||
inherit version;
|
||||
sha256 = "sha256-zH/ZkqL+kL3J1o7dhB4WYy2tbofFZm+kxEGn5+nRgjc=";
|
||||
sha256 = "6155669db477c3330c0850814eabe231bbbadf9d2ec57b4f734994f76eaee0e7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-plugins";
|
||||
version = "1.5.7";
|
||||
version = "1.5.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infobyte";
|
||||
repo = "faraday_plugins";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EW9p5r7RwWohNGwbITtDrEd1FYLtOwWXhVWFgPCG+Po=";
|
||||
sha256 = "1r415g2f0cid8nr3y27ipx9hvwzh70l5wp0d7nv25qblc7g38mms";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vision";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "542a300f4b79ed9574cdeb4eb47cf8899f0915041e8bf0058e8192a620087d30";
|
||||
sha256 = "54b7f63c746ab95a504bd6b9b1d806192483976a3452a1a59a7faa0eaaa03491";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus];
|
||||
|
||||
@ -20,6 +20,11 @@ buildPythonPackage rec {
|
||||
sha256 = "agshUVkkqogj4FbonFd/rrGisMOomS62NND66YKZvjg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "rapidfuzz >= 1.8.2, < 1.9" "rapidfuzz"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
rapidfuzz
|
||||
];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rapidfuzz";
|
||||
version = "1.8.3";
|
||||
version = "1.9.0";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
repo = "RapidFuzz";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-DjMUI5JBomv0f2AC1Nvb3DeqWn65AvZJWhWus4AZk7w=";
|
||||
sha256 = "sha256-INtoJXPe22vB6Yi9Co3xxJ8uxZYz9dn0eMF+fo9GfIo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,52 +1,107 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, nassl
|
||||
, cryptography
|
||||
, typing-extensions
|
||||
, faker
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
# deps
|
||||
, cryptography
|
||||
, nassl
|
||||
, pydantic
|
||||
, tls-parser
|
||||
# check deps
|
||||
, faker
|
||||
, openssl_1_0_2
|
||||
, openssl_1_1
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sslyze";
|
||||
version = "4.1.0";
|
||||
version = "5.0.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nabla-c0d3";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-oSTKNiECczlPAbv5Azc023PcquFbnlC5O+8tVgNcUW0=";
|
||||
hash = "sha256-7kUriEMHcGCXKs42KVWxXvM+JEEWf/8tnuoGujHbqHY=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "cryptography>=2.6,<3.5" "cryptography>=2.6,<4.0"
|
||||
--replace "cryptography>=2.6,<36.0.0" "cryptography>=2.6"
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
faker
|
||||
];
|
||||
|
||||
# Most of the tests are online; hence, applicable tests are listed
|
||||
# explicitly here
|
||||
pytestFlagsArray = [
|
||||
"tests/test_main.py"
|
||||
"tests/test_scanner.py"
|
||||
"tests/cli_tests/test_console_output.py"
|
||||
"tests/cli_tests/test_json_output.py"
|
||||
"tests/cli_tests/test_server_string_parser.py"
|
||||
"tests/plugins_tests/test_scan_commands.py"
|
||||
"tests/json_tests/test_json_output.py"
|
||||
"tests/plugins_tests/certificate_info/test_certificate_algorithms.py"
|
||||
"tests/plugins_tests/certificate_info/test_certificate_utils.py"
|
||||
"tests/plugins_tests/certificate_info/test_symantec.py"
|
||||
"tests/plugins_tests/certificate_info/test_trust_store_repository.py"
|
||||
"tests/plugins_tests/openssl_cipher_suites/test_cipher_suites.py"
|
||||
"tests/plugins_tests/test_early_data_plugin.py"
|
||||
"tests/plugins_tests/test_http_headers_plugin.py"
|
||||
"tests/plugins_tests/test_robot_plugin.py"
|
||||
"tests/plugins_tests/test_scan_commands.py"
|
||||
"tests/plugins_tests/test_session_renegotiation_plugin.py"
|
||||
"tests/scanner_tests/test_jobs_worker_thread.py"
|
||||
"tests/scanner_tests/test_mass_scanner.py"
|
||||
"tests/scanner_tests/test_models.py"
|
||||
"tests/scanner_tests/test_scanner.py"
|
||||
"tests/server_connectivity_tests/test_client_authentication.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_error_client_certificate_needed"
|
||||
# TestEllipticCurvesPluginWithOnlineServer
|
||||
"test_supported_curves"
|
||||
# TestRobotPluginPlugin
|
||||
"test_robot_attack_good"
|
||||
# TestHttpHeadersPlugin
|
||||
"test_all_headers_disabled"
|
||||
"test_expect_ct_enabled"
|
||||
"test_hsts_enabled"
|
||||
# TestSessionRenegotiationPlugin
|
||||
"test_renegotiation_good"
|
||||
# TestCertificateAlgorithms
|
||||
"test_ecdsa_certificate"
|
||||
"test_invalid_certificate_bad_name"
|
||||
# TestEarlyDataPlugin
|
||||
"test_early_data_enabled"
|
||||
# TestTrustStoresRepository
|
||||
"test_update_default"
|
||||
# TestClientAuthentication
|
||||
"test_optional_client_authentication"
|
||||
];
|
||||
|
||||
# Some tests require OpenSSL
|
||||
preCheck = ''
|
||||
pushd $TMPDIR/$sourceRoot/tests/openssl_server/
|
||||
|
||||
rm openssl-1-1-1-linux64
|
||||
ln -s ${openssl_1_1.bin}/bin/openssl openssl-1-1-1-linux64
|
||||
|
||||
rm openssl-1-0-0e-linux64
|
||||
ln -s ${openssl_1_0_2.bin}/bin/openssl openssl-1-0-0e-linux64
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "sslyze" ];
|
||||
|
||||
propagatedBuildInputs = [ nassl cryptography typing-extensions faker ];
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
nassl
|
||||
pydantic
|
||||
tls-parser
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/nabla-c0d3/sslyze";
|
||||
|
||||
28
pkgs/development/python-modules/vpk/default.nix
Normal file
28
pkgs/development/python-modules/vpk/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vpk";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValvePython";
|
||||
repo = "vpk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kFKu4fuclanMdlfA/2ZccglM7rSzaq9BbbSaKuIN+Pk=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for working with Valve Pak files";
|
||||
homepage = "https://github.com/ValvePython/vpk";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ joshuafern ];
|
||||
};
|
||||
}
|
||||
@ -46,13 +46,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.648";
|
||||
version = "2.0.659";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WhBbZiLPGA9Dvn8xJaPOvOjEeVOWHBVLyEav4Mw/Xy8=";
|
||||
sha256 = "sha256-oxR4hji7BWnbAihZXLdOlCZlzpvZcs6RNoyGwQe+PlQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kustomize";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
# rev is the commit of the tag, mainly for kustomize version command output
|
||||
rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245";
|
||||
rev = "b2d65ddc98e09187a8e38adc27c30bab078c1dbf";
|
||||
|
||||
ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in
|
||||
[
|
||||
@ -17,16 +17,15 @@ buildGoModule rec {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "kustomize/v${version}";
|
||||
sha256 = "sha256-dHCUuKEUJ4xKMfeR629y/cdM7ZBgP3GxUSKGQYj9Ahg=";
|
||||
sha256 = "sha256-gq5SrI1f6ctGIL0Arf8HQMfgnlglwWlsn1r27Ug70gs=";
|
||||
};
|
||||
|
||||
# TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged.
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
# avoid finding test and development commands
|
||||
sourceRoot = "source/kustomize";
|
||||
|
||||
vendorSha256 = "sha256-jP3Jf8QtdNnCrXO3JfyQNCfMwz9d3UaKVTh8DSbx6vA=";
|
||||
vendorSha256 = "sha256-2GbRk7A8VwGONmL74cc2TA+MLyJrSSOQPLaded5s90k=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Customization of kubernetes YAML configurations";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-bindgen";
|
||||
version = "0.59.1";
|
||||
version = "0.59.2";
|
||||
|
||||
RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update
|
||||
|
||||
@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "rust-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nCww9sr6kF7nCQeIGtOXddxD3dR/SJ0rqAc+RlZnUkQ=";
|
||||
sha256 = "sha256-bJYdyf5uZgWe7fQ80/3QsRV0qyExYn6P9UET3tzwPFs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-3EXYC/mwzVxo/ginvF1WFtS7ABE/ybyuKb58uMqfTDs=";
|
||||
cargoSha256 = "sha256-zhENlrqj611RkKDvpDtDFWc58wfQVamkJnpe2nvRieE=";
|
||||
|
||||
#for substituteAll
|
||||
libclang = llvmPackages_latest.libclang.lib;
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, SDL2
|
||||
, alsa-lib
|
||||
, libGL
|
||||
, libX11
|
||||
@ -9,25 +10,28 @@
|
||||
, AudioToolbox
|
||||
, Cocoa
|
||||
, CoreAudio
|
||||
, CoreFoundation
|
||||
, IOKit
|
||||
, OpenGL
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fishfight";
|
||||
version = "0.1";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fishfight";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0mbg9zshyg9hlbsk5npslbnwjf8fh6gxszi5hxks380z080cjxs2";
|
||||
sha256 = "sha256-kLdk7zTICZ8iawNttTsWUVKGvh2zykXVsMqUyYoGrBs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-fZXqJ6a2erAQSgAZRwmkor94eMryjiq3gbY102pJb9Q=";
|
||||
# use system sdl2 instead of bundled sdl2
|
||||
cargoPatches = [ ./use-system-sdl2.patch ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
cargoSha256 = "sha256-KQiqUzdsVMIjDmmreihekrrFoXeyNzd6ZbqApwH8B4Q=";
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
libGL
|
||||
libX11
|
||||
@ -36,15 +40,11 @@ rustPlatform.buildRustPackage rec {
|
||||
AudioToolbox
|
||||
Cocoa
|
||||
CoreAudio
|
||||
CoreFoundation
|
||||
IOKit
|
||||
OpenGL
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace assets/levels/levels.toml --replace assets $out/share/assets
|
||||
substituteInPlace src/gui.rs --replace \"assets \"$out/share/assets
|
||||
substituteInPlace src/main.rs --replace \"assets \"$out/share/assets
|
||||
substituteInPlace src/main.rs --replace ./assets $out/share/assets
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
@ -57,6 +57,5 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://fishfight.org/";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "fishgame";
|
||||
};
|
||||
}
|
||||
|
||||
39
pkgs/games/fishfight/use-system-sdl2.patch
Normal file
39
pkgs/games/fishfight/use-system-sdl2.patch
Normal file
@ -0,0 +1,39 @@
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -96,15 +96,6 @@ version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
-[[package]]
|
||||
-name = "cmake"
|
||||
-version = "0.1.46"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "color_quant"
|
||||
version = "1.1.0"
|
||||
@@ -605,7 +596,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94cb479353c0603785c834e2307440d83d196bf255f204f7f6741358de8d6a2f"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
- "cmake",
|
||||
"libc",
|
||||
"version-compare",
|
||||
]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index d2af29e..a813f30 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -14,7 +14,7 @@ macroquad-profiler = "0.1"
|
||||
|
||||
ff-particles = { version = "0.1", features = ["serde"] }
|
||||
|
||||
-fishsticks = { version = "0.2.0", features = ["bundled-sdl2"] }
|
||||
+fishsticks = "0.2.0"
|
||||
|
||||
stunclient = { git = "https://github.com/not-fl3/rust-stunclient", default-features = false }
|
||||
|
||||
@ -29,20 +29,20 @@ let
|
||||
# Note: when raising the version, ensure that all SNAPSHOT versions in
|
||||
# build.gradle are replaced by a fixed version
|
||||
# (the current one at the time of release) (see postPatch).
|
||||
version = "126.1";
|
||||
version = "126.2";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
Mindustry = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
rev = "v${version}";
|
||||
sha256 = "cyg4TofSSFLv8pM3zzvc0FxXMiTm+OIchBJF9PDQrkg=";
|
||||
sha256 = "URmjmfzQAVVl6erbh3+FVFdN7vGTNwYKPtcrwtt9vkg=";
|
||||
};
|
||||
Arc = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Arc";
|
||||
rev = "v${version}";
|
||||
sha256 = "uBIm82mt1etBB/HrNY6XGa7mmBfwd1E3RtqN8Rk5qeY=";
|
||||
sha256 = "pUUak5P9t4RmSdT+/oH/8oo6l7rjIN08XDJ06TcUn8I=";
|
||||
};
|
||||
soloud = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
@ -113,7 +113,7 @@ let
|
||||
'';
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "Mw8LZ1iW6vn4RkBBs8SWHp6mo2Bhj7tMZjLbyuJUqSI=";
|
||||
outputHash = "+7vSwQT6LwHgKE9DubISznq4G4DgvlnD7WaF1KywBzU=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quakespasm";
|
||||
version = "0.94.1";
|
||||
version = "0.94.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz";
|
||||
sha256 = "19grpvsk3ikjypx9j0gpfsx5wanrqxkgf8dwl9h6ab5c8wwmjcjp";
|
||||
sha256 = "sha256-wIgtoJVZH14EKcVNqZdwV3a5jORptYkVMTW1UmvaHyo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${pname}-${version}/Quake";
|
||||
|
||||
@ -1,20 +1,63 @@
|
||||
{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsa-lib, readline, libGLU, libGL, libXaw
|
||||
, pkg-config, gtk2, SDL, autoreconfHook, makeDesktopItem
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, bison
|
||||
, flex
|
||||
, perl
|
||||
, libpng
|
||||
, giflib
|
||||
, libjpeg
|
||||
, alsa-lib
|
||||
, readline
|
||||
, libGLU
|
||||
, libGL
|
||||
, libXaw
|
||||
, pkg-config
|
||||
, gtk2
|
||||
, SDL
|
||||
, SDL_image
|
||||
, autoreconfHook
|
||||
, makeDesktopItem
|
||||
, dos2unix
|
||||
, xa
|
||||
, file
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vice";
|
||||
version = "3.1";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz";
|
||||
sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y";
|
||||
sha256 = "sha256-Vrl4+q64solgMr1gTQPDUBACGH7vHKWM7O1A8Rpl3A4=";
|
||||
};
|
||||
|
||||
buildInputs = [ bison flex perl libpng giflib libjpeg alsa-lib readline libGLU libGL
|
||||
pkg-config gtk2 SDL autoreconfHook libXaw ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
bison
|
||||
dos2unix
|
||||
file
|
||||
flex
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
giflib
|
||||
gtk2
|
||||
libGL
|
||||
libGLU
|
||||
libXaw
|
||||
libjpeg
|
||||
libpng
|
||||
perl
|
||||
readline
|
||||
SDL
|
||||
SDL_image
|
||||
xa
|
||||
];
|
||||
dontDisableStatic = true;
|
||||
configureFlags = [ "--enable-fullscreen --enable-gnomeui" ];
|
||||
configureFlags = [ "--enable-fullscreen" "--enable-gnomeui" "--disable-pdf-docs" ];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "vice";
|
||||
@ -28,16 +71,10 @@ stdenv.mkDerivation rec {
|
||||
preBuild = ''
|
||||
for i in src/resid src/resid-dtv
|
||||
do
|
||||
mkdir -pv $i/src
|
||||
ln -sv ../../wrap-u-ar.sh $i/src
|
||||
mkdir -pv $i/src
|
||||
ln -sv ../../wrap-u-ar.sh $i/src
|
||||
done
|
||||
'';
|
||||
patchPhase = ''
|
||||
# Disable font-cache update
|
||||
sed -i -e "s|install: install-data-am|install-no: install-data-am|" data/fonts/Makefile.am
|
||||
'';
|
||||
|
||||
#NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
@ -46,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Commodore 64, 128 and other emulators";
|
||||
homepage = "http://www.viceteam.org";
|
||||
homepage = "https://vice-emu.sourceforge.io/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@ -1613,13 +1613,13 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-ltex";
|
||||
publisher = "valentjn";
|
||||
version = "13.0.0";
|
||||
version = "13.1.0";
|
||||
};
|
||||
|
||||
vsix = fetchurl {
|
||||
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
|
||||
url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix";
|
||||
sha256 = "6db4846dee4e394f7bcfb7e29520d45d6bc1534482ba73cf40cd5edf3f6ec266";
|
||||
sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, augeas, dnsutils, c-ares, curl,
|
||||
cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen,
|
||||
python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap,
|
||||
python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap,
|
||||
pcre2, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
|
||||
libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, p11-kit,
|
||||
libuuid, systemd, nspr, check, cmocka, uid_wrapper, p11-kit,
|
||||
nss_wrapper, ncurses, Po4a, http-parser, jansson,
|
||||
docbook_xsl, docbook_xml_dtd_44,
|
||||
nixosTests,
|
||||
withSudo ? false }:
|
||||
|
||||
let
|
||||
@ -12,13 +13,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sssd";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SSSD";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ik0x0b7s38d7n0aqhl31r0asxw6qcdb31hx9qydk87yg3n6rziv";
|
||||
sha256 = "sha256-AcfNm/0VpjD+Aa1ZUwI2EI/i0s06rxQCfabv3a/AM38=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = ''
|
||||
export SGML_CATALOG_FILES="${docbookFiles}"
|
||||
export PYTHONPATH=${ldap}/lib/python2.7/site-packages
|
||||
export PYTHONPATH=$(find ${python3.pkgs.ldap} -type d -name site-packages)
|
||||
export PATH=$PATH:${openldap}/libexec
|
||||
|
||||
configureFlagsArray=(
|
||||
@ -40,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||
--enable-pammoddir=$out/lib/security
|
||||
--with-os=fedora
|
||||
--with-pid-path=/run
|
||||
--with-python2-bindings
|
||||
--with-python3-bindings
|
||||
--with-syslog=journald
|
||||
--without-selinux
|
||||
@ -56,10 +56,10 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
|
||||
buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
|
||||
samba nfs-utils p11-kit python python3 popt
|
||||
samba nfs-utils p11-kit python3 popt
|
||||
talloc tdb tevent ldb pam openldap pcre2 libkrb5
|
||||
cifs-utils glib keyutils dbus fakeroot libxslt libxml2
|
||||
libuuid ldap systemd nspr check cmocka uid_wrapper
|
||||
libuuid python3.pkgs.ldap systemd nspr check cmocka uid_wrapper
|
||||
nss_wrapper ncurses Po4a http-parser jansson ];
|
||||
|
||||
makeFlags = [
|
||||
@ -88,6 +88,8 @@ stdenv.mkDerivation rec {
|
||||
find "$out" -depth -type d -exec rmdir --ignore-fail-on-non-empty {} \;
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) sssd sssd-ldap; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "System Security Services Daemon";
|
||||
homepage = "https://sssd.io/";
|
||||
|
||||
@ -18,11 +18,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "15.0.2";
|
||||
version = "15.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
sha256 = "sha256-GlnSsvAYBjRTtabMVrpWUH0EWEdLIe6ud+HIXJqTsqY=";
|
||||
sha256 = "0s8nvp1ca30569k1a7glbn2zvvchz35s2r8d08fbs5zjngnz3276";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mikrotik-exporter-unstable";
|
||||
version = "2020-02-10";
|
||||
version = "2021-08-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nshttpd";
|
||||
repo = "mikrotik-exporter";
|
||||
sha256 = "193zh06rqp9ybsnkxwmv7l4p2h2xisw4f01jjirshsb784j44bh6";
|
||||
rev = "3b33400d24abcfdc07dc31c15ca5ba7b82de444f";
|
||||
sha256 = "1vqn1f159g0l76021gifbxpjf7zjhrj807qqqn51h5413lbi6r66";
|
||||
rev = "4bfa7adfef500ff621a677adfab1f7010af920d1";
|
||||
};
|
||||
|
||||
vendorSha256 = "0i5x4d3ra0s41knmybbg8gnjxgraxkid6y3gfkjwa65xcbp7hr7q";
|
||||
vendorSha256 = "0b244z3hly5726vwkr7vhdzzm2fi38cv1qh7nvfp3vpsxnii04md";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena";
|
||||
version = "4.2.0";
|
||||
version = "4.3.1";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
sha256 = "1yiqlsp1g2fladal8mj164b9s0qsl5csllg54p7x7w63wf7gixnq";
|
||||
url="https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
sha256 = "02asp88smayn68hc019fwp0si9mc79vxn8py7qhx3qzwjk6j9p71";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena-fuseki";
|
||||
version = "4.2.0";
|
||||
version = "4.3.1";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "1x3va4yqmxh55lhr6ms85ks9v0lqkl3y41h0bpjdycp8j96lsy3h";
|
||||
url="https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@ -1,7 +1,23 @@
|
||||
{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
|
||||
, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file
|
||||
, docbook_xml_dtd_43, libtool_2
|
||||
, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPackages
|
||||
, fetchurl
|
||||
, which
|
||||
, autoconf
|
||||
, automake
|
||||
, flex
|
||||
, bison
|
||||
, glibc
|
||||
, perl
|
||||
, libkrb5
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
, file
|
||||
, docbook_xml_dtd_43
|
||||
, libtool_2
|
||||
, withDevdoc ? false
|
||||
, doxygen
|
||||
, dblatex # Extra developer documentation
|
||||
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
|
||||
, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
|
||||
}:
|
||||
@ -10,13 +26,22 @@ with (import ./srcs.nix { inherit fetchurl; });
|
||||
let
|
||||
inherit (lib) optional optionalString optionals;
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "openafs";
|
||||
inherit version srcs;
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
|
||||
which bison ] ++ optionals withDevdoc [ doxygen dblatex ];
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
flex
|
||||
libxslt
|
||||
libtool_2
|
||||
perl
|
||||
which
|
||||
bison
|
||||
] ++ optionals withDevdoc [ doxygen dblatex ];
|
||||
|
||||
buildInputs = [ libkrb5 ncurses ];
|
||||
|
||||
|
||||
@ -1,5 +1,17 @@
|
||||
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
|
||||
, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, which
|
||||
, autoconf
|
||||
, automake
|
||||
, flex
|
||||
, bison
|
||||
, kernel
|
||||
, glibc
|
||||
, perl
|
||||
, libtool_2
|
||||
, libkrb5
|
||||
}:
|
||||
|
||||
with (import ./srcs.nix {
|
||||
inherit fetchurl;
|
||||
@ -9,7 +21,8 @@ let
|
||||
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
|
||||
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "openafs-${version}-${kernel.modDirVersion}";
|
||||
inherit version src;
|
||||
|
||||
@ -18,23 +31,6 @@ in stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ libkrb5 ];
|
||||
|
||||
patches = [
|
||||
# LINUX 5.14: explicitly set set_page_dirty to default
|
||||
((fetchpatch {
|
||||
url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch";
|
||||
sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp";
|
||||
}).overrideAttrs (o: {
|
||||
postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
|
||||
}))
|
||||
# Linux 5.15: Convert osi_Msg macro to a function
|
||||
((fetchpatch {
|
||||
url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch";
|
||||
sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g";
|
||||
}).overrideAttrs (o: {
|
||||
postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
|
||||
}))
|
||||
];
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{ fetchurl }:
|
||||
rec {
|
||||
version = "1.8.8";
|
||||
version = "1.8.8.1";
|
||||
src = fetchurl {
|
||||
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
|
||||
sha256 = "sha256-2qjvhqdyf6z83jvJemrRQxKcHCXuNfM0cIDsfp0oTaA=";
|
||||
sha256 = "sha256-58S+1wdbzWQC4/DC1bnb52rS7jxf1d3DlzozVsoj70Q=";
|
||||
};
|
||||
|
||||
srcs = [ src
|
||||
srcs = [
|
||||
src
|
||||
(fetchurl {
|
||||
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
|
||||
sha256 = "sha256-3cxODH1KvOTxrGB+acEudxGCX1iBPjZcTfjpfraOm+U=";
|
||||
})];
|
||||
sha256 = "sha256-y17O3C4WS+o7SMayydbxw2v96R0GikxiqciF30j+jms=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "Tautulli";
|
||||
version = "2.7.6";
|
||||
version = "2.7.7";
|
||||
format = "other";
|
||||
|
||||
pythonPath = [ setuptools ];
|
||||
@ -12,7 +12,7 @@ buildPythonApplication rec {
|
||||
owner = "Tautulli";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1j57n8bi8qzzx1nw23rfr1g8yidg7p600pbbfv4b1dfiw8633jsl";
|
||||
sha256 = "03zqpffc0hc8lrnc9m9562lh154bv3cnfw0n5x7j4wqr2jp5kb2h";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, writeText }:
|
||||
{ lib, stdenv, fetchFromGitHub, writeText, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dokuwiki";
|
||||
@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
|
||||
cp ${phpPluginsLocalConfig} $out/share/dokuwiki/conf/plugins.local.php
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dokuwiki;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple to use and highly versatile Open Source wiki software that doesn't require a database";
|
||||
license = licenses.gpl2;
|
||||
|
||||
@ -649,11 +649,30 @@ self: super:
|
||||
];
|
||||
postInstall = ":"; # prevent infinite recursion
|
||||
});
|
||||
|
||||
fpgit = commit: sha256: name: fetchpatch (
|
||||
{
|
||||
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/${commit}.diff";
|
||||
inherit sha256;
|
||||
} // lib.optionalAttrs (name != null) {
|
||||
name = name + ".patch";
|
||||
}
|
||||
);
|
||||
in
|
||||
if (!isDarwin)
|
||||
then {
|
||||
outputs = [ "out" "dev" ];
|
||||
patches = [
|
||||
# https://lists.x.org/archives/xorg-announce/2021-December/003122.html
|
||||
(fpgit "ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60"
|
||||
"sNi16FqN4rS4s8j5+PUVeOQBasccCkB5KvywP7xl28M=" "CVE-2021-4008")
|
||||
(fpgit "b5196750099ae6ae582e1f46bd0a6dad29550e02"
|
||||
"5hgzQXBBaJfhSTa9hs8K2N1fQ6+Vp8TTkertmQhkw8Y=" "CVE-2021-4009")
|
||||
(fpgit "6c4c53010772e3cb4cb8acd54950c8eec9c00d21"
|
||||
"1gGG9RpjLMi7Emwh13/z5CN1+ISLsPL3hJXP5gQcNkE=" "CVE-2021-4010")
|
||||
(fpgit "e56f61c79fc3cee26d83cda0f84ae56d5979f768"
|
||||
"e1KgSXGwwI3GgcYeWaF3KHPmkE4tf9VTqvfTYqRpysY=" "CVE-2021-4011")
|
||||
|
||||
# The build process tries to create the specified logdir when building.
|
||||
#
|
||||
# We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail
|
||||
|
||||
@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ebIU632dYCKaU1Hh8Q3k6W2SRdZ49kcVx6eTzcKAzQw=";
|
||||
sha256 = "sha256-IMQFOWcHv3gLD+jUJl48IVNv8gu1jMQ0/m4gzSKbHNk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-/AIARaMAxxMgBMMVecp2BXTyCe99pf/eXGJB6O1MyuU=";
|
||||
cargoSha256 = "sha256-usxmfnKIrxX8md7EcmnhP5eFXpik6LZPURX9Ayxs/yo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.39.9";
|
||||
version = "0.39.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HcyzrGtBktScTPch6rCKj5Hr7VS9kf3cCHhDVaZKxG0=";
|
||||
sha256 = "sha256-gtakdKnkzAU1yKtKnlkS+n8CbgftV64zLoENJKYjIAo=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
@ -18,6 +19,13 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "sha256-xEASs6r5zxYJXS+at6aX5n0whGp5qwuNwq6Jh0GM+/4=";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/orf/gping/commit/b843beb9617e4b7b98d4f6d3942067cad59c9d60.patch";
|
||||
sha256 = "sha256-9DIeeweCuGqymvUj4EBct82XVevkFSbHWaV76ExjGbs=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "i2pd";
|
||||
version = "2.39.0";
|
||||
version = "2.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PurpleI2P";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-j8kHuX5Ca90ODjmF94HpGvjSpocDSuSxfVmvbIYRAKo=";
|
||||
sha256 = "sha256-Cld5TP2YoLzm73q7uP/pwqEeUsT5uMPAUx9HABOVeZA=";
|
||||
};
|
||||
|
||||
buildInputs = with lib; [ boost zlib openssl ]
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
{ lib, stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }:
|
||||
{ lib, stdenv, fetchurl, perl, zlib, bzip2, xz, zstd
|
||||
, makeWrapper, coreutils, autoreconfHook, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dpkg";
|
||||
version = "1.20.9";
|
||||
version = "1.20.9ubuntu2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
|
||||
sha256 = "sha256-XOJCgw8hO1Yg8I5sQYOtse9Nydoo0xmIonyHxx/lNM4=";
|
||||
url = "mirror://ubuntu/pool/main/d/dpkg/dpkg_${version}.tar.xz";
|
||||
sha256 = "sha256-BuCofGpi9R0cyhvkZqu9IxupqZvZhbE2J/B4wgUqMQw=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
@ -17,6 +19,8 @@ stdenv.mkDerivation rec {
|
||||
(lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon")
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
# Nice: dpkg has a circular dependency on itself. Its configure
|
||||
# script calls scripts/dpkg-architecture, which calls "dpkg" in
|
||||
@ -49,8 +53,8 @@ stdenv.mkDerivation rec {
|
||||
--replace '"diff"' \"${coreutils}/bin/diff\"
|
||||
'';
|
||||
|
||||
buildInputs = [ perl zlib bzip2 xz ];
|
||||
nativeBuildInputs = [ makeWrapper perl ];
|
||||
buildInputs = [ perl zlib bzip2 xz zstd ];
|
||||
nativeBuildInputs = [ makeWrapper perl autoreconfHook pkg-config ];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cosign";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KavhcBxn0099ZSd7wdIfMYnYhbmuRpc7+FTfdm1T71c=";
|
||||
sha256 = "sha256-WjYW9Fo27wE1pg/BqYsdHd8jwd8jG5bk37HmU1DqnyE=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
|
||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
||||
vendorSha256 = "sha256-7fWSGj8Ex8nPpMr3Foryiu25gBvzeZfVeMwZ3QKsm8E=";
|
||||
vendorSha256 = "sha256-6T98zu55BQ26e43a1i68rhebaLwY/iFM8CRqRcv2QwI=";
|
||||
|
||||
excludedPackages = "\\(sample\\|webhook\\|help\\)";
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-12-11";
|
||||
version = "2021-12-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-S0PlUSSVBI5OpEsd0BoDINdX+gpsP1GMs4uH6xvrs0I=";
|
||||
sha256 = "sha256-Ojgd2B475+Zr7CODtgg7rJZ6bPT3ZYddSQhditI9HhU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user