ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-25 06:38:22 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-05-25 18:01:20 +00:00 committed by GitHub
commit 137b9085b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
223 changed files with 904 additions and 7705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/video/mirakurun.nix
View File

@ -154,6 +154,9 @@ in
description = "Mirakurun user"; description = "Mirakurun user";
group = "video"; group = "video";
isSystemUser = true; isSystemUser = true;
# NPM insists on creating ~/.npm
home = "/var/cache/mirakurun";
}; };
services.mirakurun.serverSettings = { services.mirakurun.serverSettings = {
@ -171,9 +174,10 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${mirakurun}/bin/mirakurun-start"; ExecStart = "${mirakurun}/bin/mirakurun start";
User = username; User = username;
Group = groupname; Group = groupname;
CacheDirectory = "mirakurun";
RuntimeDirectory="mirakurun"; RuntimeDirectory="mirakurun";
StateDirectory="mirakurun"; StateDirectory="mirakurun";
Nice = -10; Nice = -10;

4
pkgs/applications/audio/flac2all/default.nix
View File

@ -1,10 +1,10 @@
{ python3Packages, lib, flac, lame, opusTools, vorbis-tools, ffmpeg }: { python3Packages, fetchPypi, lib, flac, lame, opusTools, vorbis-tools, ffmpeg }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "flac2all"; pname = "flac2all";
version = "5.1"; version = "5.1";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "OBjlr7cbSx2WOIfZUNwHy5Hpb2Fmh3vmZdc70JiWsiI="; sha256 = "OBjlr7cbSx2WOIfZUNwHy5Hpb2Fmh3vmZdc70JiWsiI=";
}; };

3
pkgs/applications/audio/ledfx/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
python3.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
@ -7,7 +8,7 @@ python3.pkgs.buildPythonPackage rec {
version = "2.0.67"; version = "2.0.67";
format = "setuptools"; format = "setuptools";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-lFxAMjglQZXCySr83PtvStU6hw2ucQu+rSjIHo1yZBk="; hash = "sha256-lFxAMjglQZXCySr83PtvStU6hw2ucQu+rSjIHo1yZBk=";
}; };

4
pkgs/applications/audio/mopidy/bandcamp.nix
View File

@ -1,9 +1,9 @@
{ lib, python3Packages, mopidy }: { lib, python3Packages, fetchPypi, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Mopidy-Bandcamp"; pname = "Mopidy-Bandcamp";
version = "1.1.5"; version = "1.1.5";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; sha256 = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ=";
}; };

4
pkgs/applications/audio/mopidy/iris.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, mopidy }: { lib, python3Packages, fetchPypi, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Mopidy-Iris"; pname = "Mopidy-Iris";
version = "3.64.0"; version = "3.64.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "062x73glhn1x4wgc7zmb9y3cq15d5grgqf5drdpbp6p3cgk4s2vc"; sha256 = "062x73glhn1x4wgc7zmb9y3cq15d5grgqf5drdpbp6p3cgk4s2vc";
}; };

4
pkgs/applications/audio/mopidy/jellyfin.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, mopidy }: { lib, python3Packages, fetchPypi, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-jellyfin"; pname = "mopidy-jellyfin";
version = "1.0.4"; version = "1.0.4";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "Mopidy-Jellyfin"; pname = "Mopidy-Jellyfin";
sha256 = "ny0u6HdOlZCsmIzZuQ1rql+bvHU3xkh8IdwhJVHNH9c="; sha256 = "ny0u6HdOlZCsmIzZuQ1rql+bvHU3xkh8IdwhJVHNH9c=";

6
pkgs/applications/audio/mopidy/local.nix
View File

@ -1,7 +1,7 @@
{ stdenv { lib
, lib
, mopidy , mopidy
, python3Packages , python3Packages
, fetchPypi
, fetchpatch , fetchpatch
}: }:
@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
pname = "Mopidy-Local"; pname = "Mopidy-Local";
version = "3.2.1"; version = "3.2.1";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "18w39mxpv8p17whd6zfw5653d21q138f8xd6ili6ks2g2dbm25i9"; sha256 = "18w39mxpv8p17whd6zfw5653d21q138f8xd6ili6ks2g2dbm25i9";
}; };

4
pkgs/applications/audio/mopidy/moped.nix
View File

@ -1,10 +1,10 @@
{ lib, pythonPackages, mopidy, glibcLocales }: { lib, pythonPackages, fetchPypi, mopidy, glibcLocales }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Moped"; pname = "Mopidy-Moped";
version = "0.7.1"; version = "0.7.1";
src = pythonPackages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4"; sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4";
}; };

4
pkgs/applications/audio/mopidy/mopify.nix
View File

@ -1,10 +1,10 @@
{ lib, pythonPackages, mopidy }: { lib, pythonPackages, fetchPypi, mopidy }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Mopify"; pname = "Mopidy-Mopify";
version = "1.6.1"; version = "1.6.1";
src = pythonPackages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c"; sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c";
}; };

4
pkgs/applications/audio/mopidy/mpd.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, mopidy }: { lib, python3Packages, fetchPypi, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Mopidy-MPD"; pname = "Mopidy-MPD";
version = "3.3.0"; version = "3.3.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; sha256 = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM=";
}; };

4
pkgs/applications/audio/mopidy/mpris.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, mopidy }: { lib, python3Packages, fetchPypi, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-mpris"; pname = "mopidy-mpris";
version = "3.0.3"; version = "3.0.3";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "Mopidy-MPRIS"; pname = "Mopidy-MPRIS";
sha256 = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; sha256 = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U=";

4
pkgs/applications/audio/mopidy/muse.nix
View File

@ -1,10 +1,10 @@
{ lib, pythonPackages, mopidy }: { lib, pythonPackages, fetchPypi, mopidy }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "mopidy-muse"; pname = "mopidy-muse";
version = "0.0.27"; version = "0.0.27";
src = pythonPackages.fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "Mopidy-Muse"; pname = "Mopidy-Muse";
sha256 = "0jx9dkgxr07avzz9zskzhqy98zsxkdrf7iid2ax5vygwf8qsx8ks"; sha256 = "0jx9dkgxr07avzz9zskzhqy98zsxkdrf7iid2ax5vygwf8qsx8ks";

4
pkgs/applications/audio/mopidy/notify.nix
View File

@ -1,10 +1,10 @@
{ lib, pythonPackages, mopidy }: { lib, fetchPypi, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Notify"; pname = "Mopidy-Notify";
version = "0.2.0"; version = "0.2.0";
src = pythonPackages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-lzZupjlS0kbNvsn18serOoMfu0sRb0nRwpowvOPvt/g="; sha256 = "sha256-lzZupjlS0kbNvsn18serOoMfu0sRb0nRwpowvOPvt/g=";
}; };

4
pkgs/applications/audio/mopidy/podcast.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, mopidy }: { lib, python3Packages, fetchPypi, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-podcast"; pname = "mopidy-podcast";
version = "3.0.0"; version = "3.0.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "Mopidy-Podcast"; pname = "Mopidy-Podcast";
sha256 = "1z2b523yvdpcf8p7m7kczrvaw045lmxzhq4qj00dflxa2yw61qxr"; sha256 = "1z2b523yvdpcf8p7m7kczrvaw045lmxzhq4qj00dflxa2yw61qxr";

4
pkgs/applications/audio/mopidy/scrobbler.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, mopidy }: { lib, python3Packages, fetchPypi, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Mopidy-Scrobbler"; pname = "Mopidy-Scrobbler";
version = "2.0.1"; version = "2.0.1";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "11vxgax4xgkggnq4fr1rh2rcvzspkkimck5p3h4phdj3qpnj0680"; sha256 = "11vxgax4xgkggnq4fr1rh2rcvzspkkimck5p3h4phdj3qpnj0680";
}; };

4
pkgs/applications/audio/mopidy/somafm.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, mopidy }: { lib, python3Packages, fetchPypi, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-somafm"; pname = "mopidy-somafm";
version = "2.0.2"; version = "2.0.2";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "Mopidy-SomaFM"; pname = "Mopidy-SomaFM";
sha256 = "DC0emxkoWfjGHih2C8nINBFByf521Xf+3Ks4JRxNPLM="; sha256 = "DC0emxkoWfjGHih2C8nINBFByf521Xf+3Ks4JRxNPLM=";

3
pkgs/applications/audio/mopidy/tidal.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
, mopidy , mopidy
}: }:
@ -7,7 +8,7 @@ python3Packages.buildPythonApplication rec {
pname = "Mopidy-Tidal"; pname = "Mopidy-Tidal";
version = "0.3.2"; version = "0.3.2";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-ekqhzKyU2WqTOeRR1ZSZA9yW3UXsLBsC2Bk6FZrQgmc="; hash = "sha256-ekqhzKyU2WqTOeRR1ZSZA9yW3UXsLBsC2Bk6FZrQgmc=";
}; };

