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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-06-20 06:07:48 +00:00 committed by GitHub
commit a4a610bdee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
pkgs/games/factorio/update.py
View File

@ -80,6 +80,12 @@ def fetch_versions() -> FactorioVersionsJSON:
def generate_our_versions(factorio_versions: FactorioVersionsJSON) -> OurVersionJSON:
rec_dd = lambda: defaultdict(rec_dd)
output = rec_dd()
# Deal with times where there's no experimental version
for rc in RELEASE_CHANNELS:
if not factorio_versions[rc.name]:
factorio_versions[rc.name] = factorio_versions['stable']
for system in SYSTEMS:
for release_type in RELEASE_TYPES:
for release_channel in RELEASE_CHANNELS:

48
pkgs/games/factorio/versions.json
View File

@ -2,56 +2,56 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.34.tar.xz",
"name": "factorio_alpha_x64-1.1.35.tar.xz",
"needsAuth": true,
"sha256": "1gba6ivxdhj8khk6kfja2nzvqbbjlq1gzk8vlb23mkzqcmf4gnqc",
"sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.34/alpha/linux64",
"version": "1.1.34"
"url": "https://factorio.com/get-download/1.1.35/alpha/linux64",
"version": "1.1.35"
},
"stable": {
"name": "factorio_alpha_x64-1.1.34.tar.xz",
"name": "factorio_alpha_x64-1.1.35.tar.xz",
"needsAuth": true,
"sha256": "1gba6ivxdhj8khk6kfja2nzvqbbjlq1gzk8vlb23mkzqcmf4gnqc",
"sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.34/alpha/linux64",
"version": "1.1.34"
"url": "https://factorio.com/get-download/1.1.35/alpha/linux64",
"version": "1.1.35"
}
},
"demo": {
"experimental": {
"name": "factorio_demo_x64-1.1.30.tar.xz",
"name": "factorio_demo_x64-1.1.35.tar.xz",
"needsAuth": false,
"sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv",
"sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.30/demo/linux64",
"version": "1.1.30"
"url": "https://factorio.com/get-download/1.1.35/demo/linux64",
"version": "1.1.35"
},
"stable": {
"name": "factorio_demo_x64-1.1.34.tar.xz",
"name": "factorio_demo_x64-1.1.35.tar.xz",
"needsAuth": false,
"sha256": "1ld373lxfx1xbaqq394az8sxfxpjwkyqwwr77wbmg4sm2g9dinxm",
"sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.34/demo/linux64",
"version": "1.1.34"
"url": "https://factorio.com/get-download/1.1.35/demo/linux64",
"version": "1.1.35"
}
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.34.tar.xz",
"name": "factorio_headless_x64-1.1.35.tar.xz",
"needsAuth": false,
"sha256": "0sfafdvfhhvxnhf7q23xnvckx8nihg5xzzc6dw39a3iprwhr75i1",
"sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.34/headless/linux64",
"version": "1.1.34"
"url": "https://factorio.com/get-download/1.1.35/headless/linux64",
"version": "1.1.35"
},
"stable": {
"name": "factorio_headless_x64-1.1.34.tar.xz",
"name": "factorio_headless_x64-1.1.35.tar.xz",
"needsAuth": false,
"sha256": "0sfafdvfhhvxnhf7q23xnvckx8nihg5xzzc6dw39a3iprwhr75i1",
"sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.34/headless/linux64",
"version": "1.1.34"
"url": "https://factorio.com/get-download/1.1.35/headless/linux64",
"version": "1.1.35"
}
}
}

6
pkgs/servers/imgproxy/default.nix
View File

@ -3,16 +3,16 @@
buildGoModule rec {
pname = "imgproxy";
version = "2.16.3";
version = "2.16.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
sha256 = "sha256-WK5TAI+dYmBLNp1A0p9DbWF7ZEw3dqr+Cuwy7LzrdBM=";
sha256 = "sha256-25oOGkTc19PHlU0Va7IPKrvGK9pDrGqKZa6qNFMVphQ=";
rev = "v${version}";
};
vendorSha256 = "sha256-7IpMgsATQ1SMuBOF9agHIN2Lx6OKxRr0Zk5SRFxHiQ4=";
vendorSha256 = "sha256-y8cXe4+jTLnM7K+na2VHGXkPgZjFYdgtDd14D8KiCas=";
doCheck = false;

4
pkgs/servers/jackett/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
version = "0.18.234";
version = "0.18.345";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "sha256-F01iR1BdSWCBqBI+Mh8uyzWKIbiMR2tOW6sJgFU3hG8=";
sha256 = "sha256-cCUlKyndKAU57hSRZYWqwOthfjIirE5c95HRETnFEiA=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/servers/sql/postgresql/ext/pgvector.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pgvector";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "ankane";
repo = pname;
rev = "v${version}";
sha256 = "108qf5pvqhz4vh31sijikajf4hrrk7rknrqzwj999psr33acag4z";
sha256 = "07m1nn640by5q22q2s1nlmjp14q5ffbyib28kjzlss0mq8acb439";
};
buildInputs = [ postgresql ];

4
pkgs/tools/misc/graylog/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "graylog";
version = "3.3.9";
version = "4.0.7";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "1wl9j2jgjg5gwcsh92qr5f68wx12nvwadc9xkaa9wwd7x3z825jq";
sha256 = "sha256-sZn/ug4oh/SHbICbiQeAmtEIwT3++DBWbT2XBkYGYUc=";
};
dontBuild = true;