diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-08 21:40:31 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-16 00:21:02 +0200 |
commit | 2053ddac783c931053676ebc2b02bc8b82d89399 (patch) | |
tree | 2f5a9533bc41a482533993f00c9fd3ca4d2b108b /pkgs/webapps/mediagoblin | |
parent | 69e6151c0c324f920eccb34568ed7ff523592589 (diff) | |
download | Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.gz Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.zst Nix-2053ddac783c931053676ebc2b02bc8b82d89399.zip |
Upgrade nixos-unstable
Diffstat (limited to 'pkgs/webapps/mediagoblin')
-rw-r--r-- | pkgs/webapps/mediagoblin/default.nix | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/webapps/mediagoblin/default.nix b/pkgs/webapps/mediagoblin/default.nix index 29c1981..22cb292 100644 --- a/pkgs/webapps/mediagoblin/default.nix +++ b/pkgs/webapps/mediagoblin/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage, sources }: | 1 | { makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage, fetchgit }: |
2 | let | 2 | let |
3 | overridePython = let | 3 | overridePython = let |
4 | packageOverrides = self: super: { | 4 | packageOverrides = self: super: { |
@@ -38,6 +38,7 @@ let | |||
38 | inherit (old) pname; | 38 | inherit (old) pname; |
39 | sha256 = "2dea4d16d073c902c3b89d9b96620fb6729ac0f7a923bbc777cb4ad827c0c61a"; | 39 | sha256 = "2dea4d16d073c902c3b89d9b96620fb6729ac0f7a923bbc777cb4ad827c0c61a"; |
40 | }; | 40 | }; |
41 | doCheck = false; | ||
41 | }); | 42 | }); |
42 | kombu = super.kombu.overridePythonAttrs(old: rec { | 43 | kombu = super.kombu.overridePythonAttrs(old: rec { |
43 | version = "3.0.37"; | 44 | version = "3.0.37"; |
@@ -49,6 +50,14 @@ let | |||
49 | propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.anyjson ]; | 50 | propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.anyjson ]; |
50 | doCheck = false; | 51 | doCheck = false; |
51 | }); | 52 | }); |
53 | markdown = super.markdown.overridePythonAttrs(old: rec { | ||
54 | version = "3.1.1"; | ||
55 | src = self.fetchPypi { | ||
56 | inherit version; | ||
57 | inherit (old) pname; | ||
58 | sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; | ||
59 | }; | ||
60 | }); | ||
52 | sqlalchemy = super.sqlalchemy.overridePythonAttrs(old: rec { | 61 | sqlalchemy = super.sqlalchemy.overridePythonAttrs(old: rec { |
53 | version = "1.1.18"; | 62 | version = "1.1.18"; |
54 | src = self.fetchPypi { | 63 | src = self.fetchPypi { |
@@ -74,6 +83,14 @@ let | |||
74 | }; | 83 | }; |
75 | propagatedBuildInputs = with self; [ six paste PasteDeploy ]; | 84 | propagatedBuildInputs = with self; [ six paste PasteDeploy ]; |
76 | }); | 85 | }); |
86 | werkzeug = super.werkzeug.overridePythonAttrs(old: rec { | ||
87 | version = "0.16.1"; | ||
88 | src = self.fetchPypi { | ||
89 | inherit version; | ||
90 | inherit (old) pname; | ||
91 | sha256 = "b353856d37dec59d6511359f97f6a4b2468442e454bd1c98298ddce53cac1f04"; | ||
92 | }; | ||
93 | }); | ||
77 | }; | 94 | }; |
78 | in | 95 | in |
79 | python36.override { inherit packageOverrides; }; | 96 | python36.override { inherit packageOverrides; }; |
@@ -108,7 +125,13 @@ let | |||
108 | load_entry_point('mediagoblin', 'console_scripts', 'gmg')() | 125 | load_entry_point('mediagoblin', 'console_scripts', 'gmg')() |
109 | ) | 126 | ) |
110 | ''; | 127 | ''; |
111 | mediagoblinSrc = sources.webapps-mediagoblin; | 128 | mediagoblinSrc = fetchgit { |
129 | name = "mediagoblin"; | ||
130 | url = "git://git.savannah.gnu.org/mediagoblin.git"; | ||
131 | rev = "cd465ebfec837a75a44c4ebd727dffe2fff6d850"; | ||
132 | sha256 = "1yz4i4i97z3rxl534a6psaybyjbyp5nnc52v3nvbpzc4pd2s69mx"; | ||
133 | fetchSubmodules = true; # important! | ||
134 | }; | ||
112 | bowerComponents = buildBowerComponents { | 135 | bowerComponents = buildBowerComponents { |
113 | name = "mediagoblin-bower-components"; | 136 | name = "mediagoblin-bower-components"; |
114 | generated = ./bower-packages.nix; | 137 | generated = ./bower-packages.nix; |
@@ -133,7 +156,7 @@ let | |||
133 | package = stdenv.mkDerivation rec { | 156 | package = stdenv.mkDerivation rec { |
134 | pname = "mediagoblin"; | 157 | pname = "mediagoblin"; |
135 | name = "${pname}-${version}"; | 158 | name = "${pname}-${version}"; |
136 | version = mediagoblinSrc.version; | 159 | version = "cd465eb-stable"; |
137 | src = mediagoblinSrc; | 160 | src = mediagoblinSrc; |
138 | preConfigure = '' | 161 | preConfigure = '' |
139 | # ./bootstrap.sh | 162 | # ./bootstrap.sh |