4
pkgs/applications/audio/mopidy/tunein.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, mopidy }: { lib, python3Packages, fetchPypi, mopidy }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-tunein"; pname = "mopidy-tunein";
version = "1.1.0"; version = "1.1.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "Mopidy-TuneIn"; pname = "Mopidy-TuneIn";
sha256 = "01y1asylscr73yqx071imhrzfzlg07wmqqzkdvpgm6r35marc2li"; sha256 = "01y1asylscr73yqx071imhrzfzlg07wmqqzkdvpgm6r35marc2li";

5
pkgs/applications/audio/mopidy/ytmusic.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
, mopidy , mopidy
}: }:
@ -8,7 +9,7 @@ let
packageOverrides = self: super: { packageOverrides = self: super: {
ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec { ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec {
version = "0.25.1"; version = "0.25.1";
src = self.fetchPypi { src = fetchPypi {
inherit (old) pname; inherit (old) pname;
inherit version; inherit version;
hash = "sha256-uc/fgDetSYaCRzff0SzfbRhs3TaKrfE2h6roWkkj8yQ="; hash = "sha256-uc/fgDetSYaCRzff0SzfbRhs3TaKrfE2h6roWkkj8yQ=";
@ -20,7 +21,7 @@ in python.pkgs.buildPythonApplication rec {
pname = "mopidy-ytmusic"; pname = "mopidy-ytmusic";
version = "0.3.8"; version = "0.3.8";
src = python.pkgs.fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "mopidy_ytmusic"; pname = "mopidy_ytmusic";
sha256 = "6b4d8ff9c477dbdd30d0259a009494ebe104cad3f8b37241ae503e5bce4ec2e8"; sha256 = "6b4d8ff9c477dbdd30d0259a009494ebe104cad3f8b37241ae503e5bce4ec2e8";

4
pkgs/applications/audio/spotify-cli-linux/default.nix
View File

@ -1,9 +1,9 @@
{ lib, python3Packages, dbus }: { lib, python3Packages, fetchPypi, dbus }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "spotify-cli-linux"; pname = "spotify-cli-linux";
version = "1.6.0"; version = "1.6.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0slyc3jfrj3rwq8rv6p5aqkw487aw7a87kmf1fb6n4vnvcf08v7w"; sha256 = "0slyc3jfrj3rwq8rv6p5aqkw487aw7a87kmf1fb6n4vnvcf08v7w";
}; };

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -799,6 +799,7 @@ https://github.com/Quramy/tsuquyomi/,,
https://github.com/folke/twilight.nvim/,, https://github.com/folke/twilight.nvim/,,
https://github.com/leafgarland/typescript-vim/,, https://github.com/leafgarland/typescript-vim/,,
https://github.com/jose-elias-alvarez/typescript.nvim/,, https://github.com/jose-elias-alvarez/typescript.nvim/,,
https://github.com/kaarmu/typst.vim/,HEAD,
https://github.com/nvchad/ui/,HEAD,nvchad-ui https://github.com/nvchad/ui/,HEAD,nvchad-ui
https://github.com/SirVer/ultisnips/,, https://github.com/SirVer/ultisnips/,,
https://github.com/mbbill/undotree/,, https://github.com/mbbill/undotree/,,

4
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -1132,8 +1132,8 @@ let
mktplcRef = { mktplcRef = {
name = "prettier-vscode"; name = "prettier-vscode";
publisher = "esbenp"; publisher = "esbenp";
version = "9.12.0"; version = "9.13.0";
sha256 = "sha256-b7EaYYJNZQBqhyKJ04tytmD9DDRcvA68HTo5JHTr9Fo="; sha256 = "sha256-Iqz1O6odSzAfojCgGDwDA1YtnWU5Ei7vx9Qt25/1SLw=";
}; };
meta = { meta = {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";

7
pkgs/applications/graphics/displaycal/default.nix
View File

@ -1,10 +1,11 @@
{ lib { lib
, python3 , python3
, xorg , fetchPypi
, argyllcms
, wrapGAppsHook , wrapGAppsHook
, gtk3 , gtk3
, librsvg , librsvg
, xorg
, argyllcms
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -12,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
version = "3.9.10"; version = "3.9.10";
format = "setuptools"; format = "setuptools";
src = python3.pkgs.fetchPypi { src = fetchPypi {
pname = "DisplayCAL"; pname = "DisplayCAL";
inherit version; inherit version;
hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs="; hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs=";

4
pkgs/applications/graphics/dosage/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "dosage"; pname = "dosage";
version = "2.17"; version = "2.17";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0";
}; };

3
pkgs/applications/graphics/kcc/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, mkDerivationWith , mkDerivationWith
, python3Packages , python3Packages
, fetchPypi
, p7zip , p7zip
, archiveSupport ? true , archiveSupport ? true
}: }:
@ -9,7 +10,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "kcc"; pname = "kcc";
version = "5.5.1"; version = "5.5.1";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "KindleComicConverter"; pname = "KindleComicConverter";
sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";

14
pkgs/applications/graphics/nsxiv/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitea , fetchFromGitea
, fetchpatch
, giflib , giflib
, imlib2 , imlib2
, libXft , libXft
@ -13,24 +12,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nsxiv"; pname = "nsxiv";
version = "30"; version = "31";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "nsxiv"; owner = "nsxiv";
repo = "nsxiv"; repo = "nsxiv";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-swzTdQ6ow1At4bKRORqz6fb0Ej92yU9rlI/OgcinPu4="; hash = "sha256-X1ZMr5OADs9GIe/kp/kEqKMMHZMymd58m9+f0SPzn7s=";
}; };
patches = [
# Fix build failure when _SC_PHYS_PAGES is not defined
(fetchpatch {
url = "https://codeberg.org/nsxiv/nsxiv/commit/1a50bff9f300f84e93a6e7035657e6029e7e8183.patch";
hash = "sha256-PpUqGVWaJ06EVu3tBKVzOh8HYvT6wAG3bvY6wUD+dTM=";
})
];
buildInputs = [ buildInputs = [
giflib giflib
imlib2 imlib2
@ -71,5 +62,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres sikmir ]; maintainers = with maintainers; [ AndersonTorres sikmir ];
platforms = platforms.unix; platforms = platforms.unix;
changelog = "https://codeberg.org/nsxiv/nsxiv/src/tag/${src.rev}/etc/CHANGELOG.md";
}; };
} }

9
pkgs/applications/graphics/veusz/default.nix
View File

@ -1,14 +1,15 @@
{ python3Packages { lib
, qtbase , python3Packages
, fetchPypi
, wrapQtAppsHook , wrapQtAppsHook
, lib , qtbase
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "veusz"; pname = "veusz";
version = "3.6.2"; version = "3.6.2";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "whcaxF5LMEJNj8NSYeLpnb5uJboRl+vCQ1WxBrJjldE="; sha256 = "whcaxF5LMEJNj8NSYeLpnb5uJboRl+vCQ1WxBrJjldE=";
}; };

3
pkgs/applications/misc/archivebox/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
let let
@ -31,7 +32,7 @@ python.pkgs.buildPythonApplication rec {
pname = "archivebox"; pname = "archivebox";
version = "0.6.2"; version = "0.6.2";
src = python.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY="; sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY=";
}; };

4
pkgs/applications/misc/chatblade/default.nix
View File

@ -1,11 +1,11 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "chatblade"; pname = "chatblade";
version = "0.2.3"; version = "0.2.3";
format = "setuptools"; format = "setuptools";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-YXZeqIX8cxNDvM4Pn0or6Lqj2ffX9aQb3b/xMIeBHRk="; sha256 = "sha256-YXZeqIX8cxNDvM4Pn0or6Lqj2ffX9aQb3b/xMIeBHRk=";
}; };

4
pkgs/applications/misc/dotfiles/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "dotfiles"; pname = "dotfiles";
version = "0.6.4"; version = "0.6.4";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit version pname; inherit version pname;
sha256 = "03qis6m9r2qh00sqbgwsm883s4bj1ibwpgk86yh4l235mdw8jywv"; sha256 = "03qis6m9r2qh00sqbgwsm883s4bj1ibwpgk86yh4l235mdw8jywv";
}; };

3
pkgs/applications/misc/etesync-dav/default.nix
View File

@ -3,6 +3,7 @@
, fetchpatch , fetchpatch
, nixosTests , nixosTests
, python3 , python3
, fetchPypi
, radicale3 , radicale3
}: }:
@ -44,7 +45,7 @@ in python.pkgs.buildPythonApplication rec {
pname = "etesync-dav"; pname = "etesync-dav";
version = "0.32.1"; version = "0.32.1";
src = python.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA="; hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA=";
}; };

4
pkgs/applications/misc/keepmenu/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, python3, xvfb-run }: { lib, python3Packages, fetchPypi, xvfb-run }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "keepmenu"; pname = "keepmenu";
version = "1.2.2"; version = "1.2.2";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "SeVNtONH1bn2hb2pBOVM3Oafrb+jARgfvRe7vUu6Gto="; sha256 = "SeVNtONH1bn2hb2pBOVM3Oafrb+jARgfvRe7vUu6Gto=";
}; };

4
pkgs/applications/misc/khard/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3, khard, testers }: { lib, python3, fetchPypi, khard, testers }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
version = "0.18.0"; version = "0.18.0";
pname = "khard"; pname = "khard";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "05860fdayqap128l7i6bcmi9kdyi2gx02g2pmh88d56xgysd927y"; sha256 = "05860fdayqap128l7i6bcmi9kdyi2gx02g2pmh88d56xgysd927y";
}; };

5
pkgs/applications/misc/meerk40t/camera.nix
View File

@ -1,16 +1,17 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
let let
inherit (python3.pkgs) buildPythonPackage fetchPypi; inherit (python3.pkgs) buildPythonPackage;
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "meerk40t-camera"; pname = "meerk40t-camera";
version = "0.1.9"; version = "0.1.9";
format = "setuptools"; format = "setuptools";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-uGCBHdgWoorVX2XqMCg0YBweb00sQ9ZSbJe8rlGeovs="; hash = "sha256-uGCBHdgWoorVX2XqMCg0YBweb00sQ9ZSbJe8rlGeovs=";
}; };

5
pkgs/applications/misc/meerk40t/default.nix
View File

@ -6,10 +6,7 @@
, wrapGAppsHook , wrapGAppsHook
}: }:
let python3.pkgs.buildPythonApplication rec {
inherit (python3.pkgs) buildPythonApplication buildPythonPackage fetchPypi;
in
buildPythonApplication rec {
pname = "MeerK40t"; pname = "MeerK40t";
version = "0.8.1000"; version = "0.8.1000";
format = "setuptools"; format = "setuptools";

4
pkgs/applications/misc/nhentai/default.nix
View File

@ -1,9 +1,9 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "nhentai"; pname = "nhentai";
version = "0.4.16"; version = "0.4.16";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-2lzrQqUx3lPM+OAUO/SwT+fAuG7kWmUnTACNUiP7d1M="; sha256 = "sha256-2lzrQqUx3lPM+OAUO/SwT+fAuG7kWmUnTACNUiP7d1M=";
}; };

4
pkgs/applications/misc/obsidian/default.nix
View File

@ -12,7 +12,7 @@
let let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
pname = "obsidian"; pname = "obsidian";
version = "1.2.8"; version = "1.3.4";
appname = "Obsidian"; appname = "Obsidian";
meta = with lib; { meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@ -25,7 +25,7 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl { src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
sha256 = if stdenv.isDarwin then "sha256-c01Oc20henVRTNFAuiRH5xkxFH8k0Cfd4Z+0t8iUPEg=" else "sha256-KG73QaDY5njFzGhjWtjFNucZRcLtRGTrIPgG0sdonQw="; sha256 = if stdenv.isDarwin then "sha256-LP13smLy/cr0hiLl5cdRxTbDfRFojb+HJBx/MFeJ13Y=" else "sha256-8M9HU20IxTvPaa6x1X41Ldq2usK2TPU71VvprerivZg=";
}; };
icon = fetchurl { icon = fetchurl {

5
pkgs/applications/misc/octoprint/default.nix
View File

@ -4,6 +4,7 @@
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, python3 , python3
, fetchPypi
, substituteAll , substituteAll
, nix-update-script , nix-update-script
, nixosTests , nixosTests
@ -31,7 +32,7 @@ let
}); });
flask-babel = super.flask-babel.overridePythonAttrs (oldAttrs: rec { flask-babel = super.flask-babel.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0"; version = "2.0.0";
src = super.fetchPypi { src = fetchPypi {
pname = "Flask-Babel"; pname = "Flask-Babel";
inherit version; inherit version;
sha256 = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0="; sha256 = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0=";
@ -44,7 +45,7 @@ let
# downgrade needed for flask-babel 2.0.0 # downgrade needed for flask-babel 2.0.0
babel = super.babel.overridePythonAttrs (oldAttrs: rec { babel = super.babel.overridePythonAttrs (oldAttrs: rec {
version = "2.11.0"; version = "2.11.0";
src = super.fetchPypi { src = fetchPypi {
pname = "Babel"; pname = "Babel";
inherit version; inherit version;
hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y="; hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y=";

4
pkgs/applications/misc/orca/default.nix
View File

@ -34,13 +34,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "orca"; pname = "orca";
version = "44.0"; version = "44.1";
format = "other"; format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "e8WX7AvBtnQgC2L995XUuulkemNxfXVN9hWHzCUFAs4="; sha256 = "9e1lUdcviXshJI1DMIWnuBesy7ApaoTD6FHZH7Lu5N4=";
}; };
patches = [ patches = [

12
pkgs/applications/misc/privacyidea/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, cacert, openssl, nixosTests { lib, fetchFromGitHub, cacert, openssl, nixosTests
, python310, fetchpatch , python310, fetchPypi, fetchpatch
}: }:
let let
@ -11,7 +11,7 @@ let
packageOverrides = self: super: { packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.3.24"; version = "1.3.24";
src = super.fetchPypi { src = fetchPypi {
inherit (oldAttrs) pname; inherit (oldAttrs) pname;
inherit version; inherit version;
hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
@ -24,7 +24,7 @@ let
}); });
flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec {
version = "2.7.0"; version = "2.7.0";
src = self.fetchPypi { src = fetchPypi {
pname = "Flask-Migrate"; pname = "Flask-Migrate";
inherit version; inherit version;
hash = "sha256-ri8FZxWIdi3YOiHYsYxR/jVehng+JFlJlf+Nc4Df/jg="; hash = "sha256-ri8FZxWIdi3YOiHYsYxR/jVehng+JFlJlf+Nc4Df/jg=";
@ -33,7 +33,7 @@ let
flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec {
version = "2.5.1"; version = "2.5.1";
format = "setuptools"; format = "setuptools";
src = self.fetchPypi { src = fetchPypi {
pname = "Flask-SQLAlchemy"; pname = "Flask-SQLAlchemy";
inherit version; inherit version;
hash = "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; hash = "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912";
@ -123,7 +123,7 @@ let
pname = "Flask-Babel"; pname = "Flask-Babel";
version = "2.0.0"; version = "2.0.0";
format = "setuptools"; format = "setuptools";
src = self.fetchPypi { src = fetchPypi {
inherit pname; inherit pname;
inherit version; inherit version;
hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
@ -155,7 +155,7 @@ let
sphinx-rtd-theme = null; sphinx-rtd-theme = null;
}).overridePythonAttrs (old: rec { }).overridePythonAttrs (old: rec {
version = "5.1.0"; version = "5.1.0";
src = self.fetchPypi { src = fetchPypi {
inherit (old) pname; inherit (old) pname;
inherit version; inherit version;
hash = "sha256-GysFCsG64EnNB/WSCxT6u+UmOPSF2a2h6xFanuv/aDU="; hash = "sha256-GysFCsG64EnNB/WSCxT6u+UmOPSF2a2h6xFanuv/aDU=";

4
pkgs/applications/misc/pydf/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "pydf"; pname = "pydf";
version = "12"; version = "12";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7f47a7c3abfceb1ac04fc009ded538df1ae449c31203962a1471a4eb3bf21439"; sha256 = "7f47a7c3abfceb1ac04fc009ded538df1ae449c31203962a1471a4eb3bf21439";
}; };

3
pkgs/applications/misc/pytrainer/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python310 , python310
, fetchPypi
, fetchFromGitHub , fetchFromGitHub
, gdk-pixbuf , gdk-pixbuf
, gnome , gnome
@ -24,7 +25,7 @@ let
}; };
sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
version = "1.4.46"; version = "1.4.46";
src = self.fetchPypi { src = fetchPypi {
pname = "SQLAlchemy"; pname = "SQLAlchemy";
inherit version; inherit version;
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";

4
pkgs/applications/misc/raiseorlaunch/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "raiseorlaunch"; pname = "raiseorlaunch";
version = "2.3.3"; version = "2.3.3";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "3d694015d020a888b42564d56559213b94981ca2b32b952a49b2de4d029d2e59"; sha256 = "3d694015d020a888b42564d56559213b94981ca2b32b952a49b2de4d029d2e59";
}; };

4
pkgs/applications/misc/seashells/default.nix
View File

@ -1,11 +1,11 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "seashells"; pname = "seashells";
version = "0.1.2"; version = "0.1.2";
format = "setuptools"; format = "setuptools";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; sha256 = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM=";
}; };

3
pkgs/applications/misc/sigal/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, python3 , python3
, fetchPypi
, ffmpeg , ffmpeg
}: }:
@ -9,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
version = "2.3"; version = "2.3";
format = "setuptools"; format = "setuptools";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit version pname; inherit version pname;
hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q="; hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q=";
}; };

4
pkgs/applications/misc/tzupdate/default.nix
View File

@ -1,7 +1,7 @@
{ lib, python3 }: { lib, python3, fetchPypi }:
let let
inherit (python3.pkgs) buildPythonApplication fetchPypi requests; inherit (python3.pkgs) buildPythonApplication requests;
in in
buildPythonApplication rec { buildPythonApplication rec {
pname = "tzupdate"; pname = "tzupdate";

4
pkgs/applications/networking/cluster/luigi/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3 }: { lib, python3, fetchPypi }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "luigi"; pname = "luigi";
version = "3.0.2"; version = "3.0.2";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb";
}; };

4
pkgs/applications/networking/dyndns/dyndnsc/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, lib, python3Packages }: { lib, python3Packages, fetchPypi, stdenv }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "dyndnsc"; pname = "dyndnsc";
version = "0.6.1"; version = "0.6.1";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "13078d29eea2f9a4ca01f05676c3309ead5e341dab047e0d51c46f23d4b7fbb4"; sha256 = "13078d29eea2f9a4ca01f05676c3309ead5e341dab047e0d51c46f23d4b7fbb4";
}; };

4
pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix
View File

@ -1,11 +1,13 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
python3.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
pname = "listparser"; pname = "listparser";
version = "0.18"; version = "0.18";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b"; sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b";
}; };

3
pkgs/applications/networking/flexget/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
, fetchFromGitHub , fetchFromGitHub
}: }:
@ -8,7 +9,7 @@ let
packageOverrides = self: super: { packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
version = "1.4.48"; version = "1.4.48";
src = self.fetchPypi { src = fetchPypi {
pname = "SQLAlchemy"; pname = "SQLAlchemy";
inherit version; inherit version;
hash = "sha256-tHvChwltmJoIOM6W99jpZpFKJNqHftQadTHUS1XNuN8="; hash = "sha256-tHvChwltmJoIOM6W99jpZpFKJNqHftQadTHUS1XNuN8=";

4
pkgs/applications/networking/mailreaders/afew/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, notmuch }: { lib, python3Packages, fetchPypi, notmuch }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "afew"; pname = "afew";
version = "3.0.1"; version = "3.0.1";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff"; sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff";
}; };

4
pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3, notmuch }: { lib, python3, fetchPypi }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "mlarchive2maildir"; pname = "mlarchive2maildir";
version = "0.0.9"; version = "0.0.9";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs"; sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs";
}; };

1
pkgs/applications/networking/owncloud-client/default.nix
View File

@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
homepage = "https://owncloud.org"; homepage = "https://owncloud.org";
maintainers = with maintainers; [ qknight hellwolf ]; maintainers = with maintainers; [ qknight hellwolf ];
platforms = platforms.unix; platforms = platforms.unix;
broken = stdenv.isDarwin;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
changelog = "https://github.com/owncloud/client/releases/tag/v${version}"; changelog = "https://github.com/owncloud/client/releases/tag/v${version}";
}; };

4
pkgs/applications/office/fava/default.nix
View File

@ -1,11 +1,11 @@
{ lib, python3 }: { lib, python3, fetchPypi }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "fava"; pname = "fava";
version = "1.24.4"; version = "1.24.4";
format = "pyproject"; format = "pyproject";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-klRPe6NQMn3HVayfCGc05mB0afi3x4Wlj3EI0XdSkMc="; hash = "sha256-klRPe6NQMn3HVayfCGc05mB0afi3x4Wlj3EI0XdSkMc=";
}; };

3
pkgs/applications/office/pympress/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, python3Packages , python3Packages
, fetchPypi
, wrapGAppsHook , wrapGAppsHook
, gtk3 , gtk3
, gobject-introspection , gobject-introspection
@ -14,7 +15,7 @@ python3Packages.buildPythonApplication rec {
pname = "pympress"; pname = "pympress";
version = "1.7.2"; version = "1.7.2";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "LFUzrGHr8jmUqoIcKokC0gNDVmW1EUZlj9eI+GDycvI="; sha256 = "LFUzrGHr8jmUqoIcKokC0gNDVmW1EUZlj9eI+GDycvI=";
}; };

9
pkgs/applications/office/pyspread/default.nix
View File

@ -1,16 +1,17 @@
{ lib { lib
, copyDesktopItems
, makeDesktopItem
, python3 , python3
, qtsvg , fetchPypi
, copyDesktopItems
, wrapQtAppsHook , wrapQtAppsHook
, qtsvg
, makeDesktopItem
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "pyspread"; pname = "pyspread";
version = "2.0.2"; version = "2.0.2";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8="; hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8=";
}; };

3
pkgs/applications/office/tryton/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
, pkg-config , pkg-config
, librsvg , librsvg
, gobject-introspection , gobject-introspection
@ -24,7 +25,7 @@ python3Packages.buildPythonApplication rec {
disabled = !python3Packages.isPy3k; disabled = !python3Packages.isPy3k;
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1rca19krvmycdhmi1vb4ixwq0cagmrkhbqry4f19b725nlp8cv0q"; sha256 = "1rca19krvmycdhmi1vb4ixwq0cagmrkhbqry4f19b725nlp8cv0q";
}; };

4
pkgs/applications/science/biology/MACS2/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3, fetchurl }: { lib, python3, fetchPypi }:
python3.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
pname = "MACS2"; pname = "MACS2";
version = "2.2.7.1"; version = "2.2.7.1";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1rcxj943kgzs746f5jrb72x1cp4v50rk3qmad0m99a02vndscb5d"; sha256 = "1rcxj943kgzs746f5jrb72x1cp4v50rk3qmad0m99a02vndscb5d";
}; };

6
pkgs/applications/science/electronics/flatcam/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, python3 , python3
, fetchPypi
, fetchFromBitbucket , fetchFromBitbucket
, fetchpatch , fetchpatch
, substituteAll , substituteAll
@ -12,7 +13,7 @@ let
packageOverrides = self: super: { packageOverrides = self: super: {
shapely = super.shapely.overridePythonAttrs (old: rec { shapely = super.shapely.overridePythonAttrs (old: rec {
version = "1.8.4"; version = "1.8.4";
src = self.fetchPypi { src = fetchPypi {
pname = "Shapely"; pname = "Shapely";
inherit version; inherit version;
hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw=";
@ -30,7 +31,8 @@ let
}); });
}; };
}; };
in python.pkgs.buildPythonApplication rec { in
python.pkgs.buildPythonApplication rec {
pname = "flatcam"; pname = "flatcam";
version = "8.5"; version = "8.5";

22
pkgs/applications/science/electronics/kicad/versions.nix
View File

@ -3,23 +3,23 @@
{ {
"kicad" = { "kicad" = {
kicadVersion = { kicadVersion = {
version = "7.0.2"; version = "7.0.4";
src = { src = {
rev = "6a45011f421d65a241e1df4a2dc720819922f343"; rev = "4faf1bf99feaa338516c3abe0726232557f2098d";
sha256 = "0san7pjgvd8niwrki722qb6y46r71rlyspqp43pmkiz55dmz52zx"; sha256 = "0kxn4aaaw0n47avw4fvx2v6wp4vh2r7w9vw69f87aqas15w2x1gs";
}; };
}; };
libVersion = { libVersion = {
version = "7.0.2"; version = "7.0.4";
libSources = { libSources = {
symbols.rev = "22ed11504c140fded542eeb104cdb02e0a65672e"; symbols.rev = "833e50e9cefa929c4e50259a7754040c6c89a262";
symbols.sha256 = "0aah92rb8yx00z0xwx9z7xn5rrw4cc3z35gr7c0bnb49hiak01jc"; symbols.sha256 = "15100z8g4x28sxz8097ay1vxfxz2c4a1nvvzyx5vjfmhydwqwk49";
templates.rev = "331068741c80fee8195646d3dee40f3b840495e7"; templates.rev = "b9de2281e38524068703e6d4876999e323f8c735";
templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
footprints.rev = "e187e2dfa9bd04d91cad0d875049ab56780b6e32"; footprints.rev = "651238cdd56ea8ba601665eb754005d7eec4c89f";
footprints.sha256 = "1qrdznfd4a6kzwd4aaijkpyjy0xnrmi66isq9z52652a8s6ja48v"; footprints.sha256 = "18w9l9fszbsq8gmfi0118f1m91q88cwijz4nyivyw824qk4vwx3f";
packages3d.rev = "6374ae3db8b43a4d779185b7017fcfe0e1f32590"; packages3d.rev = "0cf4dc05de6369d653051c4c2800820bb5dabfaa";
packages3d.sha256 = "1nkk4325jh89vh52ykfnf9pz1k3jk5017gz6r2cia2v4b3jadi31"; packages3d.sha256 = "1bzb6b7llzwabjkdd0xsyan0x8kihccap4gwvipzydfg7gm5fjxm";
}; };
}; };
}; };

4
pkgs/applications/search/xlsxgrep/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "xlsxgrep"; pname = "xlsxgrep";
version = "0.0.23"; version = "0.0.23";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm"; sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm";
}; };

4
pkgs/applications/version-management/bumpver/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3, git, mercurial}: { lib, python3, fetchPypi, git, mercurial }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "bumpver"; pname = "bumpver";
version = "2021.1110"; version = "2021.1110";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b6a0ddb78db7e00ae7ffe895bf8ef97f91e6310dfc1c4721896bdfd044b1cb03"; sha256 = "b6a0ddb78db7e00ae7ffe895bf8ef97f91e6310dfc1c4721896bdfd044b1cb03";
}; };

4
pkgs/applications/version-management/git-aggregator/default.nix
View File

@ -1,10 +1,10 @@
{ lib, git, python3Packages }: { lib, python3Packages, fetchPypi, git }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "git-aggregator"; pname = "git-aggregator";
version = "2.1.0"; version = "2.1.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw=";
}; };

4
pkgs/applications/version-management/git-big-picture/default.nix
View File

@ -1,11 +1,11 @@
{ python3Packages, lib, git, graphviz }: { lib, python3Packages, fetchPypi, git, graphviz }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "git-big-picture"; pname = "git-big-picture";
version = "1.1.1"; version = "1.1.1";
format = "wheel"; format = "wheel";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit format version; inherit format version;
pname = "git_big_picture"; # underscores needed for working download URL pname = "git_big_picture"; # underscores needed for working download URL
python = "py3"; # i.e. no Python 2.7 python = "py3"; # i.e. no Python 2.7

3
pkgs/applications/version-management/git-up/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, pythonPackages , pythonPackages
, fetchPypi
, git , git
}: }:
@ -7,7 +8,7 @@ pythonPackages.buildPythonApplication rec {
pname = "git-up"; pname = "git-up";
version = "1.6.1"; version = "1.6.1";
src = pythonPackages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za"; sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za";
}; };

4
pkgs/applications/version-management/glab/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "glab"; pname = "glab";
version = "1.29.4"; version = "1.30.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ZmmsZ0+KuuLRgnFXGO0V+8Hm24THyHEZq/a+araTR9I="; hash = "sha256-mNwjyKde9xlaGVwK7oIbPGPipxKTvLwf6uMZVjL+joc=";
}; };
vendorHash = "sha256-WfzN70HHLatBuV+GW2VC+5laR3rBfDOqPydyxMSmL3s="; vendorHash = "sha256-WfzN70HHLatBuV+GW2VC+5laR3rBfDOqPydyxMSmL3s=";

3
pkgs/applications/version-management/gomp/default.nix
View File

@ -1,12 +1,13 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "gomp"; pname = "gomp";
version = "1.1.0"; version = "1.1.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb"; sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb";
}; };

3
pkgs/applications/version-management/legit/default.nix
View File

@ -1,12 +1,13 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "legit"; pname = "legit";
version = "1.2.0"; version = "1.2.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c"; sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c";
}; };

3
pkgs/applications/version-management/nbstripout/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
, coreutils , coreutils
, git , git
, mercurial , mercurial
@ -9,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
version = "0.6.1"; version = "0.6.1";
pname = "nbstripout"; pname = "nbstripout";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-kGW83RSIs4bk88CB/8HUj0UTovjYv00NmiggjF2v6dM="; hash = "sha256-kGW83RSIs4bk88CB/8HUj0UTovjYv00NmiggjF2v6dM=";
}; };

90
pkgs/applications/video/mirakurun/default.nix
View File

@ -1,96 +1,74 @@
# NOTE: Mirakurun is packaged outside of nodePackages because Node2nix can't
# handle one of its subdependencies. See below link for details.
#
# https://github.com/Chinachu/node-aribts/blob/af84dbbbd81ea80b946e538083b64b5b2dc7e8f2/package.json#L26
{ lib { lib
, stdenvNoCC , stdenv
, bash , bash
, buildNpmPackage
, fetchFromGitHub , fetchFromGitHub
, gitUpdater , installShellFiles
, jq
, makeWrapper , makeWrapper
, mkYarnPackage , nodejs
, which , substituteAll
, writers
, v4l-utils , v4l-utils
, yarn , which
, yarn2nix
}: }:
stdenvNoCC.mkDerivation rec { buildNpmPackage rec {
pname = "mirakurun"; pname = "mirakurun";
version = "3.8.0"; version = "3.9.0-rc.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Chinachu"; owner = "Chinachu";
repo = "Mirakurun"; repo = "Mirakurun";
rev = version; rev = version;
sha256 = "1fmzi3jc3havvpc1kz5z16k52lnrsmc3b5yqyxc7i911gqyjsxzr"; sha256 = "sha256-Qg+wET5H9t3Mv2Hv0iT/C85/SEaQ+BHSBL3JjMQW5+Q=";
}; };
nativeBuildInputs = [ makeWrapper ];
mirakurun = mkYarnPackage rec {
name = "${pname}-${version}";
inherit version src;
yarnNix = ./yarn.nix;
yarnLock = ./yarn.lock;
packageJSON = ./package.json;
# workaround for https://github.com/webpack/webpack/issues/14532
NODE_OPTIONS = "--openssl-legacy-provider";
patches = [ patches = [
# NOTE: fixes for hardcoded paths and assumptions about filesystem # NOTE: fixes for hardcoded paths and assumptions about filesystem
# permissions # permissions
./nix-filesystem.patch ./nix-filesystem.patch
]; ];
buildPhase = '' npmDepsHash = "sha256-e7m7xb7p1SBzLAyQ82TTR/qLXv4lRm37x0JJPWYYGvI=";
yarn --offline build
'';
distPhase = "true"; nativeBuildInputs = [ installShellFiles makeWrapper ];
};
installPhase = # workaround for https://github.com/webpack/webpack/issues/14532
NODE_OPTIONS = "--openssl-legacy-provider";
postInstall =
let let
runtimeDeps = [ bash which v4l-utils ]; runtimeDeps = [
bash
nodejs
which
] ++ lib.optionals stdenv.isLinux [ v4l-utils ];
crc32Patch = substituteAll {
src = ./fix-musl-detection.patch;
isMusl = if stdenv.hostPlatform.isMusl then "true" else "false";
};
in in
'' ''
mkdir -p $out/bin sed 's/@DESCRIPTION@/${meta.description}/g' ${./mirakurun.1} > mirakurun.1
installManPage mirakurun.1
makeWrapper ${mirakurun}/bin/mirakurun-epgdump $out/bin/mirakurun-epgdump \ wrapProgram $out/bin/mirakurun-epgdump \
--chdir "${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \
--prefix PATH : ${lib.makeBinPath runtimeDeps} --prefix PATH : ${lib.makeBinPath runtimeDeps}
# XXX: The original mirakurun command uses PM2 to manage the Mirakurun # XXX: The original mirakurun command uses PM2 to manage the Mirakurun
# server. However, we invoke the server directly and let systemd # server. However, we invoke the server directly and let systemd
# manage it to avoid complication. This is okay since no features # manage it to avoid complication. This is okay since no features
# unique to PM2 is currently being used. # unique to PM2 is currently being used.
makeWrapper ${yarn}/bin/yarn $out/bin/mirakurun-start \ makeWrapper ${nodejs}/bin/npm $out/bin/mirakurun \
--add-flags "start" \ --chdir "$out/lib/node_modules/mirakurun" \
--chdir "${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \
--prefix PATH : ${lib.makeBinPath runtimeDeps} --prefix PATH : ${lib.makeBinPath runtimeDeps}
pushd $out/lib/node_modules/mirakurun/node_modules/@node-rs/crc32
patch -p3 < ${crc32Patch}
popd
''; '';
passthru.updateScript = import ./update.nix {
inherit lib;
inherit (src.meta) homepage;
inherit
pname
version
gitUpdater
writers
jq
yarn
yarn2nix;
};
meta = with lib; { meta = with lib; {
inherit (mirakurun.meta) description platforms; description = "Resource manager for TV tuners.";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ midchildan ]; maintainers = with maintainers; [ midchildan ];
}; };

29
pkgs/applications/video/mirakurun/fix-musl-detection.patch Normal file
View File

@ -0,0 +1,29 @@
diff --git a/packages/crc32/index.js b/packages/crc32/index.js
index cdc7519..7b05930 100644
--- a/packages/crc32/index.js
+++ b/packages/crc32/index.js
@@ -5,7 +5,7 @@ const { platform, arch } = process
let nativeBinding = null
let localFileExisted = false
-let isMusl = false
+let isMusl = @isMusl@
let loadError = null
switch (platform) {
@@ -114,7 +114,6 @@ switch (platform) {
case 'linux':
switch (arch) {
case 'x64':
- isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
if (isMusl) {
localFileExisted = existsSync(join(__dirname, 'crc32.linux-x64-musl.node'))
try {
@@ -140,7 +139,6 @@ switch (platform) {
}
break
case 'arm64':
- isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
if (isMusl) {
localFileExisted = existsSync(join(__dirname, 'crc32.linux-arm64-musl.node'))
try {

44
pkgs/applications/video/mirakurun/mirakurun.1 Normal file
View File

@ -0,0 +1,44 @@
.Dd $Mdocdate$
.Dt MIRAKURUN 1
.Os
.Sh NAME
.Nm mirakurun
.Nd @DESCRIPTION@
.Sh SYNOPSIS
.Nm
.Bk -words
.Op Ar command Op Ar args
.Ek
.Sh DESCRIPTION
.Nm
is a wrapper command for Mirakurun provided by Nix. It's actually a thin
wrapper around the
.Xr npm 1
command line tool which you can use to invoke npm commands from the Mirakurun
project directory. The command line arguments are simply passed as-is to
.Xr npm 1 .
.Pp
On NixOS, it is strongly recommended that you enable the mirakurun module
instead of invoking this command directly to launch Mirakurun. On other
platforms, run
.Pp
.Dl $ mirakurun start
.Pp
to start Mirakurun.
.Sh FILES
.Bl -tag -width Ds -compact
.It Pa /etc/mirakurun
.Nm
configuration directory.
.El
.Sh EXAMPLES
Start Mirakurun.
.Pp
.Dl $ mirakurun start
.Pp
Start Mirakurun in development mode.
.Pp
.Dl $ mirakurun run debug
.Pp
.Sh SEE ALSO
.Xr npm 1

129
pkgs/applications/video/mirakurun/package.json
View File

@ -1,129 +0,0 @@
{
"name": "mirakurun",
"preferGlobal": true,
"description": "Japanese DTV Tuner Server Service.",
"version": "3.8.0",
"homepage": "https://github.com/Chinachu/Mirakurun",
"keywords": [
"mirakurun",
"chinachu",
"rivarun",
"arib",
"isdb",
"dvb",
"dvr",
"dtv",
"tv"
],
"author": {
"name": "kanreisa",
"url": "https://github.com/kanreisa"
},
"contributors": [
"rndomhack"
],
"repository": {
"type": "git",
"url": "https://github.com/Chinachu/Mirakurun.git"
},
"bugs": {
"url": "https://github.com/Chinachu/Mirakurun/issues"
},
"license": "Apache-2.0",
"bin": {
"mirakurun": "bin/cli.sh",
"mirakurun-epgdump": "bin/epgdump.js"
},
"main": "lib/client.js",
"scripts": {
"start": "node -r source-map-support/register lib/server.js",
"debug": "node -r source-map-support/register --inspect=0.0.0.0:9229 lib/server.js",
"start.win32": "node.exe -r source-map-support/register bin/init.win32.js",
"debug.win32": "node.exe -r source-map-support/register --inspect bin/init.win32.js",
"build": "tslint --project . && tsc --declaration && webpack",
"watch": "tsc -w --declaration",
"watch-webpack": "webpack -w",
"test": "tslint --project . && mocha --exit test/*.spec.js",
"clean": "rimraf lib/*",
"prepublishOnly": "npm run clean && npm run build",
"preinstall": "node bin/preinstall.js",
"postinstall": "node bin/postinstall.js && opencollective-postinstall",
"preuninstall": "node bin/preuninstall.js",
"docker-build": "docker-compose -f docker/docker-compose.yml build",
"docker-run": "docker-compose -f docker/docker-compose.yml run --rm --service-ports mirakurun",
"docker-debug": "docker-compose -f docker/docker-compose.yml run --rm --service-ports -e DEBUG=true mirakurun"
},
"directories": {
"doc": "doc",
"lib": "lib"
},
"dependencies": {
"@fluentui/react": "8.27.0",
"aribts": "^1.3.5",
"colors": "^1.4.0",
"cors": "^2.8.5",
"dotenv": "^8.6.0",
"eventemitter3": "^4.0.7",
"express": "^4.17.1",
"express-openapi": "^8.0.0",
"glob": "^7.1.7",
"ip": "^1.1.4",
"js-yaml": "^4.1.0",
"latest-version": "^5.1.0",
"morgan": "^1.10.0",
"openapi-types": "^7.2.3",
"opencollective": "^1.0.3",
"opencollective-postinstall": "^2.0.3",
"promise-queue": "^2.2.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"semver": "^7.3.5",
"sift": "^7.0.1",
"source-map-support": "^0.5.19",
"stream-http": "^3.2.0",
"swagger-ui-dist": "3.51.2",
"tail": "^2.2.3"
},
"devDependencies": {
"@types/cors": "^2.8.12",
"@types/express": "^4.17.13",
"@types/ip": "^1.1.0",
"@types/js-yaml": "^4.0.2",
"@types/morgan": "^1.9.3",
"@types/node": "^12.20.17",
"@types/promise-queue": "^2.2.0",
"@types/react": "^17.0.14",
"@types/react-dom": "^17.0.9",
"buffer": "^6.0.3",
"copy-webpack-plugin": "^9.0.1",
"css-loader": "5.2.7",
"mocha": "^8.4.0",
"process": "^0.11.10",
"rimraf": "^3.0.2",
"style-loader": "^2.0.0",
"ts-loader": "^9.2.3",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"typescript": "^4.3.5",
"url": "^0.11.0",
"webpack": "5.48.0",
"webpack-cli": "^4.7.2"
},
"engines": {
"node": "^12 || ^14 || ^16"
},
"engineStrict": true,
"os": [
"linux",
"darwin",
"win32"
],
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/Mirakurun"
},
"collective": {
"type": "opencollective",
"url": "https://opencollective.com/Mirakurun"
}
}

51
pkgs/applications/video/mirakurun/update.nix
View File

@ -1,51 +0,0 @@
{ pname
, version
, homepage
, lib
, gitUpdater
, writers
, jq
, yarn
, yarn2nix
}:
let
updater = gitUpdater {
inherit pname version;
attrPath = lib.toLower pname;
# exclude prerelease versions
ignoredVersions = "-";
};
updateScript = builtins.elemAt updater.command 0;
updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command);
in writers.writeBash "update-mirakurun" ''
set -euxo pipefail
WORKDIR="$(mktemp -d)"
cleanup() {
rm -rf "$WORKDIR"
}
trap cleanup EXIT
# bump the version
${updateScript} ${lib.concatStringsSep " " updateArgs}
# Get the path to the latest source. Note that we can't just pass the value
# of mirakurun.src directly because it'd be evaluated before we can run
# updateScript.
SRC="$(nix-build "${toString ../../../..}" --no-out-link -A mirakurun.src)"
if [[ "${version}" == "$(${jq}/bin/jq -r .version "$SRC/package.json")" ]]; then
echo "[INFO] Already using the latest version of ${pname}" >&2
exit
fi
cd "$WORKDIR"
cp "$SRC/package.json" package.json
"${yarn}/bin/yarn" install --ignore-scripts
"${yarn2nix}/bin/yarn2nix" > "${toString ./.}/yarn.nix"
cp yarn.lock "${toString ./.}/yarn.lock"
cp package.json "${toString ./.}/package.json"
''

3232
pkgs/applications/video/mirakurun/yarn.lock
View File

File diff suppressed because it is too large Load Diff

3765
pkgs/applications/video/mirakurun/yarn.nix
View File

File diff suppressed because it is too large Load Diff

53
pkgs/applications/video/mpv/scripts/occivink.nix Normal file
View File

@ -0,0 +1,53 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
}:
let
script = { n, ... }@p:
stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate {
pname = "mpv_${n}";
passthru.scriptName = "${n}.lua";
src = fetchFromGitHub {
owner = "occivink";
repo = "mpv-scripts";
rev = "af360f332897dda907644480f785336bc93facf1";
hash = "sha256-KdCrUkJpbxxqmyUHksVVc8KdMn8ivJeUA2eerFZfEE8=";
};
version = "unstable-2022-10-02";
dontBuild = true;
installPhase = ''
mkdir -p $out/share/mpv/scripts
cp -r scripts/${n}.lua $out/share/mpv/scripts/
'';
meta = with lib; {
homepage = "https://github.com/occivink/mpv-scripts";
license = licenses.unlicense;
platforms = platforms.all;
maintainers = with maintainers; [ nicoo ];
};
outputHashAlgo = "sha256";
outputHashMode = "recursive";
} p);
in
{
# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }`
seekTo = script {
n = "seek-to";
meta.description = "Mpv script for seeking to a specific position";
outputHash = "sha256-3RlbtUivmeoR9TZ6rABiZSd5jd2lFv/8p/4irHMLshs=";
};
blacklistExtensions = script {
n = "blacklist-extensions";
meta.description = "Automatically remove playlist entries based on their extension.";
outputHash = "sha256-qw9lz8ofmvvh23F9aWLxiU4YofY+YflRETu+nxMhvVE=";
};
}

11
pkgs/applications/video/pyca/default.nix
View File

@ -1,4 +1,11 @@
{ stdenv, lib, python3, fetchFromGitHub, buildNpmPackage, jq }: { lib
, python3
, fetchPypi
, buildNpmPackage
, fetchFromGitHub
, jq
, stdenv
}:
let let
python = python3.override { python = python3.override {
@ -6,7 +13,7 @@ let
# pyCA is incompatible with SQLAlchemy 2.0 # pyCA is incompatible with SQLAlchemy 2.0
sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
version = "1.4.46"; version = "1.4.46";
src = self.fetchPypi { src = fetchPypi {
pname = "SQLAlchemy"; pname = "SQLAlchemy";
inherit version; inherit version;
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";

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

@ -1,7 +1,7 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
, ffmpeg , ffmpeg
, fetchpatch
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
version = "5.3.0"; version = "5.3.0";
format = "pyproject"; format = "pyproject";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-+9MSSzPYZ8gwOeQLehR41SklfdcUn8Pa6TI//lh9twE="; hash = "sha256-+9MSSzPYZ8gwOeQLehR41SklfdcUn8Pa6TI//lh9twE=";
}; };

4
pkgs/applications/window-managers/i3/altlayout.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "i3altlayout"; pname = "i3altlayout";
version = "0.3"; version = "0.3";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf"; sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf";
}; };

39
pkgs/data/fonts/intel-one-mono/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib, stdenvNoCC, fetchurl, unzip}:
stdenvNoCC.mkDerivation rec {
pname = "intel-one-mono";
version = "1.2.0";
srcs = [
(fetchurl {
url = "https://github.com/intel/intel-one-mono/releases/download/V${version}/otf.zip";
sha256 = "sha256-VnXIaW77dRXvXB1Vr01xRQDMECltwzF/RMqGgAWnu5M=";
})
(fetchurl {
url = "https://github.com/intel/intel-one-mono/releases/download/V${version}/ttf.zip";
sha256 = "sha256-kaz0DePeO8nvKVonYJhs5f2+ps/5Xo5psjg1hoxzaiU=";
})
];
sourceRoot = ".";
nativeBuildInputs = [
unzip
];
installPhase = ''
runHook preInstall
install -Dm644 -t $out/share/fonts/truetype/ ttf/*.ttf
install -Dm644 -t $out/share/fonts/opentype/ otf/*.otf
runHook postInstall
'';
meta = with lib; {
description = "Intel One Mono, an expressive monospaced font family that’s built with clarity, legibility, and the needs of developers in mind";
homepage = "https://github.com/intel/intel-one-mono";
changelog = "https://github.com/intel/intel-one-mono/releases/tag/V${version}";
license = licenses.ofl;
maintainers = [ maintainers.simoneruffini];
platforms = platforms.all;
};
}

4
pkgs/data/themes/qogir/default.nix
View File

@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname; inherit pname;
version = "2023-02-27"; version = "2023-05-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "oBUBSPlOCBEaRRFK5ZyoGlk+gwcE8LtdwxvL+iTfuMA="; sha256 = "L19pbmJJFr1xi4ZTp0ocxmdMvWmtkK2zquOFfbV+P5Q=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/compilers/lesscpy/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "lesscpy"; pname = "lesscpy";
version = "0.13.0"; version = "0.13.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1bbjag13kawnjdn7q4flfrkd0a21rgn9ycfqsgfdmg658jsx1ipk"; sha256 = "1bbjag13kawnjdn7q4flfrkd0a21rgn9ycfqsgfdmg658jsx1ipk";
}; };

2
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -281,7 +281,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
# GHC is setup with a package database with all the specified Haskell packages. # GHC is setup with a package database with all the specified Haskell packages.
# #
# ghcWithPackages :: (HaskellPkgSet -> [ HaskellPkg ]) -> Derivation # ghcWithPackages :: (HaskellPkgSet -> [ HaskellPkg ]) -> Derivation
ghcWithPackages = self.callPackage ./with-packages-wrapper.nix { ghcWithPackages = buildHaskellPackages.callPackage ./with-packages-wrapper.nix {
haskellPackages = self; haskellPackages = self;
}; };

81
pkgs/development/libraries/science/math/dbcsr/default.nix Normal file
View File

@ -0,0 +1,81 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, fypp
, gfortran
, blas
, lapack
, python3
, libxsmm
, mpi
, openssh
}:
stdenv.mkDerivation rec {
pname = "dbcsr";
version = "2.5.0";
src = fetchFromGitHub {
owner = "cp2k";
repo = "dbcsr";
rev = "v${version}";
hash = "sha256-GGClK3heGE3zUM0R+u58vRdAK+xWzaqdCHaMIDerHSI=";
};
postPatch = ''
patchShebangs .
# Force build of shared library, otherwise just static.
substituteInPlace src/CMakeLists.txt \
--replace 'add_library(dbcsr ''${DBCSR_SRCS})' 'add_library(dbcsr SHARED ''${DBCSR_SRCS})' \
--replace 'add_library(dbcsr_c ''${DBCSR_C_SRCS})' 'add_library(dbcsr_c SHARED ''${DBCSR_C_SRCS})'
# Avoid calling the fypp wrapper script with python again. The nix wrapper took care of that.
substituteInPlace cmake/fypp-sources.cmake \
--replace 'COMMAND ''${Python_EXECUTABLE} ''${FYPP_EXECUTABLE}' 'COMMAND ''${FYPP_EXECUTABLE}'
'';
nativeBuildInputs = [
gfortran
python3
cmake
pkg-config
fypp
];
buildInputs = [ blas lapack libxsmm ];
propagatedBuildInputs = [ mpi ];
preConfigure = ''
export PKG_CONFIG_PATH=${libxsmm}/lib
'';
cmakeFlags = [
"-DUSE_OPENMP=ON"
"-DUSE_SMM=libxsmm"
"-DWITH_C_API=ON"
"-DBUILD_TESTING=ON"
"-DTEST_OMP_THREADS=2"
"-DTEST_MPI_RANKS=2"
"-DENABLE_SHARED=ON"
"-DUSE_MPI=ON"
];
checkInputs = [ openssh ];
doCheck = true;
preCheck = ''
export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox
export OMPI_MCA_rmaps_base_oversubscribe=1
'';
meta = with lib; {
description = "Distributed Block Compressed Sparse Row matrix library";
license = licenses.gpl2Only;
homepage = "https://github.com/cp2k/dbcsr";
maintainers = [ maintainers.sheepforce ];
};
}

5
pkgs/development/misc/resholve/deps.nix generated
View File

@ -2,6 +2,7 @@
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, python27 , python27
, fetchPypi
, ... , ...
}: }:
@ -47,7 +48,7 @@ rec {
pname = "six"; pname = "six";
version = "1.16.0"; version = "1.16.0";
src = python27.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926";
}; };
@ -64,7 +65,7 @@ rec {
pname = "typing"; pname = "typing";
version = "3.10.0.0"; version = "3.10.0.0";
src = python27.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";
}; };

3
pkgs/development/python-modules/dashing/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
python3.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
@ -9,7 +10,7 @@ python3.pkgs.buildPythonPackage rec {
disabled = python3.pythonOlder "3.7"; disabled = python3.pythonOlder "3.7";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs="; hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs=";
}; };

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

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "embrace"; pname = "embrace";
version = "4.2.0"; version = "4.2.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "~olly"; owner = "~olly";
repo = "embrace-sql"; repo = "embrace-sql";
rev = "v${version}-release"; rev = "v${version}-release";
hash = "sha256-otzpDMtC229qMXon+ydS39SBoMiXJmxn48/TQXjqu5U="; hash = "sha256-B/xW5EfaQWW603fjKYcf+RHQJVZrnFoqVnIl6xSwS0E=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

20
pkgs/development/python-modules/fypp/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ lib, stdenv, fetchFromGitHub, buildPythonApplication }:
buildPythonApplication rec {
pname = "fypp";
version = "3.1";
src = fetchFromGitHub {
owner = "aradi";
repo = pname;
rev = version;
hash = "sha256-iog5Gdcd1F230Nl4JDrKoyYr8JualVgNZQzHLzd4xe8=";
};
meta = with lib; {
description = "Python powered Fortran preprocessor";
homepage = "https://github.com/aradi/fypp";
license = licenses.gpl3Only;
maintainers = [ maintainers.sheepforce ];
};
}

3
pkgs/development/python-modules/memory_profiler/default.nix
View File

@ -1,12 +1,13 @@
{ lib { lib
, python , python
, fetchPypi
}: }:
python.pkgs.buildPythonPackage rec { python.pkgs.buildPythonPackage rec {
pname = "memory_profiler"; pname = "memory_profiler";
version = "0.55.0"; version = "0.55.0";
src = python.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1hdgh5f59bya079w4ahx4l0hf4gc5yvaz44irp5x57cj9hkpp92z"; sha256 = "1hdgh5f59bya079w4ahx4l0hf4gc5yvaz44irp5x57cj9hkpp92z";
}; };

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

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mizani"; pname = "mizani";
version = "0.9.0"; version = "0.9.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "has2k1"; owner = "has2k1";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-XV/Lqr/kGx+t26ALLY7wTp2Ez487yvExM1GUD4AH9Bc="; hash = "sha256-mRJk1eJuP3CnZKKJhOam8llknqIB0H81LyBjyzFwk5I=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -1,11 +1,11 @@
{ lib, stdenv, pythonPackages, pkg-config { lib, stdenv, pythonPackages, fetchPypi, pkg-config
, qmake, qtbase, qtsvg, qtwebengine , qmake, qtbase, qtsvg, qtwebengine
, wrapQtAppsHook , wrapQtAppsHook
, darwin , darwin
}: }:
let let
inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 enum34 sip pyqt-builder; inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 sip pyqt-builder;
inherit (darwin) autoSignDarwinBinariesHook; inherit (darwin) autoSignDarwinBinariesHook;
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "PyQtWebEngine"; pname = "PyQtWebEngine";
@ -14,7 +14,7 @@ in buildPythonPackage rec {
disabled = isPy27; disabled = isPy27;
src = pythonPackages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f"; sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f";
}; };

3
pkgs/development/python-modules/pystemd/default.nix
View File

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, lib , lib
, python , python
, fetchPypi
, systemd , systemd
, pytest , pytest
, mock , mock
@ -10,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pystemd"; pname = "pystemd";
version = "0.10.0"; version = "0.10.0";
src = python.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk="; hash = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk=";
}; };

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

@ -6,13 +6,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rzpipe"; pname = "rzpipe";
version = "0.4.0"; version = "0.5.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-RSgBwmtpI58caRWov+cDWLKhti+7r70VxJbCxJveEiM="; hash = "sha256-kEJg619HyX7loEBUsjpVtgF5dBzJtmM9/bQnUkDUjHU=";
}; };
# No native rz_core library # No native rz_core library

28
pkgs/development/python-modules/scikit-misc/default.nix
View File

@ -3,35 +3,41 @@
, buildPythonPackage , buildPythonPackage
, cython , cython
, gfortran , gfortran
, pytestCheckHook , git
, numpy }: , meson-python
, pkg-config
, numpy
, openblas
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "scikit-misc"; pname = "scikit-misc";
version = "0.1.4"; version = "0.2.0";
format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "scikit_misc";
hash = "sha256-93RqA0eBEGPh7PkSHflINXhQA5U8OLW6hPY/xQjCKRE="; inherit version;
hash = "sha256-rBTdTpNeRC/DSrHFg7ZhHUYD0G9IgoqFx+A+LCxYK7w=";
}; };
postPatch = '' postPatch = ''
substituteInPlace pytest.ini \ patchShebangs .
--replace "--cov --cov-report=xml" ""
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
cython
gfortran gfortran
git
meson-python
pkg-config
]; ];
buildInputs = [ buildInputs = [
cython
numpy numpy
openblas
]; ];
# Tests fail because of infinite recursion error
doCheck = false;
pythonImportsCheck = [ pythonImportsCheck = [
"skmisc" "skmisc"
]; ];

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

@ -1,10 +1,14 @@
{ lib { lib
, aiohttp
, aiohttp-retry
, aiounittest
, buildPythonPackage , buildPythonPackage
, cryptography , cryptography
, django , django
, fetchFromGitHub , fetchFromGitHub
, mock , mock
, multidict , multidict
, pyngrok
, pyjwt , pyjwt
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
@ -14,25 +18,29 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "twilio"; pname = "twilio";
version = "7.17.0"; version = "8.2.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "twilio"; owner = "twilio";
repo = "twilio-python"; repo = "twilio-python";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-14agJq7+fuQXqFDS8qfCj45XW/v3CekKmC5TA/5+eTk="; hash = "sha256-joL+6+LfrF2bWkw3hViA97RYqcMVWw+MlHub+OaXlgI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp
aiohttp-retry
pyjwt pyjwt
pyngrok
pytz pytz
requests requests
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
aiounittest
cryptography cryptography
django django
mock mock
@ -46,6 +54,12 @@ buildPythonPackage rec {
"test_set_user_agent_extensions" "test_set_user_agent_extensions"
]; ];
disabledTestPaths = [
# Tests require API token
"tests/cluster/test_webhook.py"
"tests/cluster/test_cluster.py"
];
pythonImportsCheck = [ pythonImportsCheck = [
"twilio" "twilio"
]; ];

12
pkgs/development/python-modules/typecode/default.nix
View File

@ -15,22 +15,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "typecode"; pname = "typecode";
version = "30.0.0"; version = "30.0.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-pRGLU/xzQQqDZMIsrq1Fy7VgGIpFjnHtpmO+yL7t4g8="; hash = "sha256-Glc5QiTVr//euymeNTxGN+FVaOEa6cUxHGyGo9bQrJc=";
}; };
postPatch = ''
# PEP440 support was removed in newer setuptools, https://github.com/nexB/typecode/pull/31
substituteInPlace setup.cfg \
--replace ">=3.6.*" ">=3.6"
'';
dontConfigure = true; dontConfigure = true;
nativeBuildInputs = [ nativeBuildInputs = [
@ -67,6 +61,6 @@ buildPythonPackage rec {
homepage = "https://github.com/nexB/typecode"; homepage = "https://github.com/nexB/typecode";
changelog = "https://github.com/nexB/typecode/releases/tag/v${version}"; changelog = "https://github.com/nexB/typecode/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ ]; maintainers = with maintainers; [ ];
}; };
} }

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

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "xmlschema"; pname = "xmlschema";
version = "2.2.3"; version = "2.3.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "sissaschool"; owner = "sissaschool";
repo = "xmlschema"; repo = "xmlschema";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-KTxVUYdflHiC96tALFcMA0JnLt0vj/nSD3ie53lMi50="; hash = "sha256-ERA6u2bDFxA/vjl2GNZUaBto4RqrScPelHaABkpY0lQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

3
pkgs/development/tools/aws-sam-cli/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
, enableTelemetry ? false , enableTelemetry ? false
}: }:
@ -7,7 +8,7 @@ python3.pkgs.buildPythonApplication rec {
pname = "aws-sam-cli"; pname = "aws-sam-cli";
version = "1.53.0"; version = "1.53.0";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-kIW+aGYuS+JgOMsPbeLgPSgLFNKLSqHaZ1CHpjs/IVI="; hash = "sha256-kIW+aGYuS+JgOMsPbeLgPSgLFNKLSqHaZ1CHpjs/IVI=";
}; };

4
pkgs/development/tools/b4/default.nix
View File

@ -1,10 +1,10 @@
{ lib, python3Packages, patatt }: { lib, python3Packages, fetchPypi, patatt }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "b4"; pname = "b4";
version = "0.12.2"; version = "0.12.2";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "tvSv14v3iigFWzifCQl5Kxx4Bfs1V/XXHvvaNoKqvm4="; sha256 = "tvSv14v3iigFWzifCQl5Kxx4Bfs1V/XXHvvaNoKqvm4=";
}; };

